diff --git a/www/chromium/Makefile b/www/chromium/Makefile index acc7a7cef8a..08447dd266a 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.415 2019/03/19 08:48:23 robert Exp $ +# $OpenBSD: Makefile,v 1.416 2019/03/24 12:24:44 robert Exp $ .include @@ -11,8 +11,7 @@ DPB_PROPERTIES+= lonesome COMMENT= Chromium browser -V= 72.0.3626.121 -REVISION= 2 +V= 73.0.3683.86 DISTNAME= chromium-${V} diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 01153ff6f24..5fb35662626 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-72.0.3626.121.tar.xz) = TB5VSrYG6rMo539aktgkSyahD/0V15htMOq5XzetvB8= -SIZE (chromium-72.0.3626.121.tar.xz) = 686420260 +SHA256 (chromium-73.0.3683.86.tar.xz) = nrtzFXbSWQHO5VBfNFjPd4Cwo5JDdD13efZlFHFrv6M= +SIZE (chromium-73.0.3683.86.tar.xz) = 710449412 diff --git a/www/chromium/patches/patch-BUILD_gn b/www/chromium/patches/patch-BUILD_gn index 8907643d4e5..09748bf2a2e 100644 --- a/www/chromium/patches/patch-BUILD_gn +++ b/www/chromium/patches/patch-BUILD_gn @@ -1,9 +1,9 @@ -$OpenBSD: patch-BUILD_gn,v 1.22 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-BUILD_gn,v 1.23 2019/03/24 12:24:44 robert Exp $ Index: BUILD.gn --- BUILD.gn.orig +++ BUILD.gn -@@ -383,7 +383,7 @@ group("gn_all") { +@@ -381,7 +381,7 @@ group("gn_all") { ] } @@ -12,7 +12,7 @@ Index: BUILD.gn deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -425,8 +425,6 @@ group("gn_all") { +@@ -422,8 +422,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -21,7 +21,7 @@ Index: BUILD.gn "//testing:empty_main", ] -@@ -483,10 +481,6 @@ group("gn_all") { +@@ -480,10 +478,6 @@ group("gn_all") { "//chrome/test/chromedriver:chromedriver", "//chrome/test/chromedriver:chromedriver_tests", "//components/sync:run_sync_testserver", @@ -32,7 +32,7 @@ Index: BUILD.gn "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -541,10 +535,6 @@ group("gn_all") { +@@ -538,10 +532,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -43,7 +43,7 @@ Index: BUILD.gn ] if (!is_android) { -@@ -618,7 +608,7 @@ group("gn_all") { +@@ -615,7 +605,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -52,7 +52,7 @@ Index: BUILD.gn deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -882,7 +872,6 @@ if (is_chromeos) { +@@ -873,7 +863,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -60,7 +60,7 @@ Index: BUILD.gn # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1009,7 +998,7 @@ if (!is_ios) { +@@ -1001,7 +990,7 @@ if (!is_ios) { ] } @@ -69,7 +69,7 @@ Index: BUILD.gn data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1018,7 +1007,7 @@ if (!is_ios) { +@@ -1010,7 +999,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ Index: BUILD.gn data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1159,9 +1148,6 @@ group("chromium_builder_perf") { +@@ -1150,9 +1139,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/patches/patch-base_BUILD_gn b/www/chromium/patches/patch-base_BUILD_gn index c2caf8c40ab..2361e8eb735 100644 --- a/www/chromium/patches/patch-base_BUILD_gn +++ b/www/chromium/patches/patch-base_BUILD_gn @@ -1,9 +1,9 @@ -$OpenBSD: patch-base_BUILD_gn,v 1.23 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-base_BUILD_gn,v 1.24 2019/03/24 12:24:44 robert Exp $ Index: base/BUILD.gn --- base/BUILD.gn.orig +++ base/BUILD.gn -@@ -1176,7 +1176,7 @@ jumbo_component("base") { +@@ -1185,7 +1185,7 @@ jumbo_component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -12,7 +12,7 @@ Index: base/BUILD.gn host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1202,7 +1202,7 @@ jumbo_component("base") { +@@ -1211,7 +1211,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -21,7 +21,7 @@ Index: base/BUILD.gn sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1739,6 +1739,29 @@ jumbo_component("base") { +@@ -1751,6 +1751,29 @@ jumbo_component("base") { } } @@ -51,7 +51,7 @@ Index: base/BUILD.gn # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2789,6 +2812,8 @@ test("base_unittests") { +@@ -2837,6 +2860,8 @@ test("base_unittests") { # data += [ "$root_out_dir/base_unittests.dSYM/" ] } } diff --git a/www/chromium/patches/patch-base_allocator_allocator_shim_cc b/www/chromium/patches/patch-base_allocator_allocator_shim_cc index 35565839501..963fddbd2bb 100644 --- a/www/chromium/patches/patch-base_allocator_allocator_shim_cc +++ b/www/chromium/patches/patch-base_allocator_allocator_shim_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-base_allocator_allocator_shim_cc,v 1.6 2018/01/30 07:57:25 robert Exp $ +$OpenBSD: patch-base_allocator_allocator_shim_cc,v 1.7 2019/03/24 12:24:44 robert Exp $ Index: base/allocator/allocator_shim.cc --- base/allocator/allocator_shim.cc.orig +++ base/allocator/allocator_shim.cc -@@ -69,7 +69,7 @@ inline const allocator::AllocatorDispatch* GetChainHea +@@ -70,7 +70,7 @@ inline const allocator::AllocatorDispatch* GetChainHea // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast( diff --git a/www/chromium/patches/patch-base_debug_debugger_posix_cc b/www/chromium/patches/patch-base_debug_debugger_posix_cc index f8564da96aa..b698a207f79 100644 --- a/www/chromium/patches/patch-base_debug_debugger_posix_cc +++ b/www/chromium/patches/patch-base_debug_debugger_posix_cc @@ -1,8 +1,9 @@ -$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.21 2018/11/04 12:33:24 robert Exp $ +$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.22 2019/03/24 12:24:44 robert Exp $ + Index: base/debug/debugger_posix.cc --- base/debug/debugger_posix.cc.orig +++ base/debug/debugger_posix.cc -@@ -35,6 +35,10 @@ +@@ -36,6 +36,10 @@ #include #endif @@ -13,7 +14,7 @@ Index: base/debug/debugger_posix.cc #if defined(OS_FREEBSD) #include #endif -@@ -93,33 +97,38 @@ bool BeingDebugged() { +@@ -94,33 +98,38 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -23,7 +24,7 @@ Index: base/debug/debugger_posix.cc + size_t info_size; -#if defined(OS_OPENBSD) - if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(info_size); @@ -31,8 +32,8 @@ Index: base/debug/debugger_posix.cc mib[5] = (info_size / sizeof(struct kinfo_proc)); -#endif -- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); -+ int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0); +- int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { is_set = true; diff --git a/www/chromium/patches/patch-base_debug_stack_trace_posix_cc b/www/chromium/patches/patch-base_debug_stack_trace_posix_cc index 37f36be0fa0..31609a871f8 100644 --- a/www/chromium/patches/patch-base_debug_stack_trace_posix_cc +++ b/www/chromium/patches/patch-base_debug_stack_trace_posix_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.32 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.33 2019/03/24 12:24:44 robert Exp $ Index: base/debug/stack_trace_posix.cc --- base/debug/stack_trace_posix.cc.orig @@ -12,7 +12,7 @@ Index: base/debug/stack_trace_posix.cc #include "base/debug/proc_maps_linux.h" #endif -@@ -666,6 +666,10 @@ class SandboxSymbolizeHelper { +@@ -653,6 +653,10 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -23,7 +23,7 @@ Index: base/debug/stack_trace_posix.cc // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -683,6 +687,7 @@ class SandboxSymbolizeHelper { +@@ -670,6 +674,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -31,12 +31,12 @@ Index: base/debug/stack_trace_posix.cc } // Opens all object files and caches their file descriptors. -@@ -825,7 +830,7 @@ StackTrace::StackTrace(size_t count) { - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. +@@ -812,7 +817,7 @@ size_t CollectStackTrace(void** trace, size_t count) { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) && !defined(_AIX) +#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) - count = std::min(arraysize(trace_), count); - // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + return base::saturated_cast(backtrace(trace, count)); diff --git a/www/chromium/patches/patch-base_debug_thread_heap_usage_tracker_cc b/www/chromium/patches/patch-base_debug_thread_heap_usage_tracker_cc deleted file mode 100644 index 1962d1b066e..00000000000 --- a/www/chromium/patches/patch-base_debug_thread_heap_usage_tracker_cc +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-base_debug_thread_heap_usage_tracker_cc,v 1.4 2018/04/23 15:00:15 robert Exp $ -Index: base/debug/thread_heap_usage_tracker.cc ---- base/debug/thread_heap_usage_tracker.cc.orig -+++ base/debug/thread_heap_usage_tracker.cc -@@ -17,10 +17,12 @@ - #include "base/threading/thread_local_storage.h" - #include "build/build_config.h" - -+#if !defined(OS_OPENBSD) - #if defined(OS_MACOSX) || defined(OS_IOS) - #include - #else - #include -+#endif - #endif - - namespace base { diff --git a/www/chromium/patches/patch-base_linux_util_cc b/www/chromium/patches/patch-base_linux_util_cc index ac1525ca787..92e06251037 100644 --- a/www/chromium/patches/patch-base_linux_util_cc +++ b/www/chromium/patches/patch-base_linux_util_cc @@ -1,26 +1,9 @@ -$OpenBSD: patch-base_linux_util_cc,v 1.6 2018/09/04 07:20:43 robert Exp $ +$OpenBSD: patch-base_linux_util_cc,v 1.7 2019/03/24 12:24:44 robert Exp $ + Index: base/linux_util.cc --- base/linux_util.cc.orig +++ base/linux_util.cc -@@ -76,6 +76,7 @@ class LinuxDistroHelper { - #endif // if defined(OS_LINUX) - - bool GetTasksForProcess(pid_t pid, std::vector* tids) { -+#if !defined(OS_BSD) - char buf[256]; - snprintf(buf, sizeof(buf), "/proc/%d/task", pid); - -@@ -95,6 +96,9 @@ bool GetTasksForProcess(pid_t pid, std::vector* - } - closedir(task); - return true; -+#else -+ return false; -+#endif - } - - } // namespace -@@ -116,7 +120,7 @@ char g_linux_distro[kDistroSize] = +@@ -95,7 +95,7 @@ char g_linux_distro[kDistroSize] = #endif std::string GetLinuxDistro() { @@ -29,3 +12,21 @@ Index: base/linux_util.cc return g_linux_distro; #elif defined(OS_LINUX) LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); +@@ -135,6 +135,9 @@ void SetLinuxDistro(const std::string& distro) { + } + + bool GetThreadsForProcess(pid_t pid, std::vector* tids) { ++#if defined(OS_BSD) ++ return false; ++#else + // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 + char buf[25]; + base::strings::SafeSPrintf(buf, "/proc/%d/task", pid); +@@ -154,6 +157,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector +#include @@ -22,16 +23,16 @@ Index: base/process/process_handle_openbsd.cc int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; - if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) + if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(length); + mib[5] = (length / sizeof(struct kinfo_proc)); -- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) - return -1; -+ if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } @@ -53,11 +54,11 @@ Index: base/process/process_handle_openbsd.cc int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; -- if (sysctl(mib, arraysize(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) == -1) +- if (sysctl(mib, base::size(mib), NULL, &len, NULL, 0) == -1) ++ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) == -1) return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); -- if (sysctl(mib, arraysize(mib), &kp, &len, NULL, 0) < 0) +- if (sysctl(mib, base::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); - if ((kp.p_flag & P_SYSTEM) != 0) - return FilePath(); @@ -69,7 +70,7 @@ Index: base/process/process_handle_openbsd.cc + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) ++ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) + goto out; + + if ((info->p_flag & P_SYSTEM) != 0) diff --git a/www/chromium/patches/patch-base_process_process_metrics_cc b/www/chromium/patches/patch-base_process_process_metrics_cc new file mode 100644 index 00000000000..eabd8f93a4d --- /dev/null +++ b/www/chromium/patches/patch-base_process_process_metrics_cc @@ -0,0 +1,32 @@ +$OpenBSD: patch-base_process_process_metrics_cc,v 1.3 2019/03/24 12:24:44 robert Exp $ + +Index: base/process/process_metrics.cc +--- base/process/process_metrics.cc.orig ++++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr SystemMetrics::ToValue() const + std::unique_ptr res(new DictionaryValue()); + + res->SetInteger("committed_memory", static_cast(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr meminfo = memory_info_.ToValue(); + std::unique_ptr vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); +@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + } + #endif + +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + int ProcessMetrics::CalculateIdleWakeupsPerSecond( + uint64_t absolute_idle_wakeups) { + return CalculateEventsPerSecond(absolute_idle_wakeups, diff --git a/www/chromium/patches/patch-base_process_process_metrics_h b/www/chromium/patches/patch-base_process_process_metrics_h index 2f97c7aaeed..e25d20fc072 100644 --- a/www/chromium/patches/patch-base_process_process_metrics_h +++ b/www/chromium/patches/patch-base_process_process_metrics_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_process_process_metrics_h,v 1.18 2018/11/04 12:33:24 robert Exp $ +$OpenBSD: patch-base_process_process_metrics_h,v 1.19 2019/03/24 12:24:44 robert Exp $ Index: base/process/process_metrics.h --- base/process/process_metrics.h.orig @@ -12,18 +12,18 @@ Index: base/process/process_metrics.h // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -189,7 +189,7 @@ class BASE_EXPORT ProcessMetrics { - // process since process start. - uint64_t GetCumulativeDiskUsageInBytes(); +@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { + // convenience wrapper for CreateProcessMetrics(). + static std::unique_ptr CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) - // Returns the number of file descriptors currently open by the process, or - // -1 on error. - int GetOpenFdCount() const; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Resident Set Size is a Linux/Android specific memory concept. Do not + // attempt to extend this to other platforms. + BASE_EXPORT size_t GetResidentSetSize() const; @@ -199,7 +199,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; - #endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) + #endif // defined(OS_POSIX) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) @@ -48,16 +48,17 @@ Index: base/process/process_metrics.h // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -293,7 +293,8 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ - defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) ++ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || \ ++ defined(OS_BSD) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -326,7 +327,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -66,7 +67,7 @@ Index: base/process/process_metrics.h // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -341,7 +342,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ @@ -75,7 +76,7 @@ Index: base/process/process_metrics.h int buffers = 0; int cached = 0; int active_anon = 0; -@@ -379,7 +379,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -379,7 +380,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) @@ -84,3 +85,12 @@ Index: base/process/process_metrics.h // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. +@@ -547,7 +548,7 @@ class SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; diff --git a/www/chromium/patches/patch-base_process_process_metrics_openbsd_cc b/www/chromium/patches/patch-base_process_process_metrics_openbsd_cc index a25877400aa..3594d511811 100644 --- a/www/chromium/patches/patch-base_process_process_metrics_openbsd_cc +++ b/www/chromium/patches/patch-base_process_process_metrics_openbsd_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.16 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.17 2019/03/24 12:24:44 robert Exp $ Index: base/process/process_metrics_openbsd.cc --- base/process/process_metrics_openbsd.cc.orig @@ -23,8 +23,8 @@ Index: base/process/process_metrics_openbsd.cc #include +#include - #include "base/macros.h" #include "base/memory/ptr_util.h" + #include "base/process/process_metrics_iocounters.h" @@ -25,48 +36,13 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } @@ -35,12 +35,12 @@ Index: base/process/process_metrics_openbsd.cc - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; - -- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) +- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) - return -1; - - mib[5] = (length / sizeof(struct kinfo_proc)); - -- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) - return 0; - - return info.p_pctcpu; @@ -75,7 +75,7 @@ Index: base/process/process_metrics_openbsd.cc size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; -@@ -85,6 +61,70 @@ size_t GetSystemCommitCharge() { +@@ -85,6 +61,149 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -89,14 +89,14 @@ Index: base/process/process_metrics_openbsd.cc + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 0 }; + -+ if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) ++ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) + return -1; + + info = (struct kinfo_proc *)malloc(length); + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { + total_count = -1; + goto out; + } @@ -116,14 +116,14 @@ Index: base/process/process_metrics_openbsd.cc + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 0 }; + -+ if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) ++ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) + return -1; + + info = (struct kinfo_proc *)malloc(length); + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { + total_count = -1; + goto out; + } @@ -140,9 +140,88 @@ Index: base/process/process_metrics_openbsd.cc + return 0; +} + ++std::unique_ptr SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetInteger("total", total); ++ res->SetInteger("free", free); ++ res->SetInteger("available", available); ++ res->SetInteger("buffers", buffers); ++ res->SetInteger("cached", cached); ++ res->SetInteger("active_anon", active_anon); ++ res->SetInteger("inactive_anon", inactive_anon); ++ res->SetInteger("active_file", active_file); ++ res->SetInteger("inactive_file", inactive_file); ++ res->SetInteger("swap_total", swap_total); ++ res->SetInteger("swap_free", swap_free); ++ res->SetInteger("swap_used", swap_total - swap_free); ++ res->SetInteger("dirty", dirty); ++ res->SetInteger("reclaimable", reclaimable); ++ ++ return res; ++} ++ +bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) { + NOTIMPLEMENTED(); + return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast(reads)); ++ res->SetDouble("reads_merged", static_cast(reads_merged)); ++ res->SetDouble("sectors_read", static_cast(sectors_read)); ++ res->SetDouble("read_time", static_cast(read_time)); ++ res->SetDouble("writes", static_cast(writes)); ++ res->SetDouble("writes_merged", static_cast(writes_merged)); ++ res->SetDouble("sectors_written", static_cast(sectors_written)); ++ res->SetDouble("write_time", static_cast(write_time)); ++ res->SetDouble("io", static_cast(io)); ++ res->SetDouble("io_time", static_cast(io_time)); ++ res->SetDouble("weighted_io_time", static_cast(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++std::unique_ptr VmStatInfo::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetInteger("pswpin", pswpin); ++ res->SetInteger("pswpout", pswpout); ++ res->SetInteger("pgmajfault", pgmajfault); ++ return res; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++int ProcessMetrics::GetIdleWakeupsPerSecond() { ++ NOTIMPLEMENTED(); ++ return 0; } } // namespace base diff --git a/www/chromium/patches/patch-base_process_process_posix_cc b/www/chromium/patches/patch-base_process_process_posix_cc index d50ad14cf37..edbb100e7a7 100644 --- a/www/chromium/patches/patch-base_process_process_posix_cc +++ b/www/chromium/patches/patch-base_process_process_posix_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_process_process_posix_cc,v 1.19 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-base_process_process_posix_cc,v 1.20 2019/03/24 12:24:44 robert Exp $ Index: base/process/process_posix.cc --- base/process/process_posix.cc.orig @@ -9,9 +9,9 @@ Index: base/process/process_posix.cc #include +#include + #include "base/clang_coverage_buildflags.h" #include "base/debug/activity_tracker.h" - #include "base/files/scoped_file.h" -@@ -25,6 +26,9 @@ +@@ -26,6 +27,9 @@ namespace { @@ -21,7 +21,7 @@ Index: base/process/process_posix.cc #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -263,12 +267,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces +@@ -264,12 +268,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces return Process(handle); } @@ -35,7 +35,7 @@ Index: base/process/process_posix.cc // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -358,25 +360,33 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout +@@ -359,25 +361,33 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout void Process::Exited(int exit_code) const {} diff --git a/www/chromium/patches/patch-base_system_sys_info_openbsd_cc b/www/chromium/patches/patch-base_system_sys_info_openbsd_cc index 392a55cb326..b1834da19c6 100644 --- a/www/chromium/patches/patch-base_system_sys_info_openbsd_cc +++ b/www/chromium/patches/patch-base_system_sys_info_openbsd_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-base_system_sys_info_openbsd_cc,v 1.1 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-base_system_sys_info_openbsd_cc,v 1.2 2019/03/24 12:24:44 robert Exp $ Index: base/system/sys_info_openbsd.cc --- base/system/sys_info_openbsd.cc.orig @@ -37,7 +37,7 @@ Index: base/system/sys_info_openbsd.cc - int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; - size_t limit; - size_t size = sizeof(limit); -- if (sysctl(mib, arraysize(mib), &limit, &size, NULL, 0) < 0) { +- if (sysctl(mib, base::size(mib), &limit, &size, NULL, 0) < 0) { - NOTREACHED(); - return 0; - } diff --git a/www/chromium/patches/patch-base_threading_platform_thread_h b/www/chromium/patches/patch-base_threading_platform_thread_h index 83917050264..a733950bf1f 100644 --- a/www/chromium/patches/patch-base_threading_platform_thread_h +++ b/www/chromium/patches/patch-base_threading_platform_thread_h @@ -1,8 +1,8 @@ -$OpenBSD: patch-base_threading_platform_thread_h,v 1.5 2018/03/12 13:48:34 robert Exp $ +$OpenBSD: patch-base_threading_platform_thread_h,v 1.6 2019/03/24 12:24:44 robert Exp $ Index: base/threading/platform_thread.h --- base/threading/platform_thread.h.orig +++ base/threading/platform_thread.h -@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformThread { +@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); diff --git a/www/chromium/patches/patch-base_trace_event_process_memory_dump_cc b/www/chromium/patches/patch-base_trace_event_process_memory_dump_cc index 89e6622209e..cde24b25b0c 100644 --- a/www/chromium/patches/patch-base_trace_event_process_memory_dump_cc +++ b/www/chromium/patches/patch-base_trace_event_process_memory_dump_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.12 2018/09/12 17:08:22 robert Exp $ +$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.13 2019/03/24 12:24:44 robert Exp $ Index: base/trace_event/process_memory_dump.cc --- base/trace_event/process_memory_dump.cc.orig +++ base/trace_event/process_memory_dump.cc -@@ -93,7 +93,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -94,7 +94,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta #if defined(OS_WIN) std::unique_ptr vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/patches/patch-build_config_BUILDCONFIG_gn b/www/chromium/patches/patch-build_config_BUILDCONFIG_gn index fe65412f6c0..185bdf5f8ac 100644 --- a/www/chromium/patches/patch-build_config_BUILDCONFIG_gn +++ b/www/chromium/patches/patch-build_config_BUILDCONFIG_gn @@ -1,4 +1,4 @@ -$OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.13 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.14 2019/03/24 12:24:44 robert Exp $ Index: build/config/BUILDCONFIG.gn --- build/config/BUILDCONFIG.gn.orig @@ -16,7 +16,7 @@ Index: build/config/BUILDCONFIG.gn (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") -@@ -217,6 +217,8 @@ if (host_toolchain == "") { +@@ -213,6 +213,8 @@ if (host_toolchain == "") { } } else if (host_os == "aix") { host_toolchain = "//build/toolchain/aix:$host_cpu" @@ -25,7 +25,7 @@ Index: build/config/BUILDCONFIG.gn } else { assert(false, "Unsupported host_os: $host_os") } -@@ -261,6 +263,8 @@ if (target_os == "android") { +@@ -257,6 +259,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/win:uwp_$target_cpu" } else if (target_os == "aix") { _default_toolchain = "//build/toolchain/aix:$target_cpu" @@ -34,87 +34,13 @@ Index: build/config/BUILDCONFIG.gn } else { assert(false, "Unsupported target_os: $target_os") } -@@ -302,6 +306,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = false - is_win = true -+ is_openbsd = false - } else if (current_os == "mac") { - is_aix = false - is_android = false -@@ -313,6 +318,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "android") { - is_aix = false - is_android = true -@@ -324,6 +330,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "chromeos") { - is_aix = false - is_android = false -@@ -335,6 +342,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "nacl") { - # current_os == "nacl" will be passed by the nacl toolchain definition. - # It is not set by default or on the command line. We treat is as a -@@ -349,6 +357,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = true - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "fuchsia") { - is_aix = false - is_android = false -@@ -360,6 +369,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = false - is_win = false -+ is_openbsd = false - } else if (current_os == "ios") { - is_aix = false - is_android = false -@@ -371,6 +381,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "linux") { - is_aix = false - is_android = false -@@ -382,6 +393,7 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false - } else if (current_os == "aix") { - is_aix = true - is_android = false -@@ -393,6 +405,19 @@ if (current_os == "win" || current_os == "winuwp") { - is_nacl = false - is_posix = true - is_win = false -+ is_openbsd = false -+} else if (current_os == "openbsd") { -+ is_aix = false -+ is_android = false -+ is_chromeos = false -+ is_fuchsia = false -+ is_ios = false -+ is_linux = true -+ is_mac = false -+ is_nacl = false -+ is_posix = true -+ is_win = false -+ is_openbsd = true - } - - # ============================================================================= +@@ -291,7 +295,8 @@ is_android = current_os == "android" + is_chromeos = current_os == "chromeos" + is_fuchsia = current_os == "fuchsia" + is_ios = current_os == "ios" +-is_linux = current_os == "chromeos" || current_os == "linux" ++is_linux = current_os == "chromeos" || current_os == "linux" || current_os == "openbsd" ++is_openbsd = current_os == "openbsd" + is_mac = current_os == "mac" + is_nacl = current_os == "nacl" + is_win = current_os == "win" || current_os == "winuwp" diff --git a/www/chromium/patches/patch-build_config_BUILD_gn b/www/chromium/patches/patch-build_config_BUILD_gn index 36409398c2c..ad843bd379d 100644 --- a/www/chromium/patches/patch-build_config_BUILD_gn +++ b/www/chromium/patches/patch-build_config_BUILD_gn @@ -1,8 +1,8 @@ -$OpenBSD: patch-build_config_BUILD_gn,v 1.15 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-build_config_BUILD_gn,v 1.16 2019/03/24 12:24:44 robert Exp $ Index: build/config/BUILD.gn --- build/config/BUILD.gn.orig +++ build/config/BUILD.gn -@@ -270,7 +270,7 @@ config("default_libs") { +@@ -261,7 +261,7 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/chromium/patches/patch-build_config_c++_c++_gni b/www/chromium/patches/patch-build_config_c++_c++_gni index 02381f607b5..5a99187e98e 100644 --- a/www/chromium/patches/patch-build_config_c++_c++_gni +++ b/www/chromium/patches/patch-build_config_c++_c++_gni @@ -1,4 +1,4 @@ -$OpenBSD: patch-build_config_c++_c++_gni,v 1.3 2018/01/30 07:57:25 robert Exp $ +$OpenBSD: patch-build_config_c++_c++_gni,v 1.4 2019/03/24 12:24:44 robert Exp $ Index: build/config/c++/c++.gni --- build/config/c++/c++.gni.orig @@ -6,7 +6,7 @@ Index: build/config/c++/c++.gni @@ -12,7 +12,7 @@ declare_args() { # is not supported. use_custom_libcxx = - is_msan || is_fuchsia || + is_fuchsia || is_android || is_mac || - (is_linux && + (is_linux && !is_openbsd && (!is_chromeos || default_toolchain != "//build/toolchain/cros:target")) diff --git a/www/chromium/patches/patch-build_config_compiler_BUILD_gn b/www/chromium/patches/patch-build_config_compiler_BUILD_gn index 08bbbc4d293..9653ef9daa5 100644 --- a/www/chromium/patches/patch-build_config_compiler_BUILD_gn +++ b/www/chromium/patches/patch-build_config_compiler_BUILD_gn @@ -1,4 +1,4 @@ -$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.26 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.27 2019/03/24 12:24:44 robert Exp $ Index: build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn.orig @@ -12,7 +12,7 @@ Index: build/config/compiler/BUILD.gn (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -274,7 +274,7 @@ config("compiler") { +@@ -275,7 +275,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && !(is_android && use_order_profiling) && !is_mac && !is_ios && @@ -21,7 +21,7 @@ Index: build/config/compiler/BUILD.gn # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 # crbug.com/485542 -@@ -338,7 +338,7 @@ config("compiler") { +@@ -339,7 +339,7 @@ config("compiler") { } } @@ -30,7 +30,7 @@ Index: build/config/compiler/BUILD.gn # Explicitly pass --build-id to ld. Compilers used to always pass this # implicitly but don't any more (in particular clang when built without # ENABLE_LINKER_BUILD_ID=ON). The crash infrastructure does need a build -@@ -386,18 +386,13 @@ config("compiler") { +@@ -387,18 +387,13 @@ config("compiler") { } ldflags += [ @@ -52,7 +52,7 @@ Index: build/config/compiler/BUILD.gn } } -@@ -501,7 +496,7 @@ config("compiler") { +@@ -502,7 +497,7 @@ config("compiler") { } } @@ -61,7 +61,7 @@ Index: build/config/compiler/BUILD.gn cflags += [ # TODO(hans): Remove this once Clang generates better optimized debug info # by default. https://crbug.com/765793 -@@ -808,7 +803,7 @@ config("compiler_cpu_abi") { +@@ -809,7 +804,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -70,16 +70,16 @@ Index: build/config/compiler/BUILD.gn cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1684,7 +1679,7 @@ config("thin_archive") { +@@ -1694,7 +1689,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). - if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { + if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_openbsd) || is_fuchsia) { arflags = [ "-T" ] - } - } -@@ -2269,7 +2264,7 @@ config("symbols") { + } else if (is_win && use_lld) { + arflags = [ "/llvmlibthin" ] +@@ -2278,7 +2273,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) { diff --git a/www/chromium/patches/patch-build_config_compiler_compiler_gni b/www/chromium/patches/patch-build_config_compiler_compiler_gni deleted file mode 100644 index d49bfc22f60..00000000000 --- a/www/chromium/patches/patch-build_config_compiler_compiler_gni +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.16 2019/02/06 16:41:55 robert Exp $ - -Index: build/config/compiler/compiler.gni ---- build/config/compiler/compiler.gni.orig -+++ build/config/compiler/compiler.gni -@@ -169,7 +169,7 @@ declare_args() { - # TODO(pcc): Enable lld on more architectures on Linux. E.g. we probably need - # to fix some of crbug.com/742655 to enable it on ARM. - use_lld = -- is_clang && -+ is_clang && !is_openbsd && - (is_win || is_fuchsia || (use_thin_lto && target_os != "chromeos") || - (is_linux && current_cpu == "x64" && target_os != "chromeos") || - (is_android && (current_cpu != "arm" || arm_version >= 7) && -@@ -178,7 +178,7 @@ declare_args() { - - declare_args() { - # Whether to use the gold linker from binutils instead of lld or bfd. -- use_gold = !use_lld && !(is_chromecast && is_linux && -+ use_gold = !is_openbsd && !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || - current_cpu == "arm" || current_cpu == "mipsel" || diff --git a/www/chromium/patches/patch-build_config_features_gni b/www/chromium/patches/patch-build_config_features_gni index 8545ba23d84..ce89cb8558a 100644 --- a/www/chromium/patches/patch-build_config_features_gni +++ b/www/chromium/patches/patch-build_config_features_gni @@ -1,9 +1,9 @@ -$OpenBSD: patch-build_config_features_gni,v 1.10 2017/12/16 15:34:39 robert Exp $ +$OpenBSD: patch-build_config_features_gni,v 1.11 2019/03/24 12:24:44 robert Exp $ Index: build/config/features.gni --- build/config/features.gni.orig +++ build/config/features.gni -@@ -46,7 +46,7 @@ declare_args() { - fieldtrial_testing_like_official_build = is_chrome_branded +@@ -41,7 +41,7 @@ declare_args() { + } # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast diff --git a/www/chromium/patches/patch-build_gn_run_binary_py b/www/chromium/patches/patch-build_gn_run_binary_py index f0f9559da55..b72d048701d 100644 --- a/www/chromium/patches/patch-build_gn_run_binary_py +++ b/www/chromium/patches/patch-build_gn_run_binary_py @@ -1,14 +1,14 @@ -$OpenBSD: patch-build_gn_run_binary_py,v 1.10 2018/09/10 19:51:13 robert Exp $ +$OpenBSD: patch-build_gn_run_binary_py,v 1.11 2019/03/24 12:24:44 robert Exp $ Index: build/gn_run_binary.py --- build/gn_run_binary.py.orig +++ build/gn_run_binary.py -@@ -19,7 +19,7 @@ path = './' + sys.argv[1] +@@ -22,7 +22,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] -ret = subprocess.call(args) -+ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome","LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}) ++ret = subprocess.call(args, env={"CHROME_EXE_PATH":"/usr/ports/pobj/chromium-73.0.3683.86/chromium-73.0.3683.86/out/Release/chrome","LD_LIBRARY_PATH":"/usr/ports/pobj/chromium-73.0.3683.86/chromium-73.0.3683.86/out/Release"}) if ret != 0: if ret <= -100: # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni b/www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni index 6681e42e1c1..8fccca2137d 100644 --- a/www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni +++ b/www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni @@ -1,8 +1,8 @@ -$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.18 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.19 2019/03/24 12:24:44 robert Exp $ Index: build/toolchain/gcc_toolchain.gni --- build/toolchain/gcc_toolchain.gni.orig +++ build/toolchain/gcc_toolchain.gni -@@ -44,6 +44,11 @@ analyzer_wrapper = +@@ -47,6 +47,11 @@ analyzer_wrapper = rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", root_build_dir) + " --mode=clang" @@ -14,7 +14,7 @@ Index: build/toolchain/gcc_toolchain.gni # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -607,12 +612,12 @@ template("clang_toolchain") { +@@ -610,12 +615,12 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/patches/patch-cc_BUILD_gn b/www/chromium/patches/patch-cc_BUILD_gn index 05de72afc74..6ca45d8c52a 100644 --- a/www/chromium/patches/patch-cc_BUILD_gn +++ b/www/chromium/patches/patch-cc_BUILD_gn @@ -1,9 +1,9 @@ -$OpenBSD: patch-cc_BUILD_gn,v 1.21 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-cc_BUILD_gn,v 1.22 2019/03/24 12:24:44 robert Exp $ Index: cc/BUILD.gn --- cc/BUILD.gn.orig +++ cc/BUILD.gn -@@ -544,7 +544,7 @@ cc_test_static_library("test_support") { +@@ -548,7 +548,7 @@ cc_test_static_library("test_support") { "//ui/gl:test_support", "//ui/latency", ] @@ -12,7 +12,7 @@ Index: cc/BUILD.gn data_deps = [ "//third_party/mesa_headers", ] -@@ -744,9 +744,6 @@ cc_test("cc_unittests") { +@@ -746,9 +746,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", diff --git a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc index 15bed3ab606..38e468df3b2 100644 --- a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc +++ b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.49 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.50 2019/03/24 12:24:44 robert Exp $ Index: chrome/app/chrome_main_delegate.cc --- chrome/app/chrome_main_delegate.cc.orig @@ -21,7 +21,7 @@ Index: chrome/app/chrome_main_delegate.cc #include "base/environment.h" #endif -@@ -235,7 +235,7 @@ bool UseHooks() { +@@ -232,7 +232,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -30,7 +30,7 @@ Index: chrome/app/chrome_main_delegate.cc void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -339,7 +339,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -39,7 +39,7 @@ Index: chrome/app/chrome_main_delegate.cc // 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 +@@ -348,7 +348,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -48,7 +48,7 @@ Index: chrome/app/chrome_main_delegate.cc void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -57,7 +57,7 @@ Index: chrome/app/chrome_main_delegate.cc // 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. -@@ -585,7 +585,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -66,7 +66,7 @@ Index: chrome/app/chrome_main_delegate.cc // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -609,7 +609,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -75,7 +75,7 @@ Index: chrome/app/chrome_main_delegate.cc nacl::RegisterPathProvider(); #endif -@@ -925,7 +925,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -84,7 +84,7 @@ Index: chrome/app/chrome_main_delegate.cc // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -961,7 +961,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. diff --git a/www/chromium/patches/patch-chrome_app_chromium_strings_grd b/www/chromium/patches/patch-chrome_app_chromium_strings_grd index 14539798264..36273a858c7 100644 --- a/www/chromium/patches/patch-chrome_app_chromium_strings_grd +++ b/www/chromium/patches/patch-chrome_app_chromium_strings_grd @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.36 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.37 2019/03/24 12:24:44 robert Exp $ Index: chrome/app/chromium_strings.grd --- chrome/app/chromium_strings.grd.orig +++ chrome/app/chromium_strings.grd -@@ -797,7 +797,7 @@ Signing in anyway will merge Chromium information like +@@ -809,7 +809,7 @@ Signing in anyway will merge Chromium information like @@ -11,7 +11,7 @@ Index: chrome/app/chromium_strings.grd The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). 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. -@@ -1042,7 +1042,7 @@ Please check your email at $2 +@@ -1057,7 +1057,7 @@ Please check your email at $2 diff --git a/www/chromium/patches/patch-chrome_app_generated_resources_grd b/www/chromium/patches/patch-chrome_app_generated_resources_grd index 52b50cfceba..1910c82f6cc 100644 --- a/www/chromium/patches/patch-chrome_app_generated_resources_grd +++ b/www/chromium/patches/patch-chrome_app_generated_resources_grd @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.32 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.33 2019/03/24 12:24:44 robert Exp $ Index: chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd.orig @@ -12,7 +12,7 @@ Index: chrome/app/generated_resources.grd for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -5277,7 +5277,7 @@ the Bookmarks menu."> +@@ -5339,7 +5339,7 @@ the Bookmarks menu."> @@ -21,7 +21,7 @@ Index: chrome/app/generated_resources.grd Press |$1Ctrl|+|$2Shift| followed by |$3Q| to exit -@@ -6135,7 +6135,7 @@ the Bookmarks menu."> +@@ -6160,7 +6160,7 @@ the Bookmarks menu."> Google Pay @@ -30,7 +30,7 @@ Index: chrome/app/generated_resources.grd Use system title bar and borders -@@ -6929,7 +6929,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh Set as default diff --git a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd index f4f25581d8a..cb1d84e4d6e 100644 --- a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd +++ b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.35 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.36 2019/03/24 12:24:44 robert Exp $ Index: chrome/app/google_chrome_strings.grd --- chrome/app/google_chrome_strings.grd.orig +++ chrome/app/google_chrome_strings.grd -@@ -808,7 +808,7 @@ Signing in anyway will merge Chrome information like b +@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b @@ -11,7 +11,7 @@ Index: chrome/app/google_chrome_strings.grd The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). 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. -@@ -1060,7 +1060,7 @@ Please check your email at $2 +@@ -1075,7 +1075,7 @@ Please check your email at $2 diff --git a/www/chromium/patches/patch-chrome_app_settings_strings_grdp b/www/chromium/patches/patch-chrome_app_settings_strings_grdp index f14e533c2df..f6d31ab664d 100644 --- a/www/chromium/patches/patch-chrome_app_settings_strings_grdp +++ b/www/chromium/patches/patch-chrome_app_settings_strings_grdp @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_app_settings_strings_grdp,v 1.16 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_app_settings_strings_grdp,v 1.17 2019/03/24 12:24:44 robert Exp $ Index: chrome/app/settings_strings.grdp --- chrome/app/settings_strings.grdp.orig +++ chrome/app/settings_strings.grdp -@@ -553,7 +553,7 @@ +@@ -580,7 +580,7 @@ Themes @@ -12,7 +12,7 @@ Index: chrome/app/settings_strings.grdp GTK+ -@@ -567,7 +567,7 @@ +@@ -594,7 +594,7 @@ Use Classic diff --git a/www/chromium/patches/patch-chrome_browser_about_flags_cc b/www/chromium/patches/patch-chrome_browser_about_flags_cc index c72e16bde02..091b3088496 100644 --- a/www/chromium/patches/patch-chrome_browser_about_flags_cc +++ b/www/chromium/patches/patch-chrome_browser_about_flags_cc @@ -1,18 +1,18 @@ -$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.49 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.50 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/about_flags.cc --- chrome/browser/about_flags.cc.orig +++ chrome/browser/about_flags.cc -@@ -832,7 +832,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS +@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050, base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}}; -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = { - {autofill::kAutofillForcedFontWeightParameterName, - autofill::kAutofillForcedFontWeightParameterMedium}, -@@ -2497,7 +2497,7 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = { + {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}}; + const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = { +@@ -2362,7 +2362,7 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -21,25 +21,25 @@ Index: chrome/browser/about_flags.cc {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, -@@ -2696,7 +2696,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - password_manager::features::kPasswordsKeyboardAccessory)}, +@@ -2562,7 +2562,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, + #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) {"passwords-migrate-linux-to-login-db", flag_descriptions::kPasswordsMigrateLinuxToLoginDBName, flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux, -@@ -3127,7 +3127,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, +@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)}, + #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-new-answer-layout", - flag_descriptions::kOmniboxNewAnswerLayoutName, - flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop, -@@ -3449,7 +3449,7 @@ const FeatureEntry kFeatureEntries[] = { + {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName, + flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)}, +@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -48,21 +48,21 @@ Index: chrome/browser/about_flags.cc {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -3897,7 +3897,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll, - FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)}, - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"autofill-primary-info-style", - flag_descriptions::kAutofillPrimaryInfoStyleExperimentName, - flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription, -@@ -4001,7 +4001,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kExperimentalProductivityFeaturesDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kExperimentalProductivityFeatures)}, +@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, + #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName, - flag_descriptions::kNtpBackgroundsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kNtpBackgrounds)}, + {"autofill-always-show-server-cards-in-sync-transport", + flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, + flag_descriptions:: +@@ -4333,7 +4333,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, + #endif // OS_CHROMEOS + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"autofill-settings-split-by-card-type", + flag_descriptions::kAutofillSettingsSplitByCardTypeName, + flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, diff --git a/www/chromium/patches/patch-chrome_browser_after_startup_task_utils_cc b/www/chromium/patches/patch-chrome_browser_after_startup_task_utils_cc index 21dba0bc156..a2ce7cdec07 100644 --- a/www/chromium/patches/patch-chrome_browser_after_startup_task_utils_cc +++ b/www/chromium/patches/patch-chrome_browser_after_startup_task_utils_cc @@ -1,18 +1,18 @@ -$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.13 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.14 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/after_startup_task_utils.cc --- chrome/browser/after_startup_task_utils.cc.orig +++ chrome/browser/after_startup_task_utils.cc @@ -29,7 +29,7 @@ + #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" - #include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -110,7 +110,7 @@ void QueueTask(std::unique_ptr queue +@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -21,7 +21,7 @@ Index: chrome/browser/after_startup_task_utils.cc // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -118,7 +118,7 @@ void SetBrowserStartupIsComplete() { +@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -30,9 +30,9 @@ Index: chrome/browser/after_startup_task_utils.cc UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -130,7 +130,7 @@ void SetBrowserStartupIsComplete() { - base::circular_deque(g_after_startup_tasks.Get()) - .swap(g_after_startup_tasks.Get()); +@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { + g_after_startup_tasks.Get().clear(); + g_after_startup_tasks.Get().shrink_to_fit(); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/patches/patch-chrome_browser_browser_process_impl_cc b/www/chromium/patches/patch-chrome_browser_browser_process_impl_cc index 9970d28bcd2..8a1fafc5c4a 100644 --- a/www/chromium/patches/patch-chrome_browser_browser_process_impl_cc +++ b/www/chromium/patches/patch-chrome_browser_browser_process_impl_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.31 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.32 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/browser_process_impl.cc --- chrome/browser/browser_process_impl.cc.orig +++ chrome/browser/browser_process_impl.cc -@@ -1485,7 +1485,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1469,7 +1469,7 @@ void BrowserProcessImpl::Unpin() { } // Mac is currently not supported. diff --git a/www/chromium/patches/patch-chrome_browser_browser_process_impl_h b/www/chromium/patches/patch-chrome_browser_browser_process_impl_h index c84c5e64093..d42811fcd7f 100644 --- a/www/chromium/patches/patch-chrome_browser_browser_process_impl_h +++ b/www/chromium/patches/patch-chrome_browser_browser_process_impl_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.22 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.23 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/browser_process_impl.h --- chrome/browser/browser_process_impl.h.orig +++ chrome/browser/browser_process_impl.h -@@ -367,7 +367,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -361,7 +361,7 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr resource_dispatcher_host_delegate_; diff --git a/www/chromium/patches/patch-chrome_browser_browser_resources_grd b/www/chromium/patches/patch-chrome_browser_browser_resources_grd index 63b72b29b8e..6663d764880 100644 --- a/www/chromium/patches/patch-chrome_browser_browser_resources_grd +++ b/www/chromium/patches/patch-chrome_browser_browser_resources_grd @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.48 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.49 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/browser_resources.grd --- chrome/browser/browser_resources.grd.orig +++ chrome/browser/browser_resources.grd -@@ -650,7 +650,7 @@ +@@ -679,7 +679,7 @@ diff --git a/www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc b/www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc index 3439299831d..da8570b13cd 100644 --- a/www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc +++ b/www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.29 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.30 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/chrome_browser_main.cc --- chrome/browser/chrome_browser_main.cc.orig +++ chrome/browser/chrome_browser_main.cc -@@ -216,7 +216,7 @@ +@@ -217,7 +217,7 @@ #include "chromeos/settings/cros_settings_names.h" #endif // defined(OS_CHROMEOS) @@ -12,7 +12,7 @@ Index: chrome/browser/chrome_browser_main.cc #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -256,7 +256,7 @@ +@@ -257,7 +257,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,7 +21,7 @@ Index: chrome/browser/chrome_browser_main.cc #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -1059,7 +1059,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,7 +30,7 @@ Index: chrome/browser/chrome_browser_main.cc // 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 . -@@ -1072,7 +1072,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1056,7 +1056,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -39,7 +39,7 @@ Index: chrome/browser/chrome_browser_main.cc // Set the product channel for crash reports. breakpad::SetChannelCrashKey(chrome::GetChannelName()); #endif // defined(OS_LINUX) || defined(OS_OPENBSD) -@@ -1098,7 +1098,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1086,7 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { tracing::SetupNavigationTracing(); } diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc index 1856f3fe3b3..f4703d00793 100644 --- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc +++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc @@ -1,18 +1,18 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.52 2019/02/19 14:57:53 robert Exp $ +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.53 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc.orig +++ chrome/browser/chrome_content_browser_client.cc -@@ -370,7 +370,7 @@ - #include "chromeos/services/secure_channel/secure_channel_service.h" +@@ -395,7 +395,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" + #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -415,11 +415,11 @@ +@@ -441,12 +441,12 @@ #include "components/services/patch/public/interfaces/constants.mojom.h" #endif @@ -21,30 +21,22 @@ Index: chrome/browser/chrome_content_browser_client.cc #include "chrome/browser/webshare/share_service_impl.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -434,7 +434,7 @@ + +@@ -462,7 +462,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -751,7 +751,7 @@ bool IsAutoplayAllowedByPolicy(content::WebContents* c - } - #endif - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( - const std::string& process_type) { - base::FilePath dumps_path; -@@ -1104,7 +1104,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: +@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos( parameters, chrome_feature_list_creator_); @@ -53,25 +45,25 @@ Index: chrome/browser/chrome_content_browser_client.cc main_parts = new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); #elif defined(OS_ANDROID) -@@ -1124,7 +1124,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: +@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1916,7 +1916,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -1956,7 +1956,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) - if (breakpad::IsCrashReporterEnabled()) { - std::string switch_value; - std::unique_ptr client_info = -@@ -3477,7 +3477,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst + #if defined(OS_ANDROID) + bool enable_crash_reporter = true; + #else +@@ -3550,7 +3550,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -80,16 +72,16 @@ Index: chrome/browser/chrome_content_browser_client.cc void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4227,7 +4227,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - if (previews_lite_page_throttle) - throttles.push_back(std::move(previews_lite_page_throttle)); +@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + handle)); + } -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) std::unique_ptr browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: -@@ -4348,7 +4348,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa +@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); @@ -98,7 +90,7 @@ Index: chrome/browser/chrome_content_browser_client.cc frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create)); #endif -@@ -4927,7 +4927,7 @@ std::unique_ptr +@@ -5047,7 +5047,7 @@ std::unique_ptr ChromeContentBrowserClient::CreateWindowForPictureInPicture( content::PictureInPictureWindowController* controller) { #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h index 2697c7eea72..24d8d0ea1af 100644 --- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h +++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.40 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.41 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/chrome_content_browser_client.h --- chrome/browser/chrome_content_browser_client.h.orig +++ chrome/browser/chrome_content_browser_client.h -@@ -360,7 +360,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -363,7 +363,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, - blink::mojom::PageVisibilityState* visibility_state) override; + content::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( diff --git a/www/chromium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc b/www/chromium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc index 045546f780b..113a16c5cac 100644 --- a/www/chromium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc +++ b/www/chromium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.10 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.11 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/custom_handlers/protocol_handler_registry.cc --- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -50,7 +50,7 @@ const ProtocolHandler& LookupHandler( +@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { diff --git a/www/chromium/patches/patch-chrome_browser_devtools_devtools_eye_dropper_cc b/www/chromium/patches/patch-chrome_browser_devtools_devtools_eye_dropper_cc index 19d090d3b94..441b0ddf137 100644 --- a/www/chromium/patches/patch-chrome_browser_devtools_devtools_eye_dropper_cc +++ b/www/chromium/patches/patch-chrome_browser_devtools_devtools_eye_dropper_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.8 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.9 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/devtools/devtools_eye_dropper.cc --- chrome/browser/devtools/devtools_eye_dropper.cc.orig +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -172,7 +172,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -163,7 +163,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/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc b/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc index 18973297662..d9220fffd20 100644 --- a/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc +++ b/www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.26 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.27 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/download/chrome_download_manager_delegate.cc --- chrome/browser/download/chrome_download_manager_delegate.cc.orig +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1211,7 +1211,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -12,7 +12,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1251,7 +1251,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/patches/patch-chrome_browser_download_download_commands_cc b/www/chromium/patches/patch-chrome_browser_download_download_commands_cc index ff71de06b31..10e293c730a 100644 --- a/www/chromium/patches/patch-chrome_browser_download_download_commands_cc +++ b/www/chromium/patches/patch-chrome_browser_download_download_commands_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.18 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.19 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/download/download_commands.cc --- chrome/browser/download/download_commands.cc.orig +++ chrome/browser/download/download_commands.cc -@@ -220,7 +220,7 @@ Browser* DownloadCommands::GetBrowser() const { +@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const { return browser_displayer.browser(); } @@ -12,7 +12,7 @@ Index: chrome/browser/download/download_commands.cc bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = model_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -237,7 +237,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -175,7 +175,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/patches/patch-chrome_browser_download_download_commands_h b/www/chromium/patches/patch-chrome_browser_download_download_commands_h index 0f70f6e33e6..8b4e6ad44cb 100644 --- a/www/chromium/patches/patch-chrome_browser_download_download_commands_h +++ b/www/chromium/patches/patch-chrome_browser_download_download_commands_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.6 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.7 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/download/download_commands.h --- chrome/browser/download/download_commands.h.orig +++ chrome/browser/download/download_commands.h -@@ -44,7 +44,7 @@ class DownloadCommands { +@@ -42,7 +42,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); diff --git a/www/chromium/patches/patch-chrome_browser_download_download_prefs_cc b/www/chromium/patches/patch-chrome_browser_download_download_prefs_cc index 455a77dadbb..ffe218140e3 100644 --- a/www/chromium/patches/patch-chrome_browser_download_download_prefs_cc +++ b/www/chromium/patches/patch-chrome_browser_download_download_prefs_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.16 2019/02/19 14:57:53 robert Exp $ +$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.17 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/download/download_prefs.cc --- chrome/browser/download/download_prefs.cc.orig @@ -29,7 +29,7 @@ Index: chrome/browser/download/download_prefs.cc base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -145,7 +148,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -155,7 +158,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -38,7 +38,7 @@ Index: chrome/browser/download/download_prefs.cc should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -242,7 +245,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -252,7 +255,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -47,7 +47,7 @@ Index: chrome/browser/download/download_prefs.cc registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) -@@ -344,7 +347,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -354,7 +357,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -56,7 +56,7 @@ Index: chrome/browser/download/download_prefs.cc if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -358,7 +361,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -368,7 +371,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -65,7 +65,7 @@ Index: chrome/browser/download/download_prefs.cc if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -395,7 +398,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( +@@ -405,7 +408,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -74,7 +74,7 @@ Index: chrome/browser/download/download_prefs.cc void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -416,7 +419,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -426,7 +429,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { @@ -83,9 +83,9 @@ Index: chrome/browser/download/download_prefs.cc SetShouldOpenPdfInSystemReader(false); #endif auto_open_.clear(); -@@ -477,7 +480,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -497,7 +500,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa // Fall back to the default download directory for all other paths. - return profile_download_dir; + return GetDefaultDownloadDirectoryForProfile(); #endif - return path; + // If unveil(2) is used, force the file dialog directory to something we diff --git a/www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn b/www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn index 2af94f3d623..9ed2b747791 100644 --- a/www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn +++ b/www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.21 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.22 2019/03/24 12:24:44 robert Exp $ Index: chrome/browser/extensions/BUILD.gn --- chrome/browser/extensions/BUILD.gn.orig +++ chrome/browser/extensions/BUILD.gn -@@ -1095,6 +1095,10 @@ jumbo_static_library("extensions") { +@@ -1104,6 +1104,10 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc b/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc index d125a2f79e1..07ce84168e4 100644 --- a/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc +++ b/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.27 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.28 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/extensions/bookmark_app_helper.cc --- chrome/browser/extensions/bookmark_app_helper.cc.orig +++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -497,7 +497,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten +@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten if (create_shortcuts_) { #if !defined(OS_CHROMEOS) web_app::ShortcutLocations creation_locations; diff --git a/www/chromium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc b/www/chromium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc index da207a6876a..ad914b9a93a 100644 --- a/www/chromium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc +++ b/www/chromium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.14 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.15 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc --- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" @@ -12,7 +12,7 @@ Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -97,7 +97,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc b/www/chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc index 4644693756d..28955982a24 100644 --- a/www/chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc +++ b/www/chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc @@ -1,23 +1,23 @@ -$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.12 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.13 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/extensions/external_provider_impl.cc --- chrome/browser/extensions/external_provider_impl.cc.orig +++ chrome/browser/extensions/external_provider_impl.cc -@@ -759,7 +759,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -747,7 +747,7 @@ void ExternalProviderImpl::CreateExternalProviders( + chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } - -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - if (!profile->IsLegacySupervised()) { - provider_list->push_back(std::make_unique( - service, -@@ -787,7 +787,7 @@ void ExternalProviderImpl::CreateExternalProviders( + provider_list->push_back(std::make_unique( + service, + new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, +@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) ++#if defined(OS_MACOSX) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(CHROMIUM_BUILD)) provider_list->push_back(std::make_unique( service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, diff --git a/www/chromium/patches/patch-chrome_browser_flag_descriptions_cc b/www/chromium/patches/patch-chrome_browser_flag_descriptions_cc index 9d2e9fffc5d..edb784e067e 100644 --- a/www/chromium/patches/patch-chrome_browser_flag_descriptions_cc +++ b/www/chromium/patches/patch-chrome_browser_flag_descriptions_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.15 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.16 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/flag_descriptions.cc --- chrome/browser/flag_descriptions.cc.orig +++ chrome/browser/flag_descriptions.cc -@@ -3696,7 +3696,7 @@ const char kWakeOnPacketsDescription[] = +@@ -3656,7 +3656,7 @@ const char kWakeOnPacketsDescription[] = // Random platform combinations ----------------------------------------------- @@ -12,7 +12,7 @@ Index: chrome/browser/flag_descriptions.cc const char kEnableInputImeApiName[] = "Enable Input IME API"; const char kEnableInputImeApiDescription[] = -@@ -3715,7 +3715,7 @@ const char kAutomaticTabDiscardingDescription[] = +@@ -3675,7 +3675,7 @@ const char kAutomaticTabDiscardingDescription[] = #endif // defined(OS_WIN) || defined(OS_MACOSX) diff --git a/www/chromium/patches/patch-chrome_browser_flag_descriptions_h b/www/chromium/patches/patch-chrome_browser_flag_descriptions_h index 649dfa41cf6..fe3c32bd900 100644 --- a/www/chromium/patches/patch-chrome_browser_flag_descriptions_h +++ b/www/chromium/patches/patch-chrome_browser_flag_descriptions_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.15 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.16 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/flag_descriptions.h --- chrome/browser/flag_descriptions.h.orig +++ chrome/browser/flag_descriptions.h -@@ -2219,7 +2219,7 @@ extern const char kWakeOnPacketsDescription[]; +@@ -2192,7 +2192,7 @@ extern const char kWakeOnPacketsDescription[]; // Random platform combinations ----------------------------------------------- @@ -12,7 +12,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kEnableInputImeApiName[]; extern const char kEnableInputImeApiDescription[]; -@@ -2236,7 +2236,7 @@ extern const char kAutomaticTabDiscardingDescription[] +@@ -2209,7 +2209,7 @@ extern const char kAutomaticTabDiscardingDescription[] #endif // defined(OS_WIN) || defined(OS_MACOSX) diff --git a/www/chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc b/www/chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc index d2a21742b82..53b379e5236 100644 --- a/www/chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc +++ b/www/chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc,v 1.8 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc,v 1.9 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/media/webrtc/webrtc_log_uploader.cc --- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -383,6 +383,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc b/www/chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc index ecfc7f4d864..d6cdd9056af 100644 --- a/www/chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc +++ b/www/chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc @@ -1,4 +1,4 @@ -$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.10 2018/03/12 13:48:34 robert Exp $ +$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.11 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -14,3 +14,12 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "base/linux_util.h" #include "base/strings/string_split.h" +@@ -226,7 +228,7 @@ void RecordStartupMetrics() { + // because initializing the Bluetooth adapter causes too much jank. + // Re-enable when that is resolved. + // See https://crbug.com/929375. +-#if !defined(OS_WIN) ++#if !defined(OS_WIN) && !defined(OS_BSD) + bluetooth_utility::ReportBluetoothAvailability(); + #endif + diff --git a/www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc b/www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc index 369f058845e..6bc8f5c4160 100644 --- a/www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc +++ b/www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.4 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.5 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/metrics/chrome_metrics_service_client.cc --- chrome/browser/metrics/chrome_metrics_service_client.cc.orig +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -907,7 +907,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -919,7 +919,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc b/www/chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc index 0103c62b7d5..fecd2ba1379 100644 --- a/www/chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc +++ b/www/chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc,v 1.1 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc,v 1.2 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -104,7 +104,7 @@ +@@ -107,7 +107,7 @@ #include "chrome/browser/policy/browser_signin_policy_handler.h" #endif @@ -12,7 +12,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -928,7 +928,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kEnterpriseHardwarePlatformAPIEnabled, base::Value::Type::BOOLEAN }, diff --git a/www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc b/www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc index dde5ea26347..86e3f237cfc 100644 --- a/www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc +++ b/www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.4 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.5 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc.orig +++ chrome/browser/prefs/browser_prefs.cc -@@ -313,7 +313,7 @@ +@@ -319,7 +319,7 @@ #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" #endif @@ -12,12 +12,12 @@ Index: chrome/browser/prefs/browser_prefs.cc (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -764,7 +764,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) - browser_switcher::prefs::RegisterProfilePrefs(registry); + browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif diff --git a/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc b/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc index 9595fb36674..a0445181459 100644 --- a/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc +++ b/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc @@ -1,4 +1,5 @@ -$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.16 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.17 2019/03/24 12:24:45 robert Exp $ + Index: chrome/browser/process_singleton_posix.cc --- chrome/browser/process_singleton_posix.cc.orig +++ chrome/browser/process_singleton_posix.cc @@ -12,7 +13,7 @@ Index: chrome/browser/process_singleton_posix.cc #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "ui/views/linux_ui/linux_ui.h" #endif @@ -28,9 +29,9 @@ Index: chrome/browser/process_singleton_posix.cc @@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; - } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) { + } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // Likely NULL in unit tests. views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) diff --git a/www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc b/www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc index 4d685aab602..104410e1902 100644 --- a/www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc +++ b/www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.4 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.5 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -319,7 +319,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !defined(OS_ANDROID) MediaGalleriesPreferencesFactory::GetInstance(); #endif diff --git a/www/chromium/patches/patch-chrome_browser_profiles_profile_impl_cc b/www/chromium/patches/patch-chrome_browser_profiles_profile_impl_cc index a1e5324d94d..510a1425704 100644 --- a/www/chromium/patches/patch-chrome_browser_profiles_profile_impl_cc +++ b/www/chromium/patches/patch-chrome_browser_profiles_profile_impl_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_profiles_profile_impl_cc,v 1.1 2019/02/19 14:57:53 robert Exp $ +$OpenBSD: patch-chrome_browser_profiles_profile_impl_cc,v 1.2 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/profiles/profile_impl.cc --- chrome/browser/profiles/profile_impl.cc.orig +++ chrome/browser/profiles/profile_impl.cc -@@ -138,6 +138,7 @@ +@@ -143,6 +143,7 @@ #include "services/preferences/public/mojom/preferences.mojom.h" #include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h" #include "services/service_manager/public/cpp/service.h" @@ -11,7 +11,7 @@ Index: chrome/browser/profiles/profile_impl.cc #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) -@@ -742,7 +743,13 @@ void ProfileImpl::DoFinalInit() { +@@ -785,7 +786,13 @@ void ProfileImpl::DoFinalInit() { } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/patches/patch-chrome_browser_profiles_profile_io_data_cc b/www/chromium/patches/patch-chrome_browser_profiles_profile_io_data_cc index 837d55cb01b..dbd5d4f2072 100644 --- a/www/chromium/patches/patch-chrome_browser_profiles_profile_io_data_cc +++ b/www/chromium/patches/patch-chrome_browser_profiles_profile_io_data_cc @@ -1,18 +1,18 @@ -$OpenBSD: patch-chrome_browser_profiles_profile_io_data_cc,v 1.5 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_profiles_profile_io_data_cc,v 1.6 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/profiles/profile_io_data.cc --- chrome/browser/profiles/profile_io_data.cc.orig +++ chrome/browser/profiles/profile_io_data.cc -@@ -167,7 +167,7 @@ - #include "net/reporting/reporting_service.h" - #endif // BUILDFLAG(ENABLE_REPORTING) +@@ -161,7 +161,7 @@ + #include "net/ssl/client_cert_store_mac.h" + #endif // defined(OS_MACOSX) -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) #include "chrome/browser/net/trial_comparison_cert_verifier.h" #include "net/cert/cert_verify_proc_builtin.h" #endif -@@ -1019,7 +1019,7 @@ void ProfileIOData::Init( +@@ -982,7 +982,7 @@ void ProfileIOData::Init( std::make_unique( verify_proc.get())); } diff --git a/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc b/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc index cc6b962ed06..5a18c2c99c0 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc +++ b/www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc @@ -1,18 +1,9 @@ -$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.24 2018/12/07 11:07:35 robert Exp $ +$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.25 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/renderer_preferences_util.cc --- chrome/browser/renderer_preferences_util.cc.orig +++ chrome/browser/renderer_preferences_util.cc -@@ -20,7 +20,7 @@ - #include "third_party/blink/public/public_buildflags.h" - #include "third_party/skia/include/core/SkColor.h" - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "ui/gfx/font_render_params.h" - #endif - -@@ -32,7 +32,7 @@ +@@ -28,7 +28,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -21,7 +12,7 @@ Index: chrome/browser/renderer_preferences_util.cc #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -131,7 +131,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere prefs->caret_blink_interval = interval; #endif @@ -30,12 +21,12 @@ Index: chrome/browser/renderer_preferences_util.cc views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -150,7 +150,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) - static const base::NoDestructor params( - gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); - prefs->should_antialias_text = params->antialiasing; + content::UpdateFontRendererPreferencesFromSystemSettings(prefs); + #endif + diff --git a/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json b/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json index c428b670437..286442fce42 100644 --- a/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json +++ b/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json @@ -1,11 +1,11 @@ -$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.28 2019/02/06 16:41:55 robert Exp $ +$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.29 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/resources/plugin_metadata/plugins_linux.json --- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig +++ chrome/browser/resources/plugin_metadata/plugins_linux.json @@ -1,27 +1,5 @@ { - "x-version": 37, + "x-version": 38, - "adobe-flash-player": { - "mime_types": [ - "application/futuresplash", @@ -16,9 +16,9 @@ Index: chrome/browser/resources/plugin_metadata/plugins_linux.json - ], - "versions": [ - { -- "version": "32.0.0.114", +- "version": "32.0.0.142", - "status": "up_to_date", -- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb19-01.html" +- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb19-06.html" - } - ], - "lang": "en-US", diff --git a/www/chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html b/www/chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html index 789f72ed91e..2c38ef7fb23 100644 --- a/www/chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html +++ b/www/chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_html,v 1.8 2018/09/12 17:08:22 robert Exp $ +$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_html,v 1.9 2019/03/24 12:24:45 robert Exp $ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html --- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -70,7 +70,7 @@ +@@ -65,7 +65,7 @@ hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_"> @@ -12,7 +12,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -21,7 +21,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html