diff options
| author | Matthias Wolf <matthias@rheinwolf.de> | 2021-04-27 14:25:26 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-27 14:29:47 +0000 |
| commit | be6259aac7b38bb3129be18e4ca60d42078cca3e (patch) | |
| tree | c751b3c98ce06f6217fb44fc88ad582a05327926 | |
| parent | 87e8477cb34d4fb1ff6173aaf66407e580f894ab (diff) | |
| download | ports-be6259aac7b38bb3129be18e4ca60d42078cca3e.tar.gz ports-be6259aac7b38bb3129be18e4ca60d42078cca3e.zip | |
www/chromium: update to 90.0.4430.85
Tested by: Matthias Wolf, rene
MFH: 2021Q2
Security: http://vuxml.freebsd.org/freebsd/cb13a765-a277-11eb-97a0-e09467587c17.html
956 files changed, 3265 insertions, 2322 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index ab5a34ab648a..417f0653e2d3 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,7 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 89.0.4389.128 +PORTVERSION= 90.0.4430.85 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -240,6 +240,11 @@ post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ +post-patch: + @${CP} ${FILESDIR}/dir_reader_freebsd.h ${WRKSRC}/base/files + @${CP} ${FILESDIR}/device_info_fetcher_freebsd.h ${WRKSRC}/chrome/browser/enterprise/signals + @${CP} ${FILESDIR}/device_info_fetcher_freebsd.cc ${WRKSRC}/chrome/browser/enterprise/signals + post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 7ff96a7b775e..54003ce76238 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1618388739 -SHA256 (chromium-89.0.4389.128.tar.xz) = 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b -SIZE (chromium-89.0.4389.128.tar.xz) = 890850492 -SHA256 (chromium-89.0.4389.128-testdata.tar.xz) = 03f16939f3fc8182a0f306abf1e6c801e2e6fd11533d18787c05c852cbec46bd -SIZE (chromium-89.0.4389.128-testdata.tar.xz) = 257707276 +TIMESTAMP = 1619007272 +SHA256 (chromium-90.0.4430.85.tar.xz) = 01c5594d4b7eaa67e00b4fa16ae0c9d35ec5917467abd387ba1b5cc332d44922 +SIZE (chromium-90.0.4430.85.tar.xz) = 917373872 +SHA256 (chromium-90.0.4430.85-testdata.tar.xz) = c2434c60103a0eff9cc449ddb7ddfd146560f0b6a7e8a8af9df728190fde9fda +SIZE (chromium-90.0.4430.85-testdata.tar.xz) = 256581788 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/device_info_fetcher_freebsd.cc b/www/chromium/files/device_info_fetcher_freebsd.cc new file mode 100644 index 000000000000..021bc035966b --- /dev/null +++ b/www/chromium/files/device_info_fetcher_freebsd.cc @@ -0,0 +1,143 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/enterprise/signals/device_info_fetcher_freebsd.h" + +#if defined(USE_GIO) +#include <gio/gio.h> +#endif // defined(USE_GIO) +#include <sys/stat.h> +#include <sys/types.h> +#include <ifaddrs.h> +#include <net/if.h> +#include <net/if_dl.h> + +#include <string> + +#include "base/environment.h" +#include "base/files/dir_reader_posix.h" +#include "base/files/file.h" +#include "base/files/file_util.h" +#include "base/nix/xdg_util.h" +#include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" +#include "base/system/sys_info.h" +#include "net/base/network_interfaces.h" + +using SettingValue = enterprise_signals::DeviceInfo::SettingValue; + +namespace enterprise_signals { + +namespace { + +std::string GetDeviceModel() { + return base::SysInfo::HardwareModelName(); +} + +std::string GetOsVersion() { + return base::SysInfo::OperatingSystemVersion(); +} + +std::string GetDeviceHostName() { + return net::GetHostName(); +} + +std::string GetSerialNumber() { + return std::string(); +} + +// Implements the logic from the native client setup script. It reads the +// setting value straight from gsettings but picks the schema relevant to the +// currently active desktop environment. +// The current implementation support Gnone and Cinnamon only. +SettingValue GetScreenlockSecured() { +#if defined(USE_GIO) + static constexpr char kLockScreenKey[] = "lock-enabled"; + + std::unique_ptr<base::Environment> env(base::Environment::Create()); + const base::nix::DesktopEnvironment desktop_env = + base::nix::GetDesktopEnvironment(env.get()); + if (desktop_env != base::nix::DESKTOP_ENVIRONMENT_CINNAMON && + desktop_env != base::nix::DESKTOP_ENVIRONMENT_GNOME) { + return SettingValue::UNKNOWN; + } + + const std::string settings_schema = base::StringPrintf( + "org.%s.desktop.screensaver", + desktop_env == base::nix::DESKTOP_ENVIRONMENT_CINNAMON ? "cinnamon" + : "gnome"); + + GSettingsSchema* screensaver_schema = g_settings_schema_source_lookup( + g_settings_schema_source_get_default(), settings_schema.c_str(), FALSE); + GSettings* screensaver_settings = nullptr; + if (!screensaver_schema || + !g_settings_schema_has_key(screensaver_schema, kLockScreenKey)) { + return SettingValue::UNKNOWN; + } + screensaver_settings = g_settings_new(settings_schema.c_str()); + if (!screensaver_settings) + return SettingValue::UNKNOWN; + gboolean lock_screen_enabled = + g_settings_get_boolean(screensaver_settings, kLockScreenKey); + g_object_unref(screensaver_settings); + + return lock_screen_enabled ? SettingValue::ENABLED : SettingValue::DISABLED; +#else + return SettingValue::UNKNOWN; +#endif // defined(USE_GIO) +} + +// Implements the logic from the native host installation script. First find the +// root device identifier, then locate its parent and get its type. +SettingValue GetDiskEncrypted() { + return SettingValue::UNKNOWN; +} + +std::vector<std::string> GetMacAddresses() { + std::vector<std::string> result; + struct ifaddrs* ifa = nullptr; + + if (getifaddrs(&ifa) != 0) + return result; + + struct ifaddrs* interface = ifa; + for (; interface != nullptr; interface = interface->ifa_next) { + if (interface->ifa_addr == nullptr || + interface->ifa_addr->sa_family != AF_LINK) { + continue; + } + struct sockaddr_dl* sdl = + reinterpret_cast<struct sockaddr_dl*>(interface->ifa_addr); + if (!sdl || sdl->sdl_alen != 6) + continue; + char* link_address = static_cast<char*>(LLADDR(sdl)); + result.push_back(base::StringPrintf( + "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff, + link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff, + link_address[4] & 0xff, link_address[5] & 0xff)); + } + return result; +} + +} // namespace + +DeviceInfoFetcherFreeBSD::DeviceInfoFetcherFreeBSD() = default; + +DeviceInfoFetcherFreeBSD::~DeviceInfoFetcherFreeBSD() = default; + +DeviceInfo DeviceInfoFetcherFreeBSD::Fetch() { + DeviceInfo device_info; + device_info.os_name = "freebsd"; + device_info.os_version = GetOsVersion(); + device_info.device_host_name = GetDeviceHostName(); + device_info.device_model = GetDeviceModel(); + device_info.serial_number = GetSerialNumber(); + device_info.screen_lock_secured = GetScreenlockSecured(); + device_info.disk_encrypted = GetDiskEncrypted(); + device_info.mac_addresses = GetMacAddresses(); + return device_info; +} + +} // namespace enterprise_signals diff --git a/www/chromium/files/device_info_fetcher_freebsd.h b/www/chromium/files/device_info_fetcher_freebsd.h new file mode 100644 index 000000000000..2cd2f213f828 --- /dev/null +++ b/www/chromium/files/device_info_fetcher_freebsd.h @@ -0,0 +1,26 @@ +// Copyright 2021 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. + +#ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ +#define CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ + +#include "chrome/browser/enterprise/signals/device_info_fetcher.h" + +namespace enterprise_signals { + +// FreeBSD implementation of DeviceInfoFetcher. +class DeviceInfoFetcherFreeBSD : public DeviceInfoFetcher { + public: + DeviceInfoFetcherFreeBSD(); + DeviceInfoFetcherFreeBSD(const DeviceInfoFetcherFreeBSD&) = delete; + DeviceInfoFetcherFreeBSD& operator=(const DeviceInfoFetcherFreeBSD&) = delete; + ~DeviceInfoFetcherFreeBSD() override; + + // Overrides DeviceInfoFetcher: + DeviceInfo Fetch() override; +}; + +} // namespace enterprise_signals + +#endif // CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ diff --git a/www/chromium/files/dir_reader_freebsd.h b/www/chromium/files/dir_reader_freebsd.h new file mode 100644 index 000000000000..7be73f000577 --- /dev/null +++ b/www/chromium/files/dir_reader_freebsd.h @@ -0,0 +1,95 @@ +// 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. + +#ifndef BASE_FILES_DIR_READER_FREEBSD_H_ +#define BASE_FILES_DIR_READER_FREEBSD_H_ + +#include <errno.h> +#include <fcntl.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <dirent.h> + +#include "base/logging.h" +#include "base/posix/eintr_wrapper.h" + +// See the comments in dir_reader_posix.h about this. + +namespace base { + +class DirReaderFreeBSD { + public: + explicit DirReaderFreeBSD(const char* directory_path) + : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), + offset_(0), + size_(0) { + memset(buf_, 0, sizeof(buf_)); + } + + DirReaderFreeBSD(const DirReaderFreeBSD&) = delete; + DirReaderFreeBSD& operator=(const DirReaderFreeBSD&) = delete; + + ~DirReaderFreeBSD() { + if (fd_ >= 0) { + if (IGNORE_EINTR(close(fd_))) + RAW_LOG(ERROR, "Failed to close directory handle"); + } + } + + bool IsValid() const { + return fd_ >= 0; + } + + // Move to the next entry returning false if the iteration is complete. + bool Next() { + if (size_) { + struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); + offset_ += dirent->d_reclen; + } + + if (offset_ != size_) + return true; + + ssize_t r = getdents(fd_, buf_, sizeof(buf_)); + if (r == 0) + return false; + if (r == -1) { + DPLOG(FATAL) << "getdents failed"; + return false; + } + size_ = r; + offset_ = 0; + return true; + } + + const char* name() const { + if (!size_) + return nullptr; + + const struct dirent* dirent = + reinterpret_cast<const struct dirent*>(&buf_[offset_]); + return dirent->d_name; + } + + int fd() const { + return fd_; + } + + static bool IsFallback() { + return false; + } + + private: + const int fd_; + alignas(struct dirent) unsigned char buf_[512]; + size_t offset_; + size_t size_; +}; + +} // namespace base + +#endif // BASE_FILES_DIR_READER_LINUX_H_ diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index 4c4f7d1439f3..158b7269d92f 100644 --- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -1,4 +1,4 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-03-12 23:57:15 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-04-20 18:58:23 UTC +++ build/config/compiler/pgo/pgo.gni @@ -16,7 +16,7 @@ declare_args() { # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once diff --git a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h index 500335ed930c..9a2964553490 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-03-13 00:03:39 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-04-20 19:05:14 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 7c65f0418c97..d1b7c835627e 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-03-12 23:57:14 UTC +--- BUILD.gn.orig 2021-04-14 18:40:47 UTC +++ BUILD.gn -@@ -421,7 +421,7 @@ group("gn_all") { +@@ -425,7 +425,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -464,8 +464,6 @@ group("gn_all") { +@@ -468,8 +468,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -520,10 +518,6 @@ group("gn_all") { +@@ -524,10 +522,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", -@@ -582,10 +576,6 @@ group("gn_all") { +@@ -586,10 +580,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -663,7 +653,7 @@ group("gn_all") { +@@ -667,7 +657,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)" ] } -@@ -678,7 +668,7 @@ group("gn_all") { +@@ -682,7 +672,7 @@ group("gn_all") { } } @@ -58,7 +58,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -790,7 +780,6 @@ group("gn_all") { +@@ -793,7 +783,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +66,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1081,7 +1070,7 @@ if (!is_ios) { +@@ -1086,7 +1075,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1090,7 +1079,7 @@ if (!is_ios) { +@@ -1095,7 +1084,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +84,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1315,9 +1304,6 @@ group("chromium_builder_perf") { +@@ -1321,9 +1310,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc index 6ce01dd474f5..25561c8131f0 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,4 +1,4 @@ ---- apps/app_restore_service_browsertest.cc.orig 2021-03-12 23:57:14 UTC +--- apps/app_restore_service_browsertest.cc.orig 2021-04-14 18:40:47 UTC +++ apps/app_restore_service_browsertest.cc @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 62d53b5ad9df..715b413018fa 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,4 +1,4 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2021-03-12 23:57:14 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2021-04-14 18:40:47 UTC +++ apps/ui/views/app_window_frame_view.cc @@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index ec171e5a8388..86ac55d854fe 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,4 +1,4 @@ ---- ash/display/mirror_window_controller.cc.orig 2021-03-12 23:57:14 UTC +--- ash/display/mirror_window_controller.cc.orig 2021-04-14 18:40:48 UTC +++ ash/display/mirror_window_controller.cc @@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 9f17ec075005..edc279a61b6b 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- base/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ base/BUILD.gn -@@ -885,7 +885,7 @@ component("base") { +@@ -948,7 +948,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -896,6 +896,11 @@ component("base") { +@@ -959,6 +959,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1301,7 +1306,7 @@ component("base") { +@@ -1364,7 +1369,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -30,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1351,7 +1356,7 @@ component("base") { +@@ -1414,7 +1419,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -39,7 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -1978,6 +1983,34 @@ component("base") { +@@ -2045,6 +2050,34 @@ component("base") { } } @@ -74,7 +74,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3130,7 +3163,7 @@ if (build_base_unittests) { +@@ -3231,7 +3264,7 @@ if (build_base_unittests) { } } @@ -83,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc" ] } -@@ -3171,7 +3204,7 @@ if (build_base_unittests) { +@@ -3272,7 +3305,7 @@ if (build_base_unittests) { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni index 7db05a57f80a..f3f2ae41d6a1 100644 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ b/www/chromium/files/patch-base_allocator_allocator.gni @@ -1,6 +1,6 @@ ---- base/allocator/allocator.gni.orig 2021-03-12 23:57:15 UTC +--- base/allocator/allocator.gni.orig 2021-04-14 18:40:48 UTC +++ base/allocator/allocator.gni -@@ -58,7 +58,7 @@ declare_args() { +@@ -60,7 +60,7 @@ declare_args() { # not, and redesign or remove the flag accordingly. We may want to assert a # possible conflict between |use_allocator = "partition"| and # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index be08a20e6d43..8b020cf5af31 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-03-12 23:57:15 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -6,18 +6,28 @@ #include "base/compiler_specific.h" diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index 8a09d9647589..6308eb5707c2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-03-12 23:57:15 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-04-14 18:40:48 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h @@ -16,6 +16,10 @@ #include <malloc.h> diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index 2c53c24036be..f859681f9b6b 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc index bbee8be9a54c..3c2f4be3e9cb 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/address_pool_manager.cc @@ -8,6 +8,13 @@ #include <sys/mman.h> 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 07f3a708203a..91f9b30c0ca2 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 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -27,12 +27,16 @@ +@@ -28,12 +28,16 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif @@ -18,7 +18,7 @@ #include "base/allocator/partition_allocator/page_allocator.h" #ifndef MAP_ANONYMOUS -@@ -168,12 +172,19 @@ void* SystemAllocPagesInternal(void* hint, +@@ -153,12 +157,19 @@ void* SystemAllocPagesInternal(void* hint, PA_DCHECK(PageTag::kFirst <= page_tag); PA_DCHECK(PageTag::kLast >= page_tag); int fd = VM_MAKE_TAG(static_cast<int>(page_tag)); @@ -38,7 +38,7 @@ #if defined(OS_APPLE) // On macOS 10.14 and higher, executables that are code signed with the -@@ -200,6 +211,8 @@ void* SystemAllocPagesInternal(void* hint, +@@ -185,6 +196,8 @@ void* SystemAllocPagesInternal(void* hint, prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length, PageTagToName(page_tag)); } @@ -47,7 +47,7 @@ #endif return ret; -@@ -294,6 +307,8 @@ void DiscardSystemPagesInternal(void* address, size_t +@@ -317,6 +330,8 @@ void DiscardSystemPagesInternal(void* address, size_t ret = madvise(address, length, MADV_DONTNEED); } PA_PCHECK(ret == 0); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index 22f583a2730f..8776e5e8e230 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/partition_alloc.cc @@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); 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 560073192bba..45fa7177cd36 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 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1588,7 +1588,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1644,7 +1644,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { // cause flake. #if !defined(OS_WIN) && \ (!defined(ARCH_CPU_64_BITS) || \ @@ -9,7 +9,7 @@ // The following four tests wrap a called function in an expect death statement // to perform their test, because they are non-hermetic. Specifically they are -@@ -1634,7 +1634,7 @@ TEST_F(PartitionAllocDeathTest, RepeatedTryReallocRetu +@@ -1695,7 +1695,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe } #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc deleted file mode 100644 index fb0dfd2b0719..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc +++ /dev/null @@ -1,36 +0,0 @@ ---- base/allocator/partition_allocator/partition_bucket.cc.orig 2021-03-23 17:09:47 UTC -+++ base/allocator/partition_allocator/partition_bucket.cc -@@ -66,27 +66,33 @@ PartitionDirectMap(PartitionRoot<thread_safe>* root, i - metadata->extent.root = root; - // The new structures are all located inside a fresh system page so they - // will all be zeroed out. These DCHECKs are for documentation. -+#if !defined(OS_FREEBSD) - PA_DCHECK(!metadata->extent.super_page_base); - PA_DCHECK(!metadata->extent.super_pages_end); - PA_DCHECK(!metadata->extent.next); -+#endif - PA_DCHECK(PartitionPage<thread_safe>::FromPointerNoAlignmentCheck(slot) == - &metadata->page); - - auto* page = &metadata->page; -+#if !defined(OS_FREEBSD) - PA_DCHECK(!page->slot_span_metadata_offset); - PA_DCHECK(!page->slot_span_metadata.next_slot_span); - PA_DCHECK(!page->slot_span_metadata.num_allocated_slots); - PA_DCHECK(!page->slot_span_metadata.num_unprovisioned_slots); - PA_DCHECK(!page->slot_span_metadata.empty_cache_index); -+#endif - page->slot_span_metadata.bucket = &metadata->bucket; - auto* next_entry = new (slot) PartitionFreelistEntry(); - page->slot_span_metadata.SetFreelistHead(next_entry); - -+#if !defined(OS_FREEBSD) - PA_DCHECK(!metadata->bucket.active_slot_spans_head); - PA_DCHECK(!metadata->bucket.empty_slot_spans_head); - PA_DCHECK(!metadata->bucket.decommitted_slot_spans_head); - PA_DCHECK(!metadata->bucket.num_system_pages_per_slot_span); - PA_DCHECK(!metadata->bucket.num_full_slot_spans); -+#endif - metadata->bucket.slot_size = slot_size; - - auto* map_extent = &metadata->direct_map_extent; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc new file mode 100644 index 000000000000..5c97ae660a7b --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -0,0 +1,47 @@ +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-04-15 11:28:02 UTC ++++ base/allocator/partition_allocator/partition_root.cc +@@ -20,7 +20,7 @@ + #include "wow64apiset.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <pthread.h> + #endif + +@@ -34,7 +34,7 @@ namespace { + + #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by + // design. +@@ -87,7 +87,7 @@ void AfterForkInChild() { + internal::ThreadCacheRegistry::Instance() + .ForcePurgeAllThreadAfterForkUnsafe(); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + std::atomic<bool> g_global_init_called; + void PartitionAllocMallocInitOnce() { +@@ -97,7 +97,7 @@ void PartitionAllocMallocInitOnce() { + if (!g_global_init_called.compare_exchange_strong(expected, true)) + return; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // When fork() is called, only the current thread continues to execute in the + // child process. If the lock is held, but *not* by this thread when fork() is + // called, we have a deadlock. +@@ -122,7 +122,7 @@ void PartitionAllocMallocInitOnce() { + int err = + pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); + PA_CHECK(err == 0); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index 2f293398e253..7fcb4113bbdc 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc @@ -16,9 +16,16 @@ #include <unistd.h> diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h index 344913dd5056..e40dd3c13a0e 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-03-12 23:57:15 UTC +--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-04-14 18:40:48 UTC +++ base/allocator/partition_allocator/spinning_mutex.h @@ -22,7 +22,11 @@ #define PA_HAS_LINUX_KERNEL diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 7f700892a8e1..5b612f9cd666 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 2021-03-12 23:57:15 UTC +--- base/base_switches.cc.orig 2021-04-14 18:40:48 UTC +++ base/base_switches.cc @@ -120,8 +120,8 @@ const char kDisableUsbKeyboardDetect[] = "disable diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index c3627665a8a3..106fbd5599dc 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 2021-03-12 23:57:15 UTC +--- base/base_switches.h.orig 2021-04-14 18:40:48 UTC +++ base/base_switches.h @@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[]; @@ -18,5 +18,5 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kEnableThreadInstructionCount[]; - #endif + // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when diff --git a/www/chromium/files/patch-base_bind.h b/www/chromium/files/patch-base_bind.h new file mode 100644 index 000000000000..f2715eccde4d --- /dev/null +++ b/www/chromium/files/patch-base_bind.h @@ -0,0 +1,11 @@ +--- base/bind.h.orig 2021-04-15 11:29:10 UTC ++++ base/bind.h +@@ -313,7 +313,7 @@ inline OnceCallback<MakeUnboundRunType<Functor, Args.. + !std::is_const<std::remove_reference_t<Functor>>()), + "BindOnce requires non-const rvalue for OnceCallback binding." + " I.e.: base::BindOnce(std::move(callback))."); +-#if defined(OS_LINUX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(NCTEST_BIND_ONCE_WITH_PASSED) + // TODO(https://crbug.com/1180750): Enable this everywhere. + static_assert( diff --git a/www/chromium/files/patch-base_check.h b/www/chromium/files/patch-base_check.h new file mode 100644 index 000000000000..8ff12ec1ffe7 --- /dev/null +++ b/www/chromium/files/patch-base_check.h @@ -0,0 +1,11 @@ +--- base/check.h.orig 2021-04-22 11:38:19 UTC ++++ base/check.h +@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError { + // Stream for adding optional details to the error message. + std::ostream& stream(); + +- NOMERGE ~CheckError(); ++ ~CheckError(); + + CheckError(const CheckError& other) = delete; + CheckError& operator=(const CheckError& other) = delete; diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index c1e85a57c187..c9a46b5903d3 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,4 +1,4 @@ ---- base/cpu.cc.orig 2021-03-12 23:57:15 UTC +--- base/cpu.cc.orig 2021-04-14 18:40:48 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ @@ -9,7 +9,7 @@ defined(OS_AIX) #include "base/containers/flat_set.h" #include "base/files/file_util.h" -@@ -212,6 +212,14 @@ const ProcCpuInfo& ParseProcCpu() { +@@ -214,6 +214,14 @@ const ProcCpuInfo& ParseProcCpu() { return *info; } @@ -24,7 +24,7 @@ #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -348,6 +356,8 @@ void CPU::Initialize() { +@@ -352,6 +360,8 @@ void CPU::Initialize(bool require_branding) { has_bti_ = hwcap2 & HWCAP2_BTI; #endif diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h index 3a2ac0b71e70..648d68bdb1c0 100644 --- a/www/chromium/files/patch-base_cpu.h +++ b/www/chromium/files/patch-base_cpu.h @@ -1,6 +1,6 @@ ---- base/cpu.h.orig 2021-03-12 23:57:15 UTC +--- base/cpu.h.orig 2021-04-14 18:40:48 UTC +++ base/cpu.h -@@ -84,7 +84,7 @@ class BASE_EXPORT CPU final { +@@ -92,7 +92,7 @@ class BASE_EXPORT CPU final { IntelMicroArchitecture GetIntelMicroArchitecture() const; const std::string& cpu_brand() const { return cpu_brand_; } @@ -9,7 +9,7 @@ defined(OS_AIX) enum class CoreType { kUnknown = 0, -@@ -135,7 +135,7 @@ class BASE_EXPORT CPU final { +@@ -143,7 +143,7 @@ class BASE_EXPORT CPU final { // cpuidle driver. using CoreIdleTimes = std::vector<TimeDelta>; static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index e2dd3991b967..ea7f110b6fb4 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/debugger_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/debugger_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/debugger_posix.cc @@ -98,7 +98,7 @@ bool BeingDebugged() { KERN_PROC, diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index aa96ca6baa55..46585628ac17 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,4 +1,4 @@ ---- base/debug/elf_reader.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/elf_reader.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/elf_reader.cc @@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; @@ -24,5 +24,5 @@ } +#endif - size_t section_size = bits::Align(current_note->n_namesz, 4) + - bits::Align(current_note->n_descsz, 4) + + size_t section_size = bits::AlignUp(current_note->n_namesz, 4) + + bits::AlignUp(current_note->n_descsz, 4) + diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index 5f4e50d83152..9d9eff8794a9 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,4 +1,4 @@ ---- base/debug/proc_maps_linux.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/proc_maps_linux.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/proc_maps_linux.cc @@ -13,13 +13,18 @@ #include "base/strings/string_split.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index f1f952c8aa0d..9d606cdbdc91 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/stack_trace.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/stack_trace.cc @@ -15,7 +15,7 @@ diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 00dd078e8065..4c3df9dae05c 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.h.orig 2021-03-12 23:57:15 UTC +--- base/debug/stack_trace.h.orig 2021-04-14 18:40:48 UTC +++ base/debug/stack_trace.h @@ -19,6 +19,7 @@ #if !defined(OS_NACL) diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 3522bc090ee2..bc18b34a20ab 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc index 908692edeb5b..6eb9d505526c 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/debug/stack_trace_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/debug/stack_trace_unittest.cc @@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { std::string::npos) diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index ff04f093e49a..f638d3146191 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/files/file_path_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/files/file_path_unittest.cc @@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, diff --git a/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc index 238272c3d48e..a10889cb9fdb 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_freebsd.cc.orig 2021-03-15 11:01:22 UTC +--- base/files/file_path_watcher_freebsd.cc.orig 2021-04-15 08:12:30 UTC +++ base/files/file_path_watcher_freebsd.cc @@ -0,0 +1,61 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index 61baa1ecef2d..75dd465828bc 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2021-03-12 23:57:15 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2021-04-14 18:40:48 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ 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 0de14fe28938..a19163383934 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,4 +1,4 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/files/file_path_watcher_unittest.cc @@ -444,12 +444,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index ff39cb3060bf..7c1f77514e28 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,4 +1,4 @@ ---- base/files/file_util.h.orig 2021-03-12 23:57:15 UTC +--- base/files/file_util.h.orig 2021-04-14 18:40:48 UTC +++ base/files/file_util.h @@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, 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 d906280bcf53..b6fc1193f750 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/files/file_util_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/files/file_util_posix.cc @@ -380,7 +380,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } @@ -9,7 +9,7 @@ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -927,8 +927,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -928,8 +928,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si // space. It can fail because the filesystem doesn't support it. In that case, // use the manual method below. @@ -23,7 +23,7 @@ return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1098,7 +1102,7 @@ int GetMaximumPathComponentLength(const FilePath& path +@@ -1099,7 +1103,7 @@ int GetMaximumPathComponentLength(const FilePath& path #if !defined(OS_ANDROID) // This is implemented in file_util_android.cc for that platform. bool GetShmemTempDir(bool executable, FilePath* path) { @@ -32,7 +32,7 @@ bool disable_dev_shm = false; #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( -@@ -1114,7 +1118,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) +@@ -1115,7 +1119,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) *path = FilePath("/dev/shm"); return true; } @@ -41,7 +41,7 @@ return GetTempDir(path); } #endif // !defined(OS_ANDROID) -@@ -1152,7 +1156,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1153,7 +1157,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, // posix_fadvise() is only available in the Android NDK in API 21+. Older // versions may have the required kernel support, but don't have enough usage // to justify backporting. @@ -50,7 +50,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1188,7 +1192,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1189,7 +1193,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -59,7 +59,7 @@ // __ANDROID_API__ >= 21) } -@@ -1223,7 +1227,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1224,7 +1228,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP #endif // !defined(OS_NACL_NONSFI) @@ -68,7 +68,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1244,6 +1248,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1245,6 +1249,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } 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 b9f003815230..59ef4f71c48b 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/files/file_util_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/files/file_util_unittest.cc @@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { #endif diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc index b6c65b08e0f5..bcef7a1f0bbd 100644 --- a/www/chromium/files/patch-base_files_scoped__file.cc +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -1,4 +1,4 @@ ---- base/files/scoped_file.cc.orig 2021-03-12 23:57:15 UTC +--- base/files/scoped_file.cc.orig 2021-04-14 18:40:48 UTC +++ base/files/scoped_file.cc @@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { // a single open directory would bypass the entire security model. diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 42e2785b6749..875f22e7e743 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2021-03-12 23:57:15 UTC +--- base/i18n/icu_util.cc.orig 2021-04-14 18:40:48 UTC +++ base/i18n/icu_util.cc @@ -48,7 +48,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 8be465fb7750..619faa4a1798 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2021-03-12 23:57:15 UTC +--- base/linux_util.cc.orig 2021-04-14 18:40:48 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc index 77e2ed901f46..655520cd69dd 100644 --- a/www/chromium/files/patch-base_location__unittest.cc +++ b/www/chromium/files/patch-base_location__unittest.cc @@ -1,4 +1,4 @@ ---- base/location_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/location_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/location_unittest.cc @@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { EXPECT_EQ(here.line_number(), previous_line + 1); diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 37ae1188ea72..dfe9a09bd0bb 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/logging_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/logging_unittest.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #include "base/posix/eintr_wrapper.h" #endif // OS_POSIX @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -560,7 +560,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -557,7 +557,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index b656c7deb12d..0bc1fa1271a9 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory.cc.orig 2021-03-12 23:57:15 UTC +--- base/memory/discardable_memory.cc.orig 2021-04-14 18:40:48 UTC +++ base/memory/discardable_memory.cc @@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h index 349698009629..aad3103a3e2c 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory_internal.h.orig 2021-03-12 23:57:15 UTC +--- base/memory/discardable_memory_internal.h.orig 2021-04-14 18:40:48 UTC +++ base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.h" 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 a8fad1c516da..7d915032033f 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,4 +1,4 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/memory/madv_free_discardable_memory_posix.cc @@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index 20585a18c5b1..d5679bdece87 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2021-03-12 23:57:15 UTC +--- base/memory/platform_shared_memory_region.h.orig 2021-04-14 18:40:48 UTC +++ base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 1348b041f980..5659e90acc28 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits { static const FilePath* InvalidValue() { return nullptr; } diff --git a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc index e7b126ff9181..184ac299c806 100644 --- a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc +++ b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc @@ -1,4 +1,4 @@ ---- base/memory/shared_memory_region_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/memory/shared_memory_region_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/memory/shared_memory_region_unittest.cc @@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize); diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc index 6e3de9a10129..32cd1a40850f 100644 --- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2021-03-12 23:57:15 UTC +--- base/message_loop/message_pump_glib.cc.orig 2021-04-14 18:40:48 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index d414a8d50f6b..a7ea746723c5 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/native_library_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/native_library_posix.cc -@@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -31,7 +31,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc index a0e426036038..58952dbd6b3a 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -1,4 +1,4 @@ ---- base/native_library_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/native_library_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/native_library_unittest.cc @@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // Android dlopen() requires further investigation, as it might vary across diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h index 7776c0cc6b0e..4a3d6cc92eb5 100644 --- a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h +++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,4 +1,4 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2021-03-12 23:57:15 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2021-04-14 18:40:48 UTC +++ base/numerics/safe_math_shared_impl.h @@ -24,8 +24,7 @@ // Where available use builtin math overflow support on Clang and GCC. diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index 236be0173e7d..e67c5a871563 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,4 +1,4 @@ ---- base/path_service_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/path_service_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/path_service_unittest.cc @@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { if (dir_type == DIR_CACHE) diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc index 64e3f2168c3c..9ffbb4524a4d 100644 --- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc +++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc @@ -1,4 +1,4 @@ ---- base/posix/can_lower_nice_to.cc.orig 2021-03-12 23:57:15 UTC +--- base/posix/can_lower_nice_to.cc.orig 2021-04-14 18:40:48 UTC +++ base/posix/can_lower_nice_to.cc @@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { if (geteuid() == 0) 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 7d9441824666..567e4ba035e0 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 2021-03-12 23:57:15 UTC +--- base/posix/unix_domain_socket.cc.orig 2021-04-14 18:40:48 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc index b3944551d784..47dce76652a8 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/posix/unix_domain_socket_unittest.cc @@ -8,6 +8,9 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index f8e0799d3d6a..d0dba67d9274 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,4 +1,4 @@ ---- base/process/internal_linux.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/internal_linux.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/internal_linux.cc @@ -30,7 +30,11 @@ namespace internal { diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index b8a5fa684b9c..7a3c69cb475f 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 2021-03-12 23:57:15 UTC +--- base/process/internal_linux.h.orig 2021-04-14 18:40:48 UTC +++ base/process/internal_linux.h @@ -18,6 +18,8 @@ #include "base/strings/string_number_conversions.h" diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index 197258681b45..b135b44d2e28 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,4 +1,4 @@ ---- base/process/kill.h.orig 2021-03-12 23:57:15 UTC +--- base/process/kill.h.orig 2021-04-14 18:40:48 UTC +++ base/process/kill.h @@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 71f59db89ba7..6aaac4f25cc0 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,4 +1,4 @@ ---- base/process/kill_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/kill_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/kill_posix.cc @@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 3abc9079ab29..59944e45465b 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/launch.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 84f428750a77..f9695cb9f7f7 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2021-03-12 23:57:15 UTC +--- base/process/launch.h.orig 2021-04-14 18:40:48 UTC +++ base/process/launch.h -@@ -182,7 +182,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -190,7 +190,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -203,7 +203,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; @@ -18,7 +18,7 @@ #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -410,7 +410,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -418,7 +418,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index b55eb2ddc7f7..f312ca87e251 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 2021-03-12 23:57:15 UTC +--- base/process/launch_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/launch_posix.cc @@ -59,12 +59,14 @@ #if defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 9427d265694f..a51cddeb2ed4 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,16 +1,7 @@ ---- base/process/memory.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/memory.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/memory.cc -@@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { - } // namespace internal - - // Defined in memory_win.cc for Windows. --#if !defined(OS_WIN) -+#if !defined(OS_WIN) && !defined(OS_BSD) - - namespace { - -@@ -74,7 +74,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - #endif // !defined(OS_WIN) +@@ -68,7 +68,7 @@ void TerminateBecauseOutOfMemory(size_t size) { + } // Defined in memory_mac.mm for Mac. -#if !defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index ce431beeb301..03eff8b25b5a 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,11 +1,11 @@ ---- base/process/memory.h.orig 2021-03-12 23:57:15 UTC +--- base/process/memory.h.orig 2021-04-14 18:40:48 UTC +++ base/process/memory.h -@@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); - // Crash reporting classifies such crashes as OOM. - BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); +@@ -31,7 +31,7 @@ BASE_EXPORT void TerminateBecauseOutOfMemory(size_t si + // TODO: this can be removed when Breakpad is no longer supported. + BASE_EXPORT extern size_t g_oom_size; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_AIX) - BASE_EXPORT extern size_t g_oom_size; - + // The maximum allowed value for the OOM score. + const int kMaxOomScore = 1000; diff --git a/www/chromium/files/patch-base_process_memory__stubs.cc b/www/chromium/files/patch-base_process_memory__stubs.cc new file mode 100644 index 000000000000..80ef5e08c505 --- /dev/null +++ b/www/chromium/files/patch-base_process_memory__stubs.cc @@ -0,0 +1,14 @@ +--- base/process/memory_stubs.cc.orig 2021-04-22 13:13:03 UTC ++++ base/process/memory_stubs.cc +@@ -19,9 +19,11 @@ bool AdjustOOMScore(ProcessId process, int score) { + return false; + } + ++#if !defined(OS_BSD) + void TerminateBecauseOutOfMemory(size_t size) { + abort(); + } ++#endif + + // UncheckedMalloc and Calloc exist so that platforms making use of + // EnableTerminationOnOutOfMemory have a way to allocate memory without diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index ebd8ce1dc915..ec0df47ff011 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/memory_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/memory_unittest.cc @@ -38,6 +38,8 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #endif #if defined(OS_WIN) -@@ -105,9 +107,9 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -110,9 +112,9 @@ TEST(MemoryTest, AllocatorShimWorking) { #endif } @@ -21,7 +21,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -299,7 +301,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { +@@ -307,7 +309,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { #endif // defined(OS_WIN) #endif // !defined(OS_MAC) && !defined(OS_ANDROID) @@ -30,7 +30,7 @@ TEST_F(OutOfMemoryDeathTest, Valloc) { ASSERT_OOM_DEATH({ -@@ -345,7 +347,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { +@@ -353,7 +355,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { value_ = MallocWrapper(test_size_); }); } @@ -39,7 +39,7 @@ // Android doesn't implement posix_memalign(). #if defined(OS_POSIX) && !defined(OS_ANDROID) -@@ -496,7 +498,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep +@@ -504,7 +506,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep #endif // OS_WIN #if defined(ARCH_CPU_32_BITS) && \ @@ -48,7 +48,7 @@ void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), void (*free_fn)(void*)) { -@@ -554,7 +556,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) +@@ -562,7 +564,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) [](size_t size) { return static_cast<void*>(new char[size]); }, [](void* ptr) { delete[] static_cast<char*>(ptr); }); } @@ -57,7 +57,7 @@ // defined(OS_CHROMEOS)) // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -616,5 +618,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -624,5 +626,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 28e99ae6c9d4..781e7bafa948 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_handle.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_handle.cc @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 18238683a05f..962a580a10a9 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,4 +1,4 @@ ---- base/process/process_handle.h.orig 2021-03-12 23:57:15 UTC +--- base/process/process_handle.h.orig 2021-04-14 18:40:48 UTC +++ base/process/process_handle.h @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index 76936bbfe294..20a4c07237c3 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_handle_freebsd.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_handle_freebsd.cc @@ -16,10 +16,13 @@ namespace base { diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index a85419c8c54d..c83ab74f2678 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_iterator_freebsd.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index a0a20c0f87a3..b91800cecacc 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,4 +1,4 @@ ---- base/process/process_linux.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_linux.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_linux.cc @@ -24,7 +24,9 @@ namespace base { @@ -19,7 +19,7 @@ const int kBackgroundPriority = 5; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -96,13 +98,18 @@ Time Process::CreationTime() const { +@@ -85,13 +87,18 @@ Time Process::CreationTime() const { if (!start_ticks) return Time(); @@ -38,7 +38,7 @@ // static bool Process::CanBackgroundProcesses() { #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -154,6 +161,7 @@ bool Process::SetProcessBackgrounded(bool background) +@@ -143,6 +150,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index b1789fe4854a..e8b37cab59d8 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_metrics.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_metrics.cc @@ -50,7 +50,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index cfbd2005c4ad..2705a62eb1a9 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2021-03-12 23:57:15 UTC +--- base/process/process_metrics.h.orig 2021-04-14 18:40:48 UTC +++ base/process/process_metrics.h @@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. 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 f6df9a5b3396..b3cfd3d4c3c2 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_metrics_freebsd.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 69540cbc8d25..b476b607f81e 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_metrics_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index e2c0cca7cdd6..684f1fe44457 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_unittest.cc.orig 2021-04-20 18:58:23 UTC +++ base/process/process_unittest.cc -@@ -138,7 +138,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -139,7 +139,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = @@ -9,3 +9,19 @@ // On Linux, process creation time is relative to boot time which has a // 1-second resolution. Tolerate 1 second for the imprecise boot time and // 100 ms for the imprecise clock. +@@ -287,6 +287,7 @@ TEST_F(ProcessTest, WaitForExitOrEventWithEventSet) { + } + #endif // OS_WIN + ++#if !defined(OS_BSD) + // Ensure that the priority of a process is restored correctly after + // backgrounding and restoring. + // Note: a platform may not be willing or able to lower the priority of +@@ -344,6 +345,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { + int new_priority = process.GetPriority(); + EXPECT_EQ(old_priority, new_priority); + } ++#endif + + // Consumers can use WaitForExitWithTimeout(base::TimeDelta(), nullptr) to check + // whether the process is still running. This may not be safe because of the diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc index 0b9f07e4fac8..cd120fcde687 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_util_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/process/process_util_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/process/process_util_unittest.cc -@@ -1308,11 +1308,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli +@@ -1337,11 +1337,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index 20c522c39c13..1b5f72e3189a 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,4 +1,4 @@ ---- base/profiler/register_context.h.orig 2021-03-12 23:57:15 UTC +--- base/profiler/register_context.h.orig 2021-04-14 18:40:48 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include <windows.h> diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index cb734b35baa1..fb64e59d8b3f 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2021-03-12 23:57:15 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2021-04-14 18:40:48 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -7,7 +7,7 @@ namespace base { diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index 6a8db9bde841..b9f665289555 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2021-03-12 23:57:15 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2021-04-14 18:40:48 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" 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 0e9a2eb0fe93..60f317885f8b 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 2021-03-12 23:57:15 UTC +--- base/profiler/stack_copier_signal.cc.orig 2021-04-14 18:40:48 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ 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 3f2832f89006..039d8c363856 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,4 +1,4 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2021-03-12 23:57:15 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2021-04-14 18:40:48 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc @@ -32,7 +32,7 @@ // Fortunately, it provides _alloca, which functions identically. diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 643ce4378303..a0fe47642167 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc @@ -42,7 +42,7 @@ #include <intrin.h> diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index e98382c18800..ad992a5c09a0 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,4 +1,4 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/profiler/thread_delegate_posix.cc @@ -12,6 +12,9 @@ #include "base/profiler/thread_delegate_posix.h" diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index c194af3d33d5..147615bfbf75 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,4 +1,4 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-03-12 23:57:15 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-04-14 18:40:48 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 91d05f550115..c8628452c1ee 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/security_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/security_unittest.cc @@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu void OverflowTestsSoftExpectTrue(bool overflow_detected) { diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc index f1d7377c58d2..61769926edcc 100644 --- a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc +++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc @@ -1,4 +1,4 @@ ---- base/strings/sys_string_conversions_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/strings/sys_string_conversions_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/strings/sys_string_conversions_unittest.cc @@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { } diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index 08323a1eeeee..e8f6b7219bfa 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,4 +1,4 @@ ---- base/synchronization/lock_impl.h.orig 2021-03-12 23:57:15 UTC +--- base/synchronization/lock_impl.h.orig 2021-04-14 18:40:48 UTC +++ base/synchronization/lock_impl.h @@ -105,6 +105,8 @@ void LockImpl::Unlock() { } diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index 3c3a7a71f3f6..b4460c41a14b 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,4 +1,4 @@ ---- base/syslog_logging.cc.orig 2021-03-12 23:57:15 UTC +--- base/syslog_logging.cc.orig 2021-04-14 18:40:48 UTC +++ base/syslog_logging.cc @@ -13,7 +13,7 @@ #include "base/strings/string_util.h" diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 6567dc430f4e..d2be91728b01 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info.cc.orig 2021-03-12 23:57:15 UTC +--- base/system/sys_info.cc.orig 2021-04-14 18:40:48 UTC +++ base/system/sys_info.cc @@ -94,7 +94,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 16d9092bc224..c0b215d92149 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 2021-03-12 23:57:15 UTC +--- base/system/sys_info.h.orig 2021-04-14 18:40:48 UTC +++ base/system/sys_info.h -@@ -202,6 +202,8 @@ class BASE_EXPORT SysInfo { +@@ -209,6 +209,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); -@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo { +@@ -218,7 +220,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index d9d7666229a7..1dceaec008cd 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_freebsd.cc.orig 2021-03-12 23:57:15 UTC +--- base/system/sys_info_freebsd.cc.orig 2021-04-14 18:40:48 UTC +++ base/system/sys_info_freebsd.cc @@ -9,30 +9,95 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 4f5d25393487..46bca98b2550 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/system/sys_info_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/system/sys_info_posix.cc -@@ -25,6 +25,11 @@ +@@ -26,6 +26,11 @@ #if defined(OS_ANDROID) #include <sys/vfs.h> #define statvfs statfs // Android uses a statvfs-like statfs struct and call. @@ -12,7 +12,7 @@ #else #include <sys/statvfs.h> #endif -@@ -224,6 +229,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -239,6 +244,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index 75ea1a02ee4e..d0e725d262d7 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/system/sys_info_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/system/sys_info_unittest.cc -@@ -62,13 +62,13 @@ TEST_F(SysInfoTest, AmountOfMem) { +@@ -63,13 +63,13 @@ TEST_F(SysInfoTest, AmountOfMem) { EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); } @@ -17,7 +17,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { // Note: info is in _K_bytes. SystemMemoryInfoKB info; -@@ -99,7 +99,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem +@@ -100,7 +100,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024); EXPECT_LT(amount / 1024, info.total); } @@ -26,7 +26,7 @@ TEST_F(SysInfoTest, AmountOfFreeDiskSpace) { // We aren't actually testing that it's correct, just that it's sane. -@@ -149,7 +149,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac +@@ -150,7 +150,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac } #endif // defined(OS_FUCHSIA) @@ -35,7 +35,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { int32_t os_major_version = -1; -@@ -210,7 +210,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -236,7 +236,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 32c3cb7fe7bc..af894c771972 100644 --- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,4 +1,4 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -14,7 +14,7 @@ namespace internal { TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 77c53a07d8d9..18f8ca8e64a4 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 2021-03-12 23:57:15 UTC +--- base/test/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ base/test/BUILD.gn -@@ -428,7 +428,11 @@ if (is_linux || is_chromeos) { +@@ -421,7 +421,11 @@ if (is_linux || is_chromeos) { 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 a383ea3c7641..d5ecd16fb2f8 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2021-03-12 23:57:15 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-04-14 18:40:48 UTC +++ base/test/launcher/test_launcher.cc @@ -58,6 +58,7 @@ #include "testing/gtest/include/gtest/gtest.h" @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1516,7 +1517,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) { results_tracker_.AddGlobalTag("OS_IOS"); #endif diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index 137f48dbf98e..2bd4c0452c6b 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,4 +1,4 @@ ---- base/test/test_file_util_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/test/test_file_util_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/test/test_file_util_posix.cc @@ -87,7 +87,7 @@ void SyncPageCacheToDisk() { sync(); diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index c4d114600fe2..db96223b4238 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 2021-03-12 23:57:15 UTC +--- base/test/test_suite.cc.orig 2021-04-20 18:58:23 UTC +++ base/test/test_suite.cc -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ #include "base/test/test_support_android.h" #endif @@ -9,7 +9,16 @@ #include "base/test/fontconfig_util_linux.h" #endif -@@ -382,14 +382,14 @@ void TestSuite::PreInitialize() { +@@ -214,7 +214,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes + }; + + // base::Process is not available on iOS +-#if !defined(OS_IOS) ++#if !defined(OS_IOS) && !defined(OS_BSD) + class CheckProcessPriority : public testing::EmptyTestEventListener { + public: + CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } +@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -26,7 +35,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -650,7 +650,7 @@ void TestSuite::Initialize() { +@@ -657,7 +657,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); @@ -35,3 +44,12 @@ SetUpFontconfig(); #endif +@@ -670,7 +670,7 @@ void TestSuite::Initialize() { + if (check_for_leaked_globals_) + listeners.Append(new CheckForLeakedGlobals); + if (check_for_thread_and_process_priority_) { +-#if !defined(OS_IOS) ++#if !defined(OS_IOS) && !defined(OS_BSD) + listeners.Append(new CheckProcessPriority); + #endif + } diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index 5ef582ab80d9..95d998da0943 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,4 +1,4 @@ ---- base/third_party/libevent/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- base/third_party/libevent/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ base/third_party/libevent/BUILD.gn @@ -43,13 +43,20 @@ static_library("libevent") { "mac/event-config.h", diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index ec417fb772f6..1b335ea99b35 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,4 +1,4 @@ ---- base/threading/platform_thread.h.orig 2021-03-12 23:57:15 UTC +--- base/threading/platform_thread.h.orig 2021-04-14 18:40:48 UTC +++ base/threading/platform_thread.h @@ -231,7 +231,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by |delegate|. diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h index 1d75cd4cd16d..aa814ce4c670 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_internal_posix.h.orig 2021-03-12 23:57:15 UTC +--- base/threading/platform_thread_internal_posix.h.orig 2021-04-14 18:40:48 UTC +++ base/threading/platform_thread_internal_posix.h @@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit // of CanIncreaseThreadPriority(). diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index 354fb7c81799..8a5b4291b007 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2021-03-12 23:57:15 UTC +--- base/threading/platform_thread_linux.cc.orig 2021-04-14 18:40:48 UTC +++ base/threading/platform_thread_linux.cc @@ -27,7 +27,9 @@ diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 6df053313128..73d12e31ceb6 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2021-03-12 23:57:15 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-04-14 18:40:48 UTC +++ base/threading/platform_thread_posix.cc @@ -32,6 +32,10 @@ #include <sys/syscall.h> diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index 8f58f5244228..f69b6c17844a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/threading/platform_thread_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/threading/platform_thread_unittest.cc -@@ -312,7 +312,7 @@ TEST(PlatformThreadTest, +@@ -313,7 +313,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanIncreaseThreadPriority) { @@ -9,7 +9,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -406,9 +406,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -407,9 +407,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc index 7a59470f065d..0507cf7347c6 100644 --- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/threading/scoped_blocking_call_unittest.cc @@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index 009859798e28..bc03e79e565a 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2021-03-12 23:57:15 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2021-04-14 18:40:48 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc index c0cabcc11f62..79f46256e239 100644 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -1,4 +1,4 @@ ---- base/time/time_unittest.cc.orig 2021-03-12 23:57:15 UTC +--- base/time/time_unittest.cc.orig 2021-04-14 18:40:48 UTC +++ base/time/time_unittest.cc @@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { EXPECT_TRUE((kLargeDelta / 0.5).is_max()); diff --git a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc index 08477d7b3b80..db289fa7ecc6 100644 --- a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc +++ b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc @@ -1,4 +1,4 @@ ---- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-03-12 23:57:15 UTC +--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-04-14 18:40:48 UTC +++ base/trace_event/heap_profiler_allocation_context_tracker.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index afbf97a668d0..4f094d046bd0 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-03-12 23:57:15 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-04-14 18:40:48 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -184,6 +186,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -185,6 +187,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. 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 a6931d12baf3..2d3d5a52f78c 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,4 +1,4 @@ ---- base/trace_event/process_memory_dump.cc.orig 2021-03-12 23:57:15 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-04-14 18:40:48 UTC +++ base/trace_event/process_memory_dump.cc @@ -101,7 +101,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden #if defined(OS_WIN) diff --git a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc index a7a50b33f4cd..9c506c990d39 100644 --- a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc +++ b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc @@ -1,4 +1,4 @@ ---- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2021-03-12 23:57:15 UTC +--- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2021-04-14 18:40:48 UTC +++ base/util/memory_pressure/system_memory_pressure_evaluator.cc @@ -17,7 +17,7 @@ #include "base/win/windows_version.h" diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 516a836ec2a5..35b0684f9256 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- build/config/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ build/config/BUILD.gn @@ -232,9 +232,7 @@ config("default_libs") { ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index e434d1df8b05..a9a78e5cf361 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-03-12 23:57:15 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-04-14 18:40:48 UTC +++ build/config/BUILDCONFIG.gn -@@ -194,8 +194,8 @@ if (host_toolchain == "") { +@@ -183,8 +183,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -11,7 +11,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -232,7 +232,7 @@ if (target_os == "android") { +@@ -221,7 +221,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -20,7 +20,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -293,10 +293,11 @@ if (custom_toolchain != "") { +@@ -282,10 +282,11 @@ if (custom_toolchain != "") { # current_os value directly. is_android = current_os == "android" diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 2a92a5062dd3..13b39bd99279 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- build/config/compiler/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ build/config/compiler/BUILD.gn @@ -132,7 +132,7 @@ declare_args() { # @@ -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 -@@ -316,7 +316,7 @@ config("compiler") { +@@ -324,7 +324,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -411,7 +411,7 @@ config("compiler") { +@@ -419,7 +419,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", -@@ -501,7 +501,7 @@ config("compiler") { +@@ -509,7 +509,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -35,8 +35,8 @@ + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] - cflags += [ -@@ -796,7 +796,7 @@ config("compiler_cpu_abi") { + # TODO(hans): Remove this once Clang generates better optimized debug info +@@ -848,7 +848,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" ] } -@@ -1146,7 +1146,7 @@ config("compiler_deterministic") { +@@ -1198,7 +1198,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1529,7 +1529,7 @@ config("default_warnings") { +@@ -1581,7 +1581,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1570,6 +1570,18 @@ config("default_warnings") { +@@ -1622,6 +1622,18 @@ config("default_warnings") { cflags += [ "-Wno-max-tokens" ] } } @@ -82,7 +82,7 @@ } } } -@@ -1699,7 +1711,7 @@ config("no_chromium_code") { +@@ -1751,7 +1763,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -91,7 +91,7 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1777,7 +1789,7 @@ config("export_dynamic") { +@@ -1829,7 +1841,7 @@ config("export_dynamic") { config("thin_archive") { # The macOS and iOS default linker ld64 does not support reading thin # archives. @@ -100,7 +100,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2318,7 +2330,7 @@ config("symbols") { +@@ -2374,7 +2386,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) { @@ -109,7 +109,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2350,7 +2362,7 @@ config("symbols") { +@@ -2407,7 +2419,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_apple && !is_nacl && current_cpu != "x86" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 712d36e592b0..653a3fce454e 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,4 +1,4 @@ ---- build/config/compiler/compiler.gni.orig 2021-03-12 23:57:15 UTC +--- build/config/compiler/compiler.gni.orig 2021-04-14 18:40:48 UTC +++ build/config/compiler/compiler.gni @@ -201,7 +201,7 @@ declare_args() { diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index a40d39ee555d..282ec208bed4 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,4 +1,4 @@ ---- build/config/features.gni.orig 2021-03-12 23:57:15 UTC +--- build/config/features.gni.orig 2021-04-14 18:40:48 UTC +++ build/config/features.gni @@ -26,7 +26,7 @@ declare_args() { proprietary_codecs = is_chrome_branded || is_chromecast diff --git a/www/chromium/files/patch-build_config_freetype_freetype.gni b/www/chromium/files/patch-build_config_freetype_freetype.gni index b0cafcefb260..0db577fe0459 100644 --- a/www/chromium/files/patch-build_config_freetype_freetype.gni +++ b/www/chromium/files/patch-build_config_freetype_freetype.gni @@ -1,4 +1,4 @@ ---- build/config/freetype/freetype.gni.orig 2021-03-19 11:22:27 UTC +--- build/config/freetype/freetype.gni.orig 2021-04-14 18:40:48 UTC +++ build/config/freetype/freetype.gni @@ -10,5 +10,5 @@ declare_args() { # than version 2.7.1 and have color bitmap support compiled in. WARNING: diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn index 3b27fbfea43e..573507ef09e7 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/linux/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- build/config/linux/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ build/config/linux/BUILD.gn -@@ -32,7 +32,7 @@ config("runtime_library") { +@@ -30,7 +30,7 @@ config("runtime_library") { if ((!(is_chromeos_ash || is_chromeos_lacros) || default_toolchain != "//build/toolchain/cros:target") && diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index aa7ca0f75d5b..7ed4de72c661 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- build/config/linux/pkg-config.py.orig 2021-03-12 23:57:15 UTC +--- build/config/linux/pkg-config.py.orig 2021-04-14 18:40:48 UTC +++ build/config/linux/pkg-config.py @@ -59,8 +59,12 @@ def SetConfigPath(options): print("You must specify an architecture via -a if using a sysroot.") diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index add2a94c9b2b..28f294c8de21 100644 --- a/www/chromium/files/patch-build_config_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2021-03-12 23:57:15 UTC +--- build/config/ozone.gni.orig 2021-04-14 18:40:48 UTC +++ build/config/ozone.gni -@@ -70,6 +70,9 @@ declare_args() { +@@ -79,6 +79,9 @@ declare_args() { ozone_platform = "x11" ozone_platform_drm = true ozone_platform_x11 = true diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni index 65b672a9c63e..b68650b4abf9 100644 --- a/www/chromium/files/patch-build_config_sysroot.gni +++ b/www/chromium/files/patch-build_config_sysroot.gni @@ -1,4 +1,4 @@ ---- build/config/sysroot.gni.orig 2021-03-12 23:57:15 UTC +--- build/config/sysroot.gni.orig 2021-04-14 18:40:48 UTC +++ build/config/sysroot.gni @@ -21,9 +21,9 @@ declare_args() { diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py index 84b6ece317b6..9d8ad2c44d2b 100644 --- a/www/chromium/files/patch-build_detect__host__arch.py +++ b/www/chromium/files/patch-build_detect__host__arch.py @@ -1,4 +1,4 @@ ---- build/detect_host_arch.py.orig 2021-03-12 23:57:15 UTC +--- build/detect_host_arch.py.orig 2021-04-14 18:40:48 UTC +++ build/detect_host_arch.py @@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py index c56ad6ea285f..905ddf57f5d1 100644 --- a/www/chromium/files/patch-build_gn__run__binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -1,4 +1,4 @@ ---- build/gn_run_binary.py.orig 2021-03-12 23:57:15 UTC +--- build/gn_run_binary.py.orig 2021-04-14 18:40:48 UTC +++ build/gn_run_binary.py @@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map index 8e4f0f67de55..444c645ca7df 100644 --- a/www/chromium/files/patch-build_linux_chrome.map +++ b/www/chromium/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 2021-03-12 23:57:15 UTC +--- build/linux/chrome.map.orig 2021-04-14 18:40:48 UTC +++ build/linux/chrome.map @@ -1,4 +1,7 @@ { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index e0f1b0b5e658..fa8f9032e351 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,4 +1,4 @@ ---- build/linux/libpci/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- build/linux/libpci/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn index e164aa294eb4..db96d613cad6 100644 --- a/www/chromium/files/patch-build_linux_unbundle_libusb.gn +++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libusb.gn.orig 2021-03-15 11:01:22 UTC +--- build/linux/unbundle/libusb.gn.orig 2021-04-15 08:12:30 UTC +++ build/linux/unbundle/libusb.gn @@ -0,0 +1,24 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index e49e1e7edfd8..7513f8ebb1fc 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,4 +1,4 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2021-03-12 23:57:15 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2021-04-14 18:40:48 UTC +++ build/linux/unbundle/replace_gn_files.py @@ -27,6 +27,7 @@ REPLACEMENTS = { 'libevent': 'base/third_party/libevent/BUILD.gn', diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index e4843269c23a..5fc7d6d58dc3 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2021-03-12 23:57:15 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-04-14 18:40:48 UTC +++ build/toolchain/gcc_toolchain.gni @@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -639,13 +644,23 @@ template("clang_toolchain") { +@@ -646,13 +651,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index c886e27c241f..991cf22f96c3 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,4 +1,4 @@ ---- build/toolchain/get_concurrent_links.py.orig 2021-03-12 23:57:15 UTC +--- build/toolchain/get_concurrent_links.py.orig 2021-04-14 18:40:48 UTC +++ build/toolchain/get_concurrent_links.py @@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index cf2cfe07758f..e2710a5019fd 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- build/toolchain/linux/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ build/toolchain/linux/BUILD.gn @@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index fa5dd4befc5d..266840d1ea45 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- cc/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ cc/BUILD.gn -@@ -633,7 +633,7 @@ cc_test_static_library("test_support") { +@@ -639,7 +639,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -848,7 +848,6 @@ cc_test("cc_unittests") { +@@ -856,7 +856,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 95fb45333324..1fb0ba72b6da 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,4 +1,4 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-03-12 23:57:15 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-04-14 18:40:48 UTC +++ cc/layers/scrollbar_layer_impl_base.cc @@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); 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 8f25479fa63f..840d38108045 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 2021-03-12 23:57:15 UTC +--- cc/test/layer_tree_test.cc.orig 2021-04-14 18:40:48 UTC +++ cc/test/layer_tree_test.cc -@@ -673,7 +673,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -674,7 +674,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc index 279686d88712..f1ce98713c03 100644 --- a/www/chromium/files/patch-cc_test_pixel__test.cc +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -1,6 +1,6 @@ ---- cc/test/pixel_test.cc.orig 2021-03-12 23:57:15 UTC +--- cc/test/pixel_test.cc.orig 2021-04-14 18:40:48 UTC +++ cc/test/pixel_test.cc -@@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend) +@@ -71,7 +71,7 @@ PixelTest::PixelTest(GraphicsBackend backend) init_vulkan = true; } else if (backend == kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc index 9665897d0736..f70fd5aaebe8 100644 --- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc +++ b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc @@ -1,4 +1,4 @@ ---- cc/trees/frame_rate_estimator.cc.orig 2021-03-12 23:57:15 UTC +--- cc/trees/frame_rate_estimator.cc.orig 2021-04-14 18:40:48 UTC +++ cc/trees/frame_rate_estimator.cc @@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now) // frequency is lower than that, then using a lower frame rate is permitted. diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index c3572792efbe..1211a5a74f8f 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 2021-03-12 23:57:15 UTC +--- cc/trees/property_tree.cc.orig 2021-04-14 18:40:48 UTC +++ cc/trees/property_tree.cc -@@ -1300,13 +1300,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1299,13 +1299,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_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index a3a298b884ac..6df141ba9bcf 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2021-03-12 23:57:15 UTC +--- chrome/BUILD.gn.orig 2021-04-14 18:40:48 UTC +++ chrome/BUILD.gn -@@ -1243,6 +1243,10 @@ group("browser_dependencies") { +@@ -1249,6 +1249,10 @@ group("browser_dependencies") { public_deps += [ "//chromeos/lacros" ] } @@ -10,4 +10,4 @@ + if (is_chromeos_ash) { public_deps += [ - "//chrome/browser/chromeos", + "//ash/constants", diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 84e99450b90e..24fe0c956d1d 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/app/BUILD.gn.orig 2021-03-12 23:57:16 UTC +--- chrome/app/BUILD.gn.orig 2021-04-14 18:40:49 UTC +++ chrome/app/BUILD.gn -@@ -143,7 +143,7 @@ static_library("test_support") { +@@ -140,7 +140,7 @@ static_library("test_support") { "//v8:v8_headers", ] diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 8e1c8d63efa2..9fec5c2c859d 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2021-03-12 23:57:16 UTC +--- chrome/app/chrome_command_ids.h.orig 2021-04-14 18:40:49 UTC +++ chrome/app/chrome_command_ids.h -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ #define IDC_NAME_WINDOW 34049 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 0bf1ec5473f5..1febcb3b46a0 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main.cc.orig 2021-03-12 23:57:16 UTC +--- chrome/app/chrome_main.cc.orig 2021-04-14 18:40:49 UTC +++ chrome/app/chrome_main.cc @@ -130,12 +130,12 @@ int ChromeMain(int argc, const char** argv) { MainThreadStackSamplingProfiler scoped_sampling_profiler; 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 faa92dea9bb5..0a4f96b13554 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-03-12 23:57:16 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-04-14 18:40:49 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -149,12 +149,12 @@ +@@ -150,12 +150,12 @@ #include "v8/include/v8.h" #endif @@ -15,7 +15,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -260,7 +260,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -24,7 +24,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -295,7 +295,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -33,7 +33,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -341,7 +341,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -340,7 +340,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -42,7 +42,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -351,7 +351,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -350,7 +350,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -51,7 +51,7 @@ #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -405,7 +405,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -404,7 +404,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -60,7 +60,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. -@@ -417,7 +417,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -69,7 +69,7 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -488,7 +488,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -78,7 +78,7 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -723,7 +723,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -730,7 +730,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -87,7 +87,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -743,7 +743,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -96,7 +96,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -945,7 +945,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -952,7 +952,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -105,7 +105,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -958,7 +958,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -114,7 +114,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1075,7 +1075,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1083,7 +1083,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -123,7 +123,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1096,7 +1096,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1104,7 +1104,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -132,7 +132,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1124,7 +1124,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. @@ -141,7 +141,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1158,7 +1158,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1166,7 +1166,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -150,7 +150,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1186,7 +1186,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -159,7 +159,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1223,7 +1223,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1231,7 +1231,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 79ef78560180..1f414e0346fa 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2021-03-12 23:57:16 UTC +--- chrome/app/chromium_strings.grd.orig 2021-04-14 18:40:49 UTC +++ chrome/app/chromium_strings.grd -@@ -716,7 +716,7 @@ Chromium is unable to recover your settings. +@@ -722,7 +722,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -839,7 +839,7 @@ Chromium is unable to recover your settings. +@@ -851,7 +851,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,12 +18,3 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. </message> -@@ -1058,7 +1058,7 @@ Chromium is unable to recover your settings. - </message> - - <!-- Plugin Placeholders --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted."> - Restart Chromium to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> - </message> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 44276de08dce..677c44f8549e 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 2021-03-12 23:57:16 UTC +--- chrome/app/generated_resources.grd.orig 2021-04-14 18:40:49 UTC +++ chrome/app/generated_resources.grd -@@ -5255,7 +5255,7 @@ Keep your key file in a safe place. You will need it t +@@ -5254,7 +5254,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> -@@ -7305,7 +7305,7 @@ Keep your key file in a safe place. You will need it t +@@ -7345,7 +7345,7 @@ Keep your key file in a safe place. You will need it t 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> -@@ -8296,7 +8296,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8336,7 +8336,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 64089b9cd81c..9b525aa17e80 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-03-12 23:57:16 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-04-14 18:40:49 UTC +++ chrome/app/google_chrome_strings.grd -@@ -723,7 +723,7 @@ Google Chrome is unable to recover your settings. +@@ -729,7 +729,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -846,7 +846,7 @@ Google Chrome is unable to recover your settings. +@@ -858,7 +858,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,12 +18,3 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1072,7 +1072,7 @@ Google Chrome is unable to recover your settings. - </message> - - <!-- Plugin Placeholders --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted."> - Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> - </message> diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp index 99d7594ad959..895264e079dd 100644 --- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp +++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/profiles_strings.grdp.orig 2021-03-12 23:57:16 UTC +--- chrome/app/profiles_strings.grdp.orig 2021-04-14 18:40:49 UTC +++ chrome/app/profiles_strings.grdp -@@ -87,7 +87,7 @@ +@@ -81,7 +81,7 @@ Add Profile... </message> </if> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 323a398dbcf5..9fde56f272f5 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,4 +1,4 @@ ---- chrome/app/settings_strings.grdp.orig 2021-03-12 23:57:17 UTC +--- chrome/app/settings_strings.grdp.orig 2021-04-14 18:40:52 UTC +++ chrome/app/settings_strings.grdp @@ -117,7 +117,7 @@ Theme diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index 669e2bacbb7d..8ca6abaeb397 100644 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,4 +1,4 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc @@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 04cf7d9e24f7..bdec0f7504f8 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2021-03-12 23:57:17 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2021-04-14 18:40:52 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd index a5f75e71519e..c060bac563b8 100644 --- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/theme_resources.grd.orig 2021-03-12 23:57:17 UTC +--- chrome/app/theme/theme_resources.grd.orig 2021-04-14 18:40:52 UTC +++ chrome/app/theme/theme_resources.grd @@ -25,7 +25,7 @@ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 5cf14a0f2114..224e5620b074 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,44 @@ ---- chrome/browser/BUILD.gn.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/BUILD.gn.orig 2021-04-20 18:58:25 UTC +++ chrome/browser/BUILD.gn -@@ -5277,7 +5277,7 @@ static_library("browser") { +@@ -2458,9 +2458,18 @@ static_library("browser") { + ] + } + } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ "//chrome/browser/error_reporting" ] + } ++ if (is_bsd) { ++ sources -= [ ++ "crash_upload_list/crash_upload_list.cc", ++ "crash_upload_list/crash_upload_list.h", ++ ] ++ deps -= [ ++ "//components/crash/core/browser", ++ ] ++ } + if (use_ozone) { + deps += [ + "//ui/events/ozone", +@@ -5123,6 +5132,17 @@ static_library("browser") { + } + } + ++ if (is_bsd) { ++ sources -= [ ++ "enterprise/signals/device_info_fetcher_linux.cc", ++ "enterprise/signals/device_info_fetcher_linux.h", ++ ] ++ sources += [ ++ "enterprise/signals/device_info_fetcher_freebsd.cc", ++ "enterprise/signals/device_info_fetcher_freebsd.h", ++ ] ++ } ++ + if (is_chromeos_ash) { + if (use_allocator == "tcmalloc") { + deps += [ "//chrome/common/performance_manager/mojom" ] +@@ -5350,7 +5370,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 15cee06705af..2956ec69e1c6 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,15 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/about_flags.cc.orig 2021-04-20 18:58:25 UTC +++ chrome/browser/about_flags.cc -@@ -191,7 +191,7 @@ - #include "ui/gl/gl_switches.h" - #include "ui/native_theme/native_theme_features.h" - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/allocator/buildflags.h" - #endif - -@@ -918,7 +918,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -967,7 +967,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +9,7 @@ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1268,7 +1268,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP +@@ -1239,7 +1239,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP }, }; @@ -27,8 +18,8 @@ // defined(OS_WIN) const FeatureEntry::FeatureVariation -@@ -3009,7 +3009,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, +@@ -3074,7 +3074,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) @@ -36,7 +27,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3025,7 +3025,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3090,7 +3090,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -45,7 +36,7 @@ // !defined(OS_ANDROID) { "disable-accelerated-video-encode", -@@ -3367,7 +3367,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3456,7 +3456,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, @@ -54,7 +45,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3381,7 +3381,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3470,7 +3470,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorRendererWarmupName, flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription, kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)}, @@ -63,7 +54,7 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4173,7 +4173,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4308,7 +4308,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -72,7 +63,7 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4254,7 +4254,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4398,7 +4398,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxDisableCGIParamMatchingName, flag_descriptions::kOmniboxDisableCGIParamMatchingDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDisableCGIParamMatching)}, @@ -81,9 +72,9 @@ // defined(OS_WIN) {"enable-speculative-service-worker-start-on-query-input", -@@ -4563,14 +4563,14 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kClickToOpenPDFDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, +@@ -4715,14 +4715,14 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, + #endif // !defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ @@ -98,7 +89,7 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5258,7 +5258,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5381,7 +5381,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -107,7 +98,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5275,7 +5275,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -116,7 +107,7 @@ // defined(OS_CHROMEOS) {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5852,7 +5852,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5955,7 +5955,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, @@ -125,7 +116,7 @@ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5893,7 +5893,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5996,7 +5996,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -134,7 +125,7 @@ // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -6072,7 +6072,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6191,7 +6191,7 @@ const FeatureEntry kFeatureEntries[] = { kPasswordsAccountStorageVariations, "ButterForPasswords")}, @@ -143,7 +134,7 @@ defined(OS_CHROMEOS) {"passwords-account-storage-iph", flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -6080,7 +6080,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6199,7 +6199,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, @@ -152,7 +143,16 @@ // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6794,7 +6794,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6858,7 +6858,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)}, + #endif + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + {"commander", flag_descriptions::kCommanderName, + flag_descriptions::kCommanderDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kCommander)}, +@@ -6895,7 +6895,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, #endif @@ -161,7 +161,7 @@ defined(OS_CHROMEOS) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6833,14 +6833,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6927,14 +6927,14 @@ const FeatureEntry kFeatureEntries[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -178,3 +178,12 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_ANDROID) +@@ -7215,7 +7215,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ + defined(OS_MAC) + { + "ui-debug-tools", 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 07af7718ddbe..795304853d01 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,4 +1,4 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -35,7 +35,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc index 7360aeda73c0..bf8c003c3fe7 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc @@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc index 03e99a4b1f8c..e244d0669bc1 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc @@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe // Test is flaky on windows and linux: crbug.com/1150017. diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc index 8f5d4515a675..922f5898b3ba 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 1fcfaa6ec285..5e0738a0586d 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,4 +1,4 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -87,7 +87,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 3ef4068aa5dd..7070f4f94f60 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -873,7 +873,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -871,7 +871,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc index 12fbf70b31a1..fbb447ec1a82 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -30,10 +30,10 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod switches::kKeepAliveForTest)) diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 08b5e8f551fd..edee9a8f2b22 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/browser_resources.grd.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/browser_resources.grd -@@ -89,7 +89,7 @@ +@@ -115,7 +115,7 @@ <include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.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> diff --git a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc new file mode 100644 index 000000000000..30503001330b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc @@ -0,0 +1,12 @@ +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-04-23 20:21:42 UTC ++++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +@@ -640,7 +640,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder + } + #endif + ++#if !defined(OS_BSD) + CreateCrashUploadList()->Clear(delete_begin_, delete_end_); ++#endif + + FindBarStateFactory::GetForBrowserContext(profile_)->SetLastSearchText( + base::string16()); 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 be2b16e342f9..9cc31760eb57 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 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -138,7 +138,7 @@ +@@ -144,7 +144,7 @@ #include "mojo/public/cpp/bindings/self_owned_receiver.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -835,7 +835,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -841,7 +841,7 @@ void PopulateChromeWebUIFrameBinders( } #endif 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 ace685c2ed75..c549c86141d9 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -251,7 +251,7 @@ +@@ -250,7 +250,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -932,7 +932,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -18,7 +18,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -944,7 +944,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -941,7 +941,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -968,7 +968,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -965,7 +965,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 0350cb5daff0..7daf039ec9dd 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,27 +1,24 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -82,6 +82,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { - void ChromeBrowserMainPartsLinux::PostProfileInit() { - ChromeBrowserMainPartsPosix::PostProfileInit(); - -+#if !defined(OS_BSD) - bool breakpad_registered; - if (crash_reporter::IsCrashpadEnabled()) { - // If we're using crashpad, there's no breakpad and crashpad is always -@@ -99,10 +100,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { - } - g_browser_process->metrics_service()->RecordBreakpadRegistration( - breakpad_registered); -+#endif +@@ -47,7 +47,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } + void ChromeBrowserMainPartsLinux::PreProfileInit() { +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) + // Needs to be called after we have chrome::DIR_USER_DATA and + // g_browser_process. This happens in PreCreateThreads. + // base::GetLinuxDistro() will initialize its value if needed. +@@ -79,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { + + void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { -#if !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -87,7 +87,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 761d10956b15..2badd2d02b9e 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_browser_main_posix.cc @@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { 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 87c0062c22f3..24ac8dc37b4d 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 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -448,7 +448,7 @@ +@@ -450,7 +450,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" -@@ -508,7 +508,7 @@ +@@ -510,7 +510,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -542,7 +542,7 @@ +@@ -543,7 +543,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -866,11 +866,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -903,11 +903,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -41,7 +41,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1417,7 +1419,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1325,7 +1327,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, &startup_data_); @@ -50,7 +50,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1448,7 +1450,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1356,7 +1358,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +59,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2205,7 +2207,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2137,7 +2139,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -68,7 +68,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2499,7 +2501,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2431,7 +2433,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -77,7 +77,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3806,7 +3808,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3747,7 +3749,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -86,7 +86,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3841,7 +3843,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3782,7 +3784,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -94,8 +94,8 @@ +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) - base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4165,7 +4167,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( +@@ -4143,7 +4145,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 31cda22750d7..bf28d2ce6a19 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 2021-03-12 23:57:17 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-04-14 18:40:52 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -407,12 +407,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -401,12 +401,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; @@ -13,5 +13,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_MAC) +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) - bool PreSpawnRenderer(sandbox::TargetPolicy* policy, - RendererSpawnFlags flags) override; + bool PreSpawnChild(sandbox::TargetPolicy* policy, + sandbox::policy::SandboxType sandbox_type, diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index 273043a7a182..cd4be27a0a22 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,11 +1,11 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc @@ -39,7 +39,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, // which isn't compatible with CrashUploadListCrashpad. crash_sender continues // to log uploads in CrashUploadList::kReporterLogFilename. --#if !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) +-#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc deleted file mode 100644 index 8ad947b9b75b..000000000000 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2021-03-12 23:57:17 UTC -+++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc -@@ -42,6 +42,9 @@ CrashUploadListCrashpad::CrashUploadListCrashpad() = d - CrashUploadListCrashpad::~CrashUploadListCrashpad() = default; - - std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { -+#if defined(OS_BSD) -+ return std::vector<UploadInfo>(); -+#else - std::vector<crash_reporter::Report> reports; - crash_reporter::GetReports(&reports); - -@@ -53,13 +56,18 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra - ReportUploadStateToUploadInfoState(report.state))); - } - return uploads; -+#endif - } - - void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, - const base::Time& end) { -+#if !defined(OS_BSD) - crash_reporter::ClearReportsBetween(begin, end); -+#endif - } - - void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { -+#if !defined(OS_BSD) - crash_reporter::RequestSingleCrashUpload(local_id); -+#endif - } diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc index c0a5999f8613..ef3e8c247889 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,4 +1,4 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index c0d44968bfd0..36b4139448f3 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,4 +1,4 @@ ---- chrome/browser/defaults.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/defaults.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/defaults.cc @@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false; 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 59053815c2d7..efb531c3a5cd 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,4 +1,4 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/dev_ui_browser_resources.grd @@ -55,7 +55,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" /> 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 1df6bcb563c4..fe349a509975 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,6 +1,6 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -30,7 +30,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform +@@ -29,7 +29,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); #elif defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index 231300fd95fc..41cb3b945507 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -165,7 +165,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -187,7 +187,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index 9373fba60358..0940068eb221 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -15,6 +15,8 @@ namespace diagnostics { // Console base class used internally. 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 aa0c0b995969..4f56136f04f9 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 2021-03-12 23:57:17 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-04-20 18:58:26 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1443,7 +1443,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1444,7 +1444,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 -@@ -1496,7 +1496,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1497,7 +1497,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { @@ -18,7 +18,7 @@ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); -@@ -1593,7 +1593,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow bool content_initiated, content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -27,3 +27,12 @@ defined(OS_MAC) // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. +@@ -1636,7 +1636,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection + std::unique_ptr<download::DownloadItemRenameHandler> + ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( + download::DownloadItem* download_item) { +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) + return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( + download_item); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index e59032af5729..e4b987862928 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_commands.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "net/base/url_util.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index ceaa75f9c2ef..beb145301193 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.h.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_commands.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_commands.h @@ -48,7 +48,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; 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 cff9400d5423..e6274a4c4041 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,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_item_model.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_item_model.cc @@ -571,7 +571,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || 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 bbdb1e796d3c..a9678b6e36a7 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_prefs.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_prefs.cc @@ -68,7 +68,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and 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 d6bc6675807d..26ce4d0b2163 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.h.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_prefs.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_prefs.h @@ -117,7 +117,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index 9888563b9532..87e3b7dc8e0a 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_query.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_query.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_query.cc @@ -28,7 +28,11 @@ #include "components/download/public/common/download_item.h" 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 bd3f723c96dc..6f46d677272f 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,4 +1,4 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/download/download_shelf_context_menu.cc @@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc new file mode 100644 index 000000000000..98202b98e279 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-04-22 07:41:36 UTC ++++ chrome/browser/enterprise/signals/device_info_fetcher.cc +@@ -12,6 +12,8 @@ + #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h" + #elif defined(OS_LINUX) || defined(OS_CHROMEOS) + #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" ++#elif defined(OS_FREEBSD) ++#include "chrome/browser/enterprise/signals/device_info_fetcher_freebsd.h" + #endif + + namespace enterprise_signals { +@@ -60,6 +62,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: + return std::make_unique<DeviceInfoFetcherWin>(); + #elif defined(OS_LINUX) || defined(OS_CHROMEOS) + return std::make_unique<DeviceInfoFetcherLinux>(); ++#elif defined(OS_FREEBSD) ++ return std::make_unique<DeviceInfoFetcherFreeBSD>(); + #else + return std::make_unique<StubDeviceFetcher>(); + #endif diff --git a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn deleted file mode 100644 index 1d5b25c51816..000000000000 --- a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn +++ /dev/null @@ -1,42 +0,0 @@ ---- chrome/browser/error_reporting/BUILD.gn.orig 2021-03-12 23:57:17 UTC -+++ chrome/browser/error_reporting/BUILD.gn -@@ -25,6 +25,13 @@ static_library("error_reporting") { - "//services/network:network_service", - "//services/network/public/cpp", - ] -+ -+ if (is_bsd) { -+ deps -= [ -+ "//components/crash/content/browser/error_reporting", -+ "//components/crash/core/app", -+ ] -+ } - } - - source_set("test_support") { -@@ -42,6 +49,12 @@ source_set("test_support") { - "//components/crash/content/browser/error_reporting", - "//components/crash/content/browser/error_reporting:mock_crash_endpoint", - ] -+ -+ if (is_bsd) { -+ deps -= [ -+ "//components/crash/content/browser/error_reporting:mock_crash_endpoint", -+ ] -+ } - } - - source_set("unit_test") { -@@ -60,4 +73,12 @@ source_set("unit_test") { - "//net:test_support", - "//testing/gtest", - ] -+ -+ if (is_bsd) { -+ deps -= [ -+ "//components/crash/content/browser/error_reporting", -+ "//components/crash/content/browser/error_reporting:mock_crash_endpoint", -+ "//components/crash/core/app", -+ ] -+ } - } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index ed7c6f3d7bd7..d0feb92bfc22 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 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1248,6 +1248,12 @@ static_library("extensions") { +@@ -1249,6 +1249,12 @@ static_library("extensions") { ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index a717fdad027c..89d76d4d8d34 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -49,7 +49,11 @@ #include "extensions/common/extension.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc deleted file mode 100644 index 3a882dddbcee..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig 2021-03-12 23:57:17 UTC -+++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc -@@ -10,7 +10,7 @@ - #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_mac.h" - #elif defined(OS_WIN) - #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_win.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.h" - #endif - -@@ -58,7 +58,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: - return std::make_unique<DeviceInfoFetcherMac>(); - #elif defined(OS_WIN) - return std::make_unique<DeviceInfoFetcherWin>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - return std::make_unique<DeviceInfoFetcherLinux>(); - #else - return std::make_unique<StubDeviceFetcher>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc deleted file mode 100644 index 5aa9ea53fa8b..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc +++ /dev/null @@ -1,67 +0,0 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2021-03-12 23:57:17 UTC -+++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc -@@ -8,7 +8,9 @@ - #include <gio/gio.h> - #endif // defined(USE_GIO) - #include <sys/stat.h> -+#if !defined(OS_BSD) - #include <sys/sysmacros.h> -+#endif - - #include <string> - -@@ -36,7 +38,11 @@ std::string GetDeviceModel() { - } - - std::string GetOsVersion() { -+#if defined(OS_BSD) -+ base::FilePath os_release_file("/usr/local/etc/os-release"); -+#else - base::FilePath os_release_file("/etc/os-release"); -+#endif - std::string release_info; - base::StringPairs values; - if (base::PathExists(os_release_file) && -@@ -107,6 +113,7 @@ enterprise_reporting_private::SettingValue GetScreenlo - // Implements the logic from the native host installation script. First find the - // root device identifier, then locate its parent and get its type. - enterprise_reporting_private::SettingValue GetDiskEncrypted() { -+#if !defined(OS_BSD) - struct stat info; - // First figure out the device identifier. Fail fast if this fails. - if (stat("/", &info) != 0) -@@ -131,10 +138,14 @@ enterprise_reporting_private::SettingValue GetDiskEncr - return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; - } - return enterprise_reporting_private::SETTING_VALUE_DISABLED; -+#else -+ return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; -+#endif - } - - std::vector<std::string> GetMacAddresses() { - std::vector<std::string> result; -+#if !defined(OS_BSD) - base::DirReaderPosix reader("/sys/class/net"); - if (!reader.IsValid()) - return result; -@@ -157,6 +168,7 @@ std::vector<std::string> GetMacAddresses() { - &address); - result.push_back(address); - } -+#endif - return result; - } - -@@ -168,7 +180,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de - - DeviceInfo DeviceInfoFetcherLinux::Fetch() { - DeviceInfo device_info; -+#if defined(OS_FREEBSD) -+ device_info.os_name = "freebsd"; -+#else - device_info.os_name = "linux"; -+#endif - device_info.os_version = GetOsVersion(); - device_info.device_host_name = GetDeviceHostName(); - device_info.device_model = GetDeviceModel(); 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_erp_chrome_desktop_report_request_helper.cc index d05d040aca65..1543833016c1 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_erp_chrome_desktop_report_request_helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-04-20 18:58:26 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc index 319d165d57a1..0852451ff108 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T frame_observer.Wait(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index d5212afd6b17..cec9c02cb102 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc @@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 1f7a5b0cdb8b..17797250a1e9 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -286,6 +286,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; 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 57214f0e3892..dbea0f3529c3 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,4 +1,4 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc @@ -176,7 +176,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 6d8ab9650cdb..e75d7cb276d0 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" 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 f00c82fb7496..23768dc6f847 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 2021-03-12 23:57:17 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -54,7 +54,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index e76cbaed81eb..7bbf834f4b59 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -794,7 +794,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,12 +9,12 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -819,7 +819,7 @@ void ExternalProviderImpl::CreateExternalProviders( - bundled_extension_creation_flags)); +@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExternalProviders( + bundled_extension_creation_flags)); - // Define a per-user source of external extensions. + // Define a per-user source of external extensions. -#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ +#if defined(OS_MAC) || defined(OS_BSD) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) - provider_list->push_back(std::make_unique<ExternalProviderImpl>( - service, + provider_list->push_back(std::make_unique<ExternalProviderImpl>( + service, diff --git a/www/chromium/files/patch-chrome_browser_feedback_system__logs_log__sources_crash__ids__source.cc b/www/chromium/files/patch-chrome_browser_feedback_system__logs_log__sources_crash__ids__source.cc new file mode 100644 index 000000000000..cddf94d69da2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_feedback_system__logs_log__sources_crash__ids__source.cc @@ -0,0 +1,12 @@ +--- chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc.orig 2021-04-23 20:22:19 UTC ++++ chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc +@@ -42,7 +42,9 @@ constexpr base::TimeDelta k120DaysTimeDelta = base::Ti + + CrashIdsSource::CrashIdsSource() + : SystemLogsSource("CrashId"), ++#if !defined(OS_BSD) + crash_upload_list_(CreateCrashUploadList()), ++#endif + pending_crash_list_loading_(false) {} + + CrashIdsSource::~CrashIdsSource() {} diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index bfb1783f908d..4f6a7f31bd46 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -144,7 +144,7 @@ const struct { +@@ -190,7 +190,7 @@ const struct { {base::DIR_APP_DATA, nullptr, kBlockAllChildren}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren}, #endif diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h index c86ce4f8c056..d0700ee0815a 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/first_run/first_run_dialog.h @@ -12,7 +12,7 @@ // Hide this function on platforms where the dialog does not exist. diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 8af510712cfa..d14ceeaa5903 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/first_run/first_run_internal.h @@ -58,14 +58,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index 60672eda45a6..cfcab5adb88e 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc @@ -46,7 +46,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index cfc4b0641408..a8133b9ed86c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/flag_descriptions.cc -@@ -4772,7 +4772,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -4949,7 +4949,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4816,27 +4816,27 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4993,20 +4993,20 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -26,23 +26,24 @@ "If enabled, Chrome will scroll web pages on stylus drag."; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) // defined(OS_CHROMEOS) --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + const char kCommanderName[] = "Commander"; + const char kCommanderDescription[] = +@@ -5022,7 +5022,7 @@ const char kDesktopDetailedLanguageSettingsName[] = + const char kDesktopDetailedLanguageSettingsDescription[] = + "Enable the new detailed language settings page"; + +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) || defined(OS_LINUX) #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) && !BUILDFLAG(IS_CHROMEOS_ASH) - const char kUserDataSnapshotName[] = "Enable user data snapshots"; -@@ -4854,13 +4854,13 @@ const char kWebShareDescription[] = +@@ -5049,13 +5049,13 @@ const char kWebShareDescription[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -58,7 +59,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) // Feature flags -------------------------------------------------------------- -@@ -4953,7 +4953,7 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -5139,7 +5139,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -67,3 +68,12 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = +@@ -5148,7 +5148,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription + "will be sent to Google."; + #endif + +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ + defined(OS_MAC) + const char kUIDebugToolsName[] = "Debugging tools for UI"; + const char kUIDebugToolsDescription[] = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 28ba171c144e..409546d0dbfd 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/flag_descriptions.h -@@ -20,9 +20,9 @@ +@@ -21,9 +21,9 @@ #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -12,7 +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 -@@ -2790,7 +2790,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2900,7 +2900,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- @@ -21,7 +21,7 @@ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2817,15 +2817,15 @@ extern const char kRemoteCopyProgressNotificationDescr +@@ -2927,10 +2927,10 @@ extern const char kRemoteCopyProgressNotificationDescr extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; @@ -29,18 +29,21 @@ +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // 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_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + extern const char kCommanderName[]; + extern const char kCommanderDescription[]; +@@ -2941,7 +2941,7 @@ extern const char kDesktopRestructuredLanguageSettings + extern const char kDesktopDetailedLanguageSettingsName[]; + extern const char kDesktopDetailedLanguageSettingsDescription[]; - #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) - extern const char kUserDataSnapshotName[]; -@@ -2839,11 +2839,11 @@ extern const char kWebShareDescription[]; +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) || defined(OS_LINUX) + #if BUILDFLAG(USE_TCMALLOC) +@@ -2962,11 +2962,11 @@ extern const char kWebShareDescription[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -54,7 +57,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) // Feature flags -------------------------------------------------------------- -@@ -2906,7 +2906,7 @@ extern const char kAutofillCreditCardUploadDescription +@@ -3023,12 +3023,12 @@ extern const char kAutofillCreditCardUploadDescription #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -63,3 +66,9 @@ extern const char kSendWebUIJavaScriptErrorReportsName[]; extern const char kSendWebUIJavaScriptErrorReportsDescription[]; #endif + +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ + defined(OS_MAC) + extern const char kUIDebugToolsName[]; + extern const char kUIDebugToolsDescription[]; diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h index f5e4258b7e67..ce008bcd179e 100644 --- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h +++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -1,4 +1,4 @@ ---- chrome/browser/intranet_redirect_detector.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/intranet_redirect_detector.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/intranet_redirect_detector.h @@ -27,7 +27,7 @@ class SimpleURLLoader; diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index 87ee148fcfab..009e6ccaea2e 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since 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 1d0354461ad5..6701da8634f4 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 2021-03-12 23:57:18 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -737,7 +737,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_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc index c34939baeee8..9353e243748b 100644 --- a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,11 +1,20 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/audio_service_util.cc -@@ -24,7 +24,7 @@ bool IsAudioServiceSandboxEnabled() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. +@@ -21,7 +21,7 @@ + namespace { + #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { const policy::PolicyMap& policies = g_browser_process->browser_policy_connector() - ->GetPolicyService() +@@ -43,7 +43,7 @@ bool IsAudioServiceSandboxEnabled() { + // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being + // built with OS_CHROMEOS instead of OS_LINUX. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled, + features::kAudioServiceSandbox); + #else 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 61a8f93f7274..9ddef768a051 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 2021-03-12 23:57:18 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -10,6 +10,7 @@ #include <netinet/in.h> diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index c42ffa495a4c..bf6fc5cf1a6f 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc @@ -9,7 +9,11 @@ #include <sys/socket.h> 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 b883b109864a..4c9207a126d2 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,4 +1,4 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc @@ -105,6 +105,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool off_the_record, 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 0336df512390..1dede6d286ce 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,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -41,6 +41,8 @@ const char kProduct[] = "Chrome_Mac"; const char kProduct[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 2e65e602bbb9..87d35945d84a 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -360,6 +360,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; 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 72f24793cc14..da2275f69a1f 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 2021-03-12 23:57:18 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index ae65167a1515..8423490e074c 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -129,13 +129,13 @@ class WebRtcLoggingController size_t web_app_id, diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 0ca5d7cd708d..85f7e8c0d7a5 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/memory_details.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/memory_details.cc @@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" 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 db0d3691e531..d6ac4e08b257 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details_linux.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/memory_details_linux.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/memory_details_linux.cc @@ -70,8 +70,10 @@ ProcessData GetProcessDataMemoryInformation( 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 128c217f37eb..eddecc0854fd 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 2021-03-12 23:57:18 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -56,7 +56,9 @@ +@@ -59,7 +59,9 @@ // of lacros-chrome is complete. #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -65,7 +67,7 @@ +@@ -68,7 +70,7 @@ #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif 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 f61540727dc9..a3d3fb66fac8 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 2021-03-12 23:57:18 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -697,10 +697,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -707,10 +707,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) -@@ -978,7 +978,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -998,7 +998,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 13065dafb06a..2103bcac5a1d 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 2021-03-12 23:57:18 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -509,7 +509,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -514,7 +514,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 -@@ -532,7 +532,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -537,7 +537,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_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 6995743b2d87..5c3f621d83c1 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 2021-03-12 23:57:18 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -81,11 +81,11 @@ +@@ -80,11 +80,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -146,10 +146,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -145,10 +145,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -363,10 +363,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -416,10 +416,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -415,10 +415,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -513,7 +513,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -512,7 +512,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 2df862c7a918..1af8bb9914fd 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -30,7 +30,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" @@ -16,9 +16,9 @@ -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); + registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif - } -@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index 604c62522ab0..10d386cd81da 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,11 +1,20 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-04-14 18:40:53 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc -@@ -56,7 +56,7 @@ bool NativeNotificationsEnabled(Profile* profile) { - return true; +@@ -57,7 +57,7 @@ bool SystemNotificationsEnabled(Profile* profile) { #elif defined(OS_WIN) - return NotificationPlatformBridgeWin::NativeNotificationEnabled(); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + return NotificationPlatformBridgeWin::SystemNotificationEnabled(); + #else +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) if (profile) { // Prefs take precedence over flags. PrefService* prefs = profile->GetPrefs(); +@@ -66,7 +66,7 @@ bool SystemNotificationsEnabled(Profile* profile) { + return false; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + return base::FeatureList::IsEnabled(features::kNativeNotifications) && + base::FeatureList::IsEnabled(features::kSystemNotifications); + #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) 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 362cb84d8915..a0fe22fac790 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,4 +1,4 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -9,6 +9,10 @@ #include <string> 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 de9c680b0432..969cc1b4f37c 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 2021-03-12 23:57:18 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -163,7 +163,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -166,7 +166,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 b2754c5da7c1..feff7c1b7e14 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 2021-03-12 23:57:18 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2188,7 +2188,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT +@@ -2162,7 +2162,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT const std::string& expected) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ DoActionAndCheckClipboard(std::move(action), ui::ClipboardBuffer::kSelection, expected); #else -@@ -2320,7 +2320,7 @@ IN_PROC_BROWSER_TEST_P(PDFExtensionClipboardTest, +@@ -2294,7 +2294,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, // Flaky on ChromeOS (https://crbug.com/1121446) // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc index fa4a7c73ddef..ca0285da5f06 100644 --- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc +++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc @@ -1,11 +1,11 @@ ---- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/performance_manager/policies/policy_features.cc -@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage - +@@ -126,7 +126,7 @@ const base::Feature kPageFreezingFromPerformanceManage const base::Feature kUrgentDiscardingFromPerformanceManager{ "UrgentDiscardingFromPerformanceManager", --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index fc5c3d110f1a..cc7af4945e4d 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -1,38 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc -@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { +@@ -42,7 +42,7 @@ ProcessMonitor::Metrics ProcessMetricsHistory::SampleM #if defined(OS_WIN) - disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond(); + metrics.disk_usage = process_metrics_->GetDiskUsageBytesPerSecond(); #endif -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) - idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); + metrics.idle_wakeups = process_metrics_->GetIdleWakeupsPerSecond(); #endif -@@ -91,7 +91,7 @@ void ProcessMetricsHistory::UpdateHistograms() { - kDiskUsageHistogramMin, kDiskUsageHistogramMax, - kDiskUsageHistogramBucketCount); - #endif --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); -@@ -113,7 +113,7 @@ void ProcessMetricsHistory::UpdateHistograms() { - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", - true); - } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); -@@ -134,7 +134,7 @@ void ProcessMetricsHistory::UpdateHistograms() { - kHistogramBucketCount); - if (cpu_usage_ > kHighCPUUtilizationThreshold) - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", - idle_wakeups_); diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h deleted file mode 100644 index af0c64060238..000000000000 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_metrics_history.h.orig 2021-03-12 23:57:18 UTC -+++ chrome/browser/performance_monitor/process_metrics_history.h -@@ -71,7 +71,7 @@ class ProcessMetricsHistory { - uint64_t disk_usage_ = 0; - #endif - --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - int idle_wakeups_ = 0; - #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc new file mode 100644 index 000000000000..e55b3b7db91b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc @@ -0,0 +1,29 @@ +--- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-04-22 07:55:58 UTC ++++ chrome/browser/performance_monitor/process_metrics_recorder.cc +@@ -58,7 +58,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( + kDiskUsageHistogramMin, kDiskUsageHistogramMax, + kDiskUsageHistogramBucketCount); + #endif +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.BrowserProcess", +@@ -82,7 +82,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", + true); + } +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.RendererProcess", +@@ -105,7 +105,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( + kHistogramMax, kHistogramBucketCount); + if (metrics.cpu_usage > kHighCPUUtilizationThreshold) + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", + metrics.idle_wakeups); diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc new file mode 100644 index 000000000000..f361a737689c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc @@ -0,0 +1,11 @@ +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-04-22 07:56:37 UTC ++++ chrome/browser/performance_monitor/process_monitor.cc +@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + lhs.disk_usage += rhs.disk_usage; + #endif + +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + lhs.idle_wakeups += rhs.idle_wakeups; + #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h new file mode 100644 index 000000000000..c4ab8f7e27c7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h @@ -0,0 +1,11 @@ +--- chrome/browser/performance_monitor/process_monitor.h.orig 2021-04-22 07:56:51 UTC ++++ chrome/browser/performance_monitor/process_monitor.h +@@ -51,7 +51,7 @@ class ProcessMonitor { + uint64_t disk_usage = 0; + #endif + +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + // Returns the number of average idle cpu wakeups per second since the last + // time the metric was sampled. diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc deleted file mode 100644 index 98274b15c1fc..000000000000 --- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2021-03-12 23:57:18 UTC -+++ chrome/browser/plugins/plugin_info_host_impl.cc -@@ -379,7 +379,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( - std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { - if (cus_plugin_info) { - output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (cus_plugin_info->version != base::Version("0")) { - output->status = chrome::mojom::PluginStatus::kRestartRequired; - } diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index 089a8c4da522..c741db0784ac 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 1ffba3d3fb9b..163f35d9d676 100644 --- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc @@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c } diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 279da02a8aa0..6adc6fb7993f 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -43,9 +43,9 @@ +@@ -45,9 +45,9 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ #if defined(OS_WIN) #include "chrome/browser/policy/browser_dm_token_storage_win.h" -@@ -176,7 +176,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -178,7 +178,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if defined(OS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); 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 9df20861015c..920247d2dfe6 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 2021-03-12 23:57:18 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1233,11 +1233,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1242,11 +1242,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -14,17 +14,55 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1282,11 +1282,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(ENABLE_SPELLCHECK) +@@ -1594,7 +1594,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. + // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the + // migration is complete. +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + handlers->AddHandler( + std::make_unique< +@@ -1602,7 +1602,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + key::kContextAwareAccessSignalsAllowlist, + enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, + chrome_schema)); +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + #if BUILDFLAG(IS_CHROMEOS_ASH) + std::vector<std::unique_ptr<ConfigurationPolicyHandler>> +@@ -1950,13 +1950,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); + + // TODO(crbug.com/1175651): Remove BUILDFLAG(IS_CHROMEOS_LACROS) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( + key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, + SCHEMA_ALLOW_UNKNOWN, + SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + #endif // BUILDFLAG(ENABLE_EXTENSIONS) + +@@ -1969,7 +1969,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - { key::kAllowNativeNotifications, - prefs::kAllowNativeNotifications, - base::Value::Type::BOOLEAN }, --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || deined(OS_BSD) + handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( + std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, + prefs::kAllowNativeNotifications, +@@ -1977,7 +1977,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, + prefs::kAllowSystemNotifications, + base::Value::Type::BOOLEAN))); +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - { key::kScrollToTextFragmentEnabled, - prefs::kScrollToTextFragmentEnabled, + return handlers; + } diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 1e914d8434c2..56bd7bddd290 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/policy/device_management_service_configuration.cc @@ -20,7 +20,7 @@ #endif 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 bcd864746b74..d01c259ba409 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,14 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-04-20 18:58:26 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -388,7 +388,7 @@ +@@ -383,14 +383,14 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #include "chrome/browser/web_applications/components/url_handler_prefs.h" + #endif + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +17,16 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1080,7 +1080,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -865,7 +865,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + #endif // defined(OS_WIN) + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + web_app::UrlHandlerPrefs::RegisterLocalStatePrefs(registry); + #endif + +@@ -1140,7 +1140,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index b75c93b9a804..e3ce555560e9 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -136,7 +136,7 @@ const char* const kPersistentPrefNames[] = { +@@ -138,7 +138,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc index a459cd5e7693..a6255af471a6 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/printing/print_job_worker.cc @@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( 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 f78dd938359c..6d673f8961bc 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/process_singleton_posix.cc @@ -95,12 +95,12 @@ #include "net/base/network_interfaces.h" 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 d6e69643b0fc..c34407ab3782 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 2021-03-12 23:57:18 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -337,7 +337,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -345,7 +345,7 @@ void ChromeBrowserMainExtraPartsProfiles:: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile.cc b/www/chromium/files/patch-chrome_browser_profiles_profile.cc index 7a0eb7be5283..412795ec22f9 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/profiles/profile.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/profiles/profile.cc -@@ -360,7 +360,7 @@ bool Profile::IsIncognitoProfile() const { +@@ -356,7 +356,7 @@ bool Profile::IsIncognitoProfile() const { bool Profile::IsEphemeralGuestProfileEnabled() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index 951c83a99ba1..9bae83b9550b 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 2021-03-12 23:57:18 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -159,7 +159,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -157,7 +157,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_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 43c751460e17..1ad037961f9b 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -180,7 +180,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) { bool IsGuestModeRequested(const base::CommandLine& command_line, PrefService* local_state, bool show_warning) { 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 802cb76d4d9f..13da6c20f8e0 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 2021-03-12 23:57:18 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2117,7 +2117,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2144,7 +2144,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_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 85d0d7208ee7..0b18255916a3 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -167,7 +167,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -173,7 +173,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -186,7 +186,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index 40e53f4f6dd7..c797763f4518 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js @@ -23,7 +23,7 @@ export class AppearanceBrowserProxy { diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 752d4a350d5f..7c0f76e70945 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 6a750abcf0f5..3d7f4b65abe4 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js @@ -137,7 +137,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index a38ecd5e6014..6427d82b8732 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,11 @@ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 0f91113fa607..86974e3f1868 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-04-14 18:40:54 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc @@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc index 2602baf5ed42..dccdc2005f17 100644 --- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc +++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/search/search_suggest/search_suggest_service.cc @@ -21,7 +21,11 @@ #include "components/search/ntp_features.h" diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc index c801c7584a2f..4ea9f3758e34 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -1,4 +1,4 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc index 5de5bca399cf..b58d997f47f6 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc @@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa void SendTabToSelfClientService::EntriesAddedRemotely( diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc index 2b367cf352a9..85ed859e50e2 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc @@ -7,7 +7,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboardUI", diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h index 72cf2e40c847..d836a03d5328 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h +++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.h @@ -14,7 +14,7 @@ // Feature to allow shared clipboard gets processed. diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index ef9dcdc48a58..01e986c150bb 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sharing/sharing_device_registration.cc @@ -324,7 +324,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 95bb19a9de0d..63f168cacefd 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc @@ -23,10 +23,10 @@ #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h" diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 5861fffb09ff..4bb990e7e472 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/signin/signin_util.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/signin/signin_util.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/signin/signin_util.cc @@ -34,7 +34,7 @@ #include "google_apis/gaia/gaia_auth_util.h" 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 3ecf338a4a7c..885a1436073e 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,4 +1,4 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sync/chrome_sync_client.cc @@ -466,7 +466,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc index 8bdafda18a83..cf4cb01fbfb1 100644 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sync/device_info_sync_service_factory.cc @@ -47,12 +47,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo // in lacros-chrome once build flag switch of lacros-chrome is diff --git a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc index 83fb3a06079a..8dc23b6fff54 100644 --- a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-03-12 23:57:18 UTC +--- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/sync/profile_sync_service_factory.cc -@@ -217,7 +217,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -213,7 +213,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI // in lacros-chrome once build flag switch of lacros-chrome is // complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); -@@ -235,7 +235,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -231,7 +231,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI init_params.start_behavior = syncer::ProfileSyncService::AUTO_START; } 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 ecbbffc1d037..6c8134e4b4e3 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,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 34a3c4b7e2e1..bf9eeea29fc0 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/task_manager/sampling/task_group.h @@ -40,7 +40,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index ffa0292c2205..ddbf0fa20bc4 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2021-04-20 18:58:27 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -44,9 +44,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -54,7 +54,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -146,13 +146,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -146,19 +146,21 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } @@ -70,3 +70,11 @@ bool TaskGroupSampler::RefreshProcessPriority() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); + #if defined(OS_MAC) + return process_.IsProcessBackgrounded( + content::BrowserChildProcessHost::GetPortProvider()); ++#elif defined(OS_BSD) ++ return false; + #else + return process_.IsProcessBackgrounded(); + #endif // defined(OS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 9cb379f38e60..9dd8365bf649 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; 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 4f0c20ce89e8..ef9fd285356a 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 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -221,11 +221,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -222,11 +222,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 4b2b181290c9..6fa40461748e 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/task_manager/task_manager_observer.h @@ -43,11 +43,11 @@ enum RefreshType { // or backgrounded. diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc new file mode 100644 index 000000000000..f6805c0e87df --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -0,0 +1,11 @@ +--- chrome/browser/themes/theme_helper.cc.orig 2021-04-22 07:57:50 UTC ++++ chrome/browser/themes/theme_helper.cc +@@ -304,7 +304,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl + ui::NativeTheme* native_theme) const { + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // On Linux the GTK system theme provides the high contrast colors, + // so don't use the IncreasedContrastThemeSupplier. + return false; diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 73c9a11094eb..196a58b27779 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -25,7 +25,7 @@ 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 50ba900fbdb9..ce1be9ce87ce 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,4 +1,4 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/tracing/crash_service_uploader.cc @@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 2481cdc04ebd..cd77d16a18c9 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-04-20 18:58:27 UTC +++ chrome/browser/ui/BUILD.gn -@@ -617,12 +617,15 @@ static_library("ui") { +@@ -642,11 +642,18 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } @@ -10,10 +10,13 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", - ] ++ ] + } ++ + if (is_bsd) { -+ deps += [ "//components/crash/core/browser" ] ++ sources -= [ ++ "webui/crashes_ui.cc", ++ "webui/crashes_ui.h", + ] } - if (is_win || is_android || is_linux || is_chromeos) { 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 9013611d79ae..699789496981 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,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -492,7 +492,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -496,7 +496,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -989,7 +989,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1013,7 +1013,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index 991c95bc0229..1423f3767a23 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,4 +1,4 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index aebb564701cb..3afbc76c8d7d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc index 5310e445c1b0..f0f4db286b19 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/sad_tab.cc @@ -189,7 +189,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 62627a62dee4..65f3cc534301 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc @@ -96,7 +96,7 @@ static const char* kBadFlags[] = { 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 62db14a4382d..4966039cccd7 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -150,7 +150,7 @@ +@@ -151,7 +151,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -422,11 +422,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -425,11 +425,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index d5aed68ad26e..d9377d43b01c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc @@ -94,10 +94,10 @@ const TableColumnData kColumns[] = { base::size("100000") * kCharWidth, -1, true, false, false}, diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 53cfa2ac7b7e..b6721c152744 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc @@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc index e17ce80c3bda..fcab24a1e6e7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc @@ -117,7 +117,7 @@ bool TestBrowserDialog::VerifyUi() { // TODO(https://crbug.com/958242) support Mac for pixel tests. 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 0b4bee4f0ca0..1d94f669db5a 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/test/test_browser_ui.cc @@ -13,7 +13,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch 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 db18a67d2442..ddaa3ef2dcc6 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -61,7 +61,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -62,7 +62,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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}, -@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -94,7 +94,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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}, -@@ -111,7 +111,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -112,7 +112,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}, -@@ -137,14 +137,14 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -138,14 +138,14 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index efa3b24266ae..523858afb942 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -22,7 +22,7 @@ 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 b57924c63343..3a0eacf363b7 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,4 +1,4 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -1856,7 +1856,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index b3be83832133..5035f8cb1bea 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -38,7 +38,7 @@ @@ -16,9 +16,9 @@ -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // This connector is used in ui_devtools's TracingAgent to hook up with the - // tracing service. -@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + namespace { + +@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -151,7 +151,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -162,7 +162,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index c72881014d04..898eb598376a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index 8d780aa5d78c..427d9f99c7c3 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,6 +1,6 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -189,7 +189,7 @@ bool UseNewWarnings() { +@@ -188,7 +188,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { @@ -9,7 +9,7 @@ if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif -@@ -197,7 +197,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) { } int GetFilenameStyle(const views::StyledLabel& label) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index a9f6157534be..ae803bbe2d04 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -44,7 +44,7 @@ +@@ -43,7 +43,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -53,7 +53,7 @@ namespace { +@@ -52,7 +52,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -226,7 +226,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -220,7 +220,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 44deeeab5682..1d095b52d7be 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ 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 13902a042c2c..73885e860515 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1504,7 +1504,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1532,7 +1532,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get -@@ -1886,7 +1886,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1915,7 +1915,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT bool must_regenerate_frame; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 2876c7091837..f88d437a755a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -468,7 +468,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -462,7 +462,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -662,7 +662,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const { +@@ -656,7 +656,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index e86717a6d6fb..7d8feb3ed288 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc @@ -6,7 +6,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index ca587eec42f1..236289b8191a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 7a4ba4c1adb0..5cb23e290028 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -19,7 +19,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 9f9a9ae99571..09e14b33a1e0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -423,7 +423,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -424,7 +424,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index cbb7d40c9d18..be6611aa92eb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2021-04-14 18:40:55 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -573,7 +573,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -586,7 +586,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( - auto avatar_image_view = std::make_unique<AvatarImageView>(image_model, this); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // crbug.com/1161166: Orca does not read the accessible window title of the // bubble, so we duplicate it in the top-level menu item. To be revisited // after considering other options, including fixes on the AT side. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 46ea7da2713c..e2189fa95fd6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc @@ -58,7 +58,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse SetAnimateOnStateChange(true); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 54e32ac00b04..b3df7da806b0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/views/tabs/tab.cc @@ -577,7 +577,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) 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 107266dc019b..67961ab45de3 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,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -447,7 +447,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. @@ -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. -@@ -2107,7 +2107,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2117,7 +2117,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 011a32a8cca6..d7cb824e0b47 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,4 +1,4 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/webui/about_ui.cc @@ -580,7 +580,7 @@ std::string ChromeURLs() { return html; 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 ca11fbd39c83..7e385e9e4c4f 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,15 +1,16 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-04-20 18:58:27 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -242,7 +242,7 @@ - #include "chrome/browser/ui/webui/app_launcher_page_ui.h" - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" - #endif - -@@ -263,12 +263,12 @@ +@@ -30,7 +30,9 @@ + #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" + #include "chrome/browser/ui/webui/components/components_ui.h" + #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" ++#if !defined(OS_BSD) + #include "chrome/browser/ui/webui/crashes_ui.h" ++#endif + #include "chrome/browser/ui/webui/device_log_ui.h" + #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h" + #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" +@@ -266,12 +268,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -24,7 +25,7 @@ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -465,7 +465,7 @@ bool IsAboutUI(const GURL& url) { +@@ -478,7 +480,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -33,16 +34,18 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -811,7 +811,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - } - #endif // !defined(OFFICIAL_BUILD) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) - return &NewWebUI<WebUIJsErrorUI>; - #endif -@@ -873,7 +873,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -527,8 +529,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + return &NewWebUI<ComponentsUI>; + if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL) + return &NewWebUI<ConstrainedWebDialogUI>; ++#if !defined(OS_BSD) + if (url.host_piece() == chrome::kChromeUICrashesHost) + return &NewWebUI<CrashesUI>; ++#endif + if (url.host_piece() == chrome::kChromeUIDeviceLogHost) + return &NewWebUI<chromeos::DeviceLogUI>; + if (url.host_piece() == chrome::kChromeUIDomainReliabilityInternalsHost) +@@ -892,7 +896,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -51,7 +54,7 @@ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; -@@ -917,13 +917,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -936,13 +940,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif @@ -67,7 +70,7 @@ defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; -@@ -931,7 +931,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -950,7 +954,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -76,3 +79,14 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif +@@ -1153,8 +1157,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + return ConflictsUI::GetFaviconResourceBytes(scale_factor); + #endif + ++#if !defined(OS_BSD) + if (page_url.host_piece() == chrome::kChromeUICrashesHost) + return CrashesUI::GetFaviconResourceBytes(scale_factor); ++#endif + + if (page_url.host_piece() == chrome::kChromeUIFlagsHost) + return FlagsUI::GetFaviconResourceBytes(scale_factor); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc new file mode 100644 index 000000000000..a4a298381dfe --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-04-22 07:58:52 UTC ++++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc +@@ -1395,7 +1395,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: + options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = false; + options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = true; + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + #else + options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 3266c2aeadce..d37d0e9cf89f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { base::Unretained(this))); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index 89e50df29535..d70b17869e24 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h @@ -39,7 +39,7 @@ class AppearanceHandler : public SettingsPageUIHandler 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 cc30f8b2db03..414df95e8591 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 2021-03-12 23:57:19 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -343,7 +343,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -344,7 +344,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -351,7 +351,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -352,7 +352,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc index 527c02f97e2b..e7b74c5c91a3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.cc.orig 2021-03-16 13:50:34 UTC +--- chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.cc @@ -20,7 +20,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h index 34ccd1a2dd5e..892c8040b07c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/web_applications/components/web_app_file_handler_registration.h @@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id, // If a shim app was required, also removes the shim app. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc index 828489c2ae43..0dd4c547935a 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_run_on_os_login.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/web_applications/components/web_app_run_on_os_login.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/web_applications/components/web_app_run_on_os_login.cc @@ -34,7 +34,7 @@ namespace internals { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) -+#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))) - // TODO(crbug.com/897302): This boilerplate function is used for platforms - // that don't support Run On OS Login. Currently the feature is supported on - // Windows, Linux and MacOS. ++#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)) + // This boilerplate function is used for platforms that don't support Run On OS + // Login. Currently the feature is supported on Windows, Linux and MacOS. + bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info) { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc index d16144a15b28..a04a76d0f108 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/web_applications/components/web_app_shortcut.cc @@ -33,7 +33,7 @@ namespace { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc index ac0694c7a119..d8b4b0ab0dea 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc @@ -18,7 +18,7 @@ namespace { bool CanOsAddDesktopShortcuts() { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc new file mode 100644 index 000000000000..50f989917fef --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/pending_app_install_task.cc.orig 2021-04-22 07:59:39 UTC ++++ chrome/browser/web_applications/pending_app_install_task.cc +@@ -310,7 +310,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ + options.os_hooks[OsHookType::kProtocolHandlers] = true; + options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + #else + options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc new file mode 100644 index 000000000000..de19d3869086 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-04-22 08:00:04 UTC ++++ chrome/browser/web_applications/web_app_install_task.cc +@@ -845,7 +845,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc + options.os_hooks[OsHookType::kProtocolHandlers] = true; + options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + #else + options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc new file mode 100644 index 000000000000..1aa3f92b85ac --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-04-22 08:00:21 UTC ++++ chrome/browser/web_applications/web_app_provider.cc +@@ -236,7 +236,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* + + std::unique_ptr<UrlHandlerManager> url_handler_manager = nullptr; + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + url_handler_manager = std::make_unique<UrlHandlerManagerImpl>(profile); + #endif + diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index bde26f91de02..c8ca0a74d71f 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,4 +1,4 @@ ---- chrome/common/BUILD.gn.orig 2021-03-12 23:57:19 UTC +--- chrome/common/BUILD.gn.orig 2021-04-14 18:40:56 UTC +++ chrome/common/BUILD.gn @@ -251,6 +251,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] @@ -11,7 +11,7 @@ if (enable_extensions) { sources += [ "extensions/api/commands/commands_handler.cc", -@@ -481,13 +485,21 @@ static_library("common") { +@@ -482,13 +486,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index 930457ad1c88..082fde50493b 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,4 +1,4 @@ ---- chrome/common/channel_info.h.orig 2021-03-12 23:57:19 UTC +--- chrome/common/channel_info.h.orig 2021-04-14 18:40:56 UTC +++ chrome/common/channel_info.h @@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir(); diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index 975b44d90cf8..2d60a836e827 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,4 +1,4 @@ ---- chrome/common/channel_info_posix.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/common/channel_info_posix.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/common/channel_info_posix.cc @@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir() { diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index cdc137cf1a76..91bace58c4d2 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 2021-03-12 23:57:19 UTC +--- chrome/common/chrome_features.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/common/chrome_features.cc -@@ -92,13 +92,13 @@ const base::Feature kAsyncDns { +@@ -96,13 +96,13 @@ const base::Feature kAsyncDns { #endif }; @@ -16,7 +16,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -348,13 +348,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll +@@ -360,13 +360,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 96d4333ed5d7..3f2ed04d65a8 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 2021-03-12 23:57:19 UTC +--- chrome/common/chrome_features.h.orig 2021-04-14 18:40:56 UTC +++ chrome/common/chrome_features.h -@@ -78,10 +78,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -81,10 +81,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -13,7 +13,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -230,11 +230,11 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -243,11 +243,11 @@ extern const base::Feature kEnableAmbientAuthenticatio // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 92a4c9976136..29f21126b859 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,38 +1,31 @@ ---- chrome/common/chrome_paths.cc.orig 2021-03-12 23:57:19 UTC +--- chrome/common/chrome_paths.cc.orig 2021-04-14 18:40:56 UTC +++ chrome/common/chrome_paths.cc -@@ -48,21 +48,29 @@ namespace { - const base::FilePath::CharType kPepperFlashBaseDirectory[] = - FILE_PATH_LITERAL("PepperFlash"); +@@ -44,15 +44,23 @@ + + namespace { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +#if defined(OS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); +#else - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); -+#endif - #else -+#if defined(OS_BSD) + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); ++#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +#else ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) + FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + #else FILE_PATH_LITERAL("/usr/share/chromium/extensions"); -+#endif #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#endif - // The path to the hint file that tells the pepper plugin loader - // where it can find the latest component updated flash. - const base::FilePath::CharType kComponentUpdatedFlashHint[] = - FILE_PATH_LITERAL("latest-component-updated-flash"); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) - #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ - BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -@@ -183,7 +191,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -175,7 +183,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -41,7 +34,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -447,6 +455,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -425,6 +433,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")); @@ -51,20 +44,16 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -455,9 +466,9 @@ bool PathProvider(int key, base::FilePath* result) { - #endif - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_CHROMEOS) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -- BUILDFLAG(CHROMIUM_BRANDING)) || \ -+#if defined(OS_CHROMEOS) || \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ -+ BUILDFLAG(CHROMIUM_BRANDING)) || \ - defined(OS_MAC) +@@ -436,7 +447,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- defined(OS_MAC) ++ defined(OS_MAC) || defined(OS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -466,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; +@@ -444,7 +455,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -73,7 +62,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -501,7 +512,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -479,7 +490,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -82,7 +71,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -515,6 +526,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -493,6 +504,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")); @@ -92,7 +81,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -527,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -505,7 +519,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 4ab66fec7521..cb0abf26c283 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,18 +1,14 @@ ---- chrome/common/chrome_paths.h.orig 2021-03-12 23:57:19 UTC +--- chrome/common/chrome_paths.h.orig 2021-04-14 18:40:56 UTC +++ chrome/common/chrome_paths.h -@@ -53,9 +53,9 @@ enum { - #endif - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_CHROMEOS) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -- BUILDFLAG(CHROMIUM_BRANDING)) || \ -+#if defined(OS_CHROMEOS) || \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ -+ BUILDFLAG(CHROMIUM_BRANDING)) || \ - defined(OS_MAC) +@@ -56,7 +56,7 @@ enum { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- defined(OS_MAC) ++ defined(OS_MAC) || defined(OS_BSD) 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 @@ -64,7 +64,7 @@ enum { // create it. #endif @@ -22,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -118,7 +118,7 @@ enum { +@@ -111,7 +111,7 @@ enum { DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers |