upate to 73.0.3683.86
This commit is contained in:
parent
3b4c8c86c8
commit
29857da0bc
@ -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 <bsd.port.arch.mk>
|
||||
|
||||
@ -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}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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" ]
|
||||
|
@ -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 <atomic> if using newer C++ library than sysroot, except if
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
@ -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/" ]
|
||||
}
|
||||
}
|
||||
|
@ -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<const allocator::AllocatorDispatch*>(
|
||||
|
@ -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 <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
@ -13,7 +14,7 @@ Index: base/debug/debugger_posix.cc
|
||||
#if defined(OS_FREEBSD)
|
||||
#include <sys/user.h>
|
||||
#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;
|
||||
|
@ -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<size_t>(backtrace(trace, count));
|
||||
|
@ -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 <malloc/malloc.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
namespace base {
|
@ -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<pid_t>* 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<pid_t>*
|
||||
}
|
||||
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<pid_t>* tids) {
|
||||
+#if defined(OS_BSD)
|
||||
+ return false;
|
||||
+#else
|
||||
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
|
||||
char buf[25];
|
||||
base::strings::SafeSPrintf(buf, "/proc/%d/task", pid);
|
||||
@@ -154,6 +157,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
|
||||
}
|
||||
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data,
|
||||
|
@ -1,9 +1,10 @@
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.3 2017/06/26 17:16:30 robert Exp $
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.4 2019/03/24 12:24:44 robert Exp $
|
||||
|
||||
Index: base/process/process_handle_openbsd.cc
|
||||
--- base/process/process_handle_openbsd.cc.orig
|
||||
+++ base/process/process_handle_openbsd.cc
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "base/process/process_handle.h"
|
||||
#include "base/stl_util.h"
|
||||
|
||||
#include <stddef.h>
|
||||
+#include <sys/param.h>
|
||||
@ -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)
|
||||
|
32
www/chromium/patches/patch-base_process_process_metrics_cc
Normal file
32
www/chromium/patches/patch-base_process_process_metrics_cc
Normal file
@ -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<Value> SystemMetrics::ToValue() const
|
||||
std::unique_ptr<DictionaryValue> res(new DictionaryValue());
|
||||
|
||||
res->SetInteger("committed_memory", static_cast<int>(committed_memory_));
|
||||
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
|
||||
std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue();
|
||||
std::unique_ptr<DictionaryValue> 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,
|
@ -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<ProcessMetrics> 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/<pid>/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_;
|
||||
|
@ -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 <sys/sysctl.h>
|
||||
+#include <sys/vmmeter.h>
|
||||
|
||||
#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<DictionaryValue> SystemMemoryInfoKB::ToValue() const {
|
||||
+ auto res = std::make_unique<DictionaryValue>();
|
||||
+ 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<Value> SystemDiskInfo::ToValue() const {
|
||||
+ auto res = std::make_unique<DictionaryValue>();
|
||||
+
|
||||
+ // 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<double>(reads));
|
||||
+ res->SetDouble("reads_merged", static_cast<double>(reads_merged));
|
||||
+ res->SetDouble("sectors_read", static_cast<double>(sectors_read));
|
||||
+ res->SetDouble("read_time", static_cast<double>(read_time));
|
||||
+ res->SetDouble("writes", static_cast<double>(writes));
|
||||
+ res->SetDouble("writes_merged", static_cast<double>(writes_merged));
|
||||
+ res->SetDouble("sectors_written", static_cast<double>(sectors_written));
|
||||
+ res->SetDouble("write_time", static_cast<double>(write_time));
|
||||
+ res->SetDouble("io", static_cast<double>(io));
|
||||
+ res->SetDouble("io_time", static_cast<double>(io_time));
|
||||
+ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time));
|
||||
+
|
||||
+ return std::move(res);
|
||||
+}
|
||||
+
|
||||
+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const {
|
||||
+ auto res = std::make_unique<DictionaryValue>();
|
||||
+ 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
|
||||
|
@ -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 <sys/wait.h>
|
||||
+#include <signal.h>
|
||||
|
||||
#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 {}
|
||||
|
||||
|
@ -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;
|
||||
- }
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
|
||||
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
|
||||
|
@ -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"
|
||||
|
@ -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",
|
||||
]
|
||||
|
@ -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"))
|
||||
|
@ -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) {
|
||||
|
@ -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" ||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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) {
|
||||
|
@ -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",
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
@ -11,7 +11,7 @@ Index: chrome/app/chromium_strings.grd
|
||||
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
|
||||
The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
|
||||
</message>
|
||||
@@ -1042,7 +1042,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
|
||||
@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
|
||||
</message>
|
||||
|
||||
<!-- Plugin Placeholders -->
|
||||
|
@ -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.">
|
||||
</message>
|
||||
</if>
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/app/generated_resources.grd
|
||||
<message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
|
||||
Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
|
||||
</message>
|
||||
@@ -6135,7 +6135,7 @@ the Bookmarks menu.">
|
||||
@@ -6160,7 +6160,7 @@ the Bookmarks menu.">
|
||||
Google Pay
|
||||
</message>
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/app/generated_resources.grd
|
||||
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
|
||||
Use system title bar and borders
|
||||
</message>
|
||||
@@ -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
|
||||
</message>
|
||||
|
||||
|
@ -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
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
@ -11,7 +11,7 @@ Index: chrome/app/google_chrome_strings.grd
|
||||
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
|
||||
The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
|
||||
</message>
|
||||
@@ -1060,7 +1060,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
|
||||
@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
|
||||
</message>
|
||||
|
||||
<!-- Plugin Placeholders -->
|
||||
|
@ -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
|
||||
</message>
|
||||
</if>
|
||||
@ -12,7 +12,7 @@ Index: chrome/app/settings_strings.grdp
|
||||
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
|
||||
GTK+
|
||||
</message>
|
||||
@@ -567,7 +567,7 @@
|
||||
@@ -594,7 +594,7 @@
|
||||
Use Classic
|
||||
</message>
|
||||
</if>
|
||||
|
@ -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,
|
||||
|
@ -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<AfterStartupTask> queue
|
||||
@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> 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<AfterStartupTask*>(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)
|
||||
|
@ -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.
|
||||
|
@ -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<ChromeResourceDispatcherHostDelegate>
|
||||
resource_dispatcher_host_delegate_;
|
||||
|
||||
|
@ -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 @@
|
||||
<include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
|
||||
</if>
|
||||
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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<metrics::ClientInfo> 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<content::NavigationThrottle> 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<blink::mojom::ShareService>));
|
||||
@ -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<content::OverlayWindow>
|
||||
@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow>
|
||||
ChromeContentBrowserClient::CreateWindowForPictureInPicture(
|
||||
content::PictureInPictureWindowController* controller) {
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
|
||||
|
@ -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(
|
||||
|
@ -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() {
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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" ]
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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<ExternalProviderImpl>(
|
||||
service,
|
||||
@@ -787,7 +787,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
|
||||
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<ExternalProviderImpl>(
|
||||
service,
|
||||
new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
||||
|
@ -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) || \
|
||||
|
@ -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 },
|
||||
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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() {
|
||||
|
@ -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<net::MultiThreadedCertVerifier>(
|
||||
verify_proc.get()));
|
||||
}
|
||||
|
@ -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<gfx::FontRenderParams> params(
|
||||
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
|
||||
prefs->should_antialias_text = params->antialiasing;
|
||||
content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
|
||||
#endif
|
||||
|
||||
|
@ -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",
|
||||
|
@ -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_"></cr-link-row>
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
|
||||
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
|
||||
<div class="separator"></div>
|
||||
<paper-button id="useDefault" on-click="onUseDefaultTap_"
|
||||
@@ -79,7 +79,7 @@
|
||||
@@ -74,7 +74,7 @@
|
||||
</paper-button>
|
||||
</template>
|
||||
</if>
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
|
||||
<div class="settings-row continuation"
|
||||
hidden="[[!showThemesSecondary_(
|
||||
prefs.extensions.theme.id.value, useSystemTheme_)]]"
|
||||
@@ -144,7 +144,7 @@
|
||||
@@ -139,7 +139,7 @@
|
||||
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
|
||||
label="$i18n{showBookmarksBar}">
|
||||
</settings-toggle-button>
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_js,v 1.1 2018/12/04 09:55:07 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_js,v 1.2 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/resources/settings/appearance_page/appearance_page.js
|
||||
--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.js
|
||||
// NOTE: this pref only exists on Linux.
|
||||
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
|
||||
// </if>
|
||||
@@ -221,7 +221,7 @@ Polymer({
|
||||
@@ -223,7 +223,7 @@ Polymer({
|
||||
this.browserProxy_.useDefaultTheme();
|
||||
},
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.js
|
||||
/**
|
||||
* @param {boolean} useSystemTheme
|
||||
* @private
|
||||
@@ -289,10 +289,10 @@ Polymer({
|
||||
@@ -292,10 +292,10 @@ Polymer({
|
||||
}
|
||||
|
||||
let i18nId;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_signin_signin_util_cc,v 1.1 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_signin_signin_util_cc,v 1.2 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/signin/signin_util.cc
|
||||
--- chrome/browser/signin/signin_util.cc.orig
|
||||
+++ chrome/browser/signin/signin_util.cc
|
||||
@@ -40,7 +40,7 @@ namespace {
|
||||
@@ -42,7 +42,7 @@ namespace {
|
||||
|
||||
constexpr char kSignoutSettingKey[] = "signout_setting";
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.23 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.24 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/sync/chrome_sync_client.cc
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig
|
||||
+++ chrome/browser/sync/chrome_sync_client.cc
|
||||
@@ -429,7 +429,7 @@ ChromeSyncClient::CreateDataTypeControllers() {
|
||||
@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_APP_LIST)
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_cc,v 1.11 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_cc,v 1.12 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
--- chrome/browser/task_manager/sampling/task_group.cc.orig
|
||||
@ -7,35 +7,35 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
#if defined(OS_WIN)
|
||||
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
|
||||
#endif // defined(OS_WIN)
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
REFRESH_TYPE_FD_COUNT |
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
#if BUILDFLAG(ENABLE_NACL)
|
||||
@@ -112,7 +112,7 @@ TaskGroup::TaskGroup(
|
||||
#if BUILDFLAG(ENABLE_NACL)
|
||||
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
open_fd_count_(-1),
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
idle_wakeups_per_second_(-1),
|
||||
@@ -128,7 +128,7 @@ TaskGroup::TaskGroup(
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
base::Bind(&TaskGroup::OnOpenFdCountRefreshDone,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
@@ -296,7 +296,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_h,v 1.8 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_h,v 1.9 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_group.h
|
||||
--- chrome/browser/task_manager/sampling/task_group.h.orig
|
||||
@ -7,26 +7,26 @@ Index: chrome/browser/task_manager/sampling/task_group.h
|
||||
int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
int open_fd_count() const { return open_fd_count_; }
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
|
||||
@@ -121,7 +121,7 @@ class TaskGroup {
|
||||
void RefreshNaClDebugStubPort(int child_process_unique_id);
|
||||
void OnRefreshNaClDebugStubPortDone(int port);
|
||||
#endif
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
void OnOpenFdCountRefreshDone(int open_fd_count);
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
|
||||
@@ -191,7 +191,7 @@ class TaskGroup {
|
||||
#if BUILDFLAG(ENABLE_NACL)
|
||||
int nacl_debug_stub_port_;
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
// The number of file descriptors currently open by the process.
|
||||
int open_fd_count_;
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
|
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_sampler_cc,v 1.3 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_sampler_cc,v 1.4 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
|
||||
--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig
|
||||
+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
|
||||
@ -6,19 +7,19 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
|
||||
const OnCpuRefreshCallback& on_cpu_refresh,
|
||||
const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
|
||||
const OnIdleWakeupsCallback& on_idle_wakeups,
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
const OnOpenFdCountCallback& on_open_fd_count,
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
const OnProcessPriorityCallback& on_process_priority)
|
||||
@@ -52,7 +52,7 @@ TaskGroupSampler::TaskGroupSampler(
|
||||
on_cpu_refresh_callback_(on_cpu_refresh),
|
||||
on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
|
||||
on_idle_wakeups_callback_(on_idle_wakeups),
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
on_open_fd_count_callback_(on_open_fd_count),
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
on_process_priority_callback_(on_process_priority) {
|
||||
@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
|
||||
on_swapped_mem_refresh_callback_);
|
||||
@ -33,8 +34,8 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
|
||||
}
|
||||
#endif // defined(OS_MACOSX) || defined(OS_LINUX)
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
|
||||
refresh_flags)) {
|
||||
base::PostTaskAndReplyWithResult(
|
||||
@ -42,8 +43,8 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
|
||||
return process_metrics_->GetIdleWakeupsPerSecond();
|
||||
}
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
int TaskGroupSampler::RefreshOpenFdCount() {
|
||||
DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_sampler_h,v 1.2 2018/06/02 17:19:23 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_sampler_h,v 1.3 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_group_sampler.h
|
||||
--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig
|
||||
+++ chrome/browser/task_manager/sampling/task_group_sampler.h
|
||||
@ -6,35 +7,35 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.h
|
||||
using OnCpuRefreshCallback = base::Callback<void(double)>;
|
||||
using OnSwappedMemRefreshCallback = base::Callback<void(int64_t)>;
|
||||
using OnIdleWakeupsCallback = base::Callback<void(int)>;
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
using OnOpenFdCountCallback = base::Callback<void(int)>;
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
using OnProcessPriorityCallback = base::Callback<void(bool)>;
|
||||
@@ -43,7 +43,7 @@ class TaskGroupSampler : public base::RefCountedThread
|
||||
const OnCpuRefreshCallback& on_cpu_refresh,
|
||||
const OnSwappedMemRefreshCallback& on_memory_refresh,
|
||||
const OnIdleWakeupsCallback& on_idle_wakeups,
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
const OnOpenFdCountCallback& on_open_fd_count,
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
const OnProcessPriorityCallback& on_process_priority);
|
||||
@@ -60,7 +60,7 @@ class TaskGroupSampler : public base::RefCountedThread
|
||||
double RefreshCpuUsage();
|
||||
int64_t RefreshSwappedMem();
|
||||
int RefreshIdleWakeupsPerSecond();
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
int RefreshOpenFdCount();
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
bool RefreshProcessPriority();
|
||||
@@ -80,7 +80,7 @@ class TaskGroupSampler : public base::RefCountedThread
|
||||
const OnCpuRefreshCallback on_cpu_refresh_callback_;
|
||||
const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
|
||||
const OnIdleWakeupsCallback on_idle_wakeups_callback_;
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
const OnOpenFdCountCallback on_open_fd_count_callback_;
|
||||
#endif // defined(OS_LINUX)
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
const OnProcessPriorityCallback on_process_priority_callback_;
|
||||
|
@ -1,13 +1,14 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_manager_impl_cc,v 1.11 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_manager_impl_cc,v 1.12 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_manager_impl.cc
|
||||
--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig
|
||||
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
|
||||
@@ -206,7 +206,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
|
||||
@@ -207,7 +207,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
|
||||
}
|
||||
|
||||
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
return GetTaskGroupByTaskId(task_id)->open_fd_count();
|
||||
#else
|
||||
return -1;
|
||||
|
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_task_manager_observer_h,v 1.4 2018/06/02 17:19:23 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_task_manager_observer_h,v 1.5 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/task_manager_observer.h
|
||||
--- chrome/browser/task_manager/task_manager_observer.h.orig
|
||||
+++ chrome/browser/task_manager/task_manager_observer.h
|
||||
@ -6,8 +7,8 @@ Index: chrome/browser/task_manager/task_manager_observer.h
|
||||
// or backgrounded.
|
||||
REFRESH_TYPE_PRIORITY = 1 << 13,
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
// For observers interested in getting the number of open file descriptors of
|
||||
// processes.
|
||||
REFRESH_TYPE_FD_COUNT = 1 << 14,
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.36 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.37 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/browser_command_controller.cc
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
|
||||
case IDC_MINIMIZE_WINDOW:
|
||||
browser_->window()->Minimize();
|
||||
break;
|
||||
@@ -857,7 +857,7 @@ void BrowserCommandController::InitCommandState() {
|
||||
@@ -860,7 +860,7 @@ void BrowserCommandController::InitCommandState() {
|
||||
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
|
||||
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
|
||||
#endif
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.16 2018/07/30 15:28:28 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.17 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig
|
||||
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -82,7 +82,7 @@ static const char* kBadFlags[] = {
|
||||
@@ -84,7 +84,7 @@ static const char* kBadFlags[] = {
|
||||
extensions::switches::kExtensionsOnChromeURLs,
|
||||
#endif
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.30 2018/09/12 17:08:22 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.31 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
@@ -80,7 +80,7 @@
|
||||
@@ -79,7 +79,7 @@
|
||||
#include "chrome/browser/ui/user_manager.h"
|
||||
#endif
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.19 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.20 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/tab_helpers.cc
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig
|
||||
+++ chrome/browser/ui/tab_helpers.cc
|
||||
@@ -117,7 +117,7 @@
|
||||
@@ -116,7 +116,7 @@
|
||||
#include "components/zoom/zoom_controller.h"
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
@ -11,7 +11,7 @@ Index: chrome/browser/ui/tab_helpers.cc
|
||||
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
|
||||
#include "chrome/browser/ui/hats/hats_helper.h"
|
||||
#endif
|
||||
@@ -311,11 +311,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
@@ -309,11 +309,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
||||
|
@ -1,13 +1,14 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_task_manager_task_manager_columns_cc,v 1.8 2018/06/02 17:19:23 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_task_manager_task_manager_columns_cc,v 1.9 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/task_manager/task_manager_columns.cc
|
||||
--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig
|
||||
+++ chrome/browser/ui/task_manager/task_manager_columns.cc
|
||||
@@ -93,7 +93,7 @@ const TableColumnData kColumns[] = {
|
||||
arraysize("100000") * kCharWidth, -1, true, false, false},
|
||||
base::size("100000") * kCharWidth, -1, true, false, false},
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
{IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
|
||||
arraysize("999") * kCharWidth, -1, true, false, false},
|
||||
#endif // defined(OS_LINUX)
|
||||
base::size("999") * kCharWidth, -1, true, false, false},
|
||||
#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
|
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_task_manager_task_manager_table_model_cc,v 1.8 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_task_manager_task_manager_table_model_cc,v 1.9 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/task_manager/task_manager_table_model.cc
|
||||
--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig
|
||||
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
|
||||
@ -6,8 +7,8 @@ Index: chrome/browser/ui/task_manager/task_manager_table_model.cc
|
||||
? stringifier_->backgrounded_string()
|
||||
: stringifier_->foregrounded_string();
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
|
||||
const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
|
||||
return fd_count >= 0 ? base::FormatNumber(fd_count)
|
||||
@ -15,8 +16,8 @@ Index: chrome/browser/ui/task_manager/task_manager_table_model.cc
|
||||
return BooleanCompare(is_proc1_bg, is_proc2_bg);
|
||||
}
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
|
||||
const int proc1_fd_count =
|
||||
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
|
||||
@ -24,8 +25,8 @@ Index: chrome/browser/ui/task_manager/task_manager_table_model.cc
|
||||
type = REFRESH_TYPE_KEEPALIVE_COUNT;
|
||||
break;
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
|
||||
type = REFRESH_TYPE_FD_COUNT;
|
||||
break;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.18 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.19 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
--- chrome/browser/ui/toolbar/app_menu_model.cc.orig
|
||||
+++ chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -664,7 +664,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
|
||||
@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
|
||||
return app_menu_icon_controller_->GetTypeAndSeverity().type ==
|
||||
AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc,v 1.16 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc,v 1.17 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
||||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig
|
||||
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
||||
@@ -39,7 +39,7 @@
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "ui/wm/core/wm_state.h"
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
@@ -123,7 +123,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.17 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.18 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
--- chrome/browser/ui/views/frame/browser_frame.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.cc
|
||||
@@ -38,7 +38,7 @@
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -93,7 +93,7 @@ void BrowserFrame::InitBrowserFrame() {
|
||||
@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
|
||||
non_client_view()->set_context_menu_controller(this);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc,v 1.2 2018/09/12 17:08:22 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc,v 1.3 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
|
||||
--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig
|
||||
@ -12,8 +12,8 @@ Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -34,7 +34,7 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrame
|
||||
#endif
|
||||
@@ -32,7 +32,7 @@ OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView(
|
||||
BrowserView* browser_view) {
|
||||
#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS)
|
||||
std::unique_ptr<views::NavButtonProvider> nav_button_provider;
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.16 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.17 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_view.cc
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -1255,7 +1255,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
|
||||
@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
|
||||
}
|
||||
|
||||
void BrowserView::DestroyBrowser() {
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/frame/browser_view.cc
|
||||
if (quit_instruction_bubble_controller_) {
|
||||
GetWidget()->GetNativeView()->RemovePreTargetHandler(
|
||||
quit_instruction_bubble_controller_.get());
|
||||
@@ -2089,7 +2089,7 @@ views::View* BrowserView::CreateOverlayView() {
|
||||
@@ -2130,7 +2130,7 @@ views::View* BrowserView::CreateOverlayView() {
|
||||
}
|
||||
|
||||
void BrowserView::OnWidgetDestroying(views::Widget* widget) {
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/frame/browser_view.cc
|
||||
if (quit_instruction_bubble_controller_) {
|
||||
GetWidget()->GetNativeView()->RemovePreTargetHandler(
|
||||
quit_instruction_bubble_controller_.get());
|
||||
@@ -2435,7 +2435,7 @@ void BrowserView::InitViews() {
|
||||
@@ -2474,7 +2474,7 @@ void BrowserView::InitViews() {
|
||||
GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
|
||||
browser_->profile());
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_h,v 1.1 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_h,v 1.2 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_view.h
|
||||
--- chrome/browser/ui/views/frame/browser_view.h.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_view.h
|
||||
@@ -49,7 +49,7 @@
|
||||
@@ -50,7 +50,7 @@
|
||||
#include "chrome/browser/ui/views/intent_picker_bubble_view.h"
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/frame/browser_view.h
|
||||
#include "chrome/browser/ui/views/quit_instruction_bubble_controller.h"
|
||||
#endif
|
||||
|
||||
@@ -833,7 +833,7 @@ class BrowserView : public BrowserWindow,
|
||||
@@ -850,7 +850,7 @@ class BrowserView : public BrowserWindow,
|
||||
};
|
||||
base::Optional<ResizeSession> interactive_resize_;
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.34 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.35 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "ui/views/window/frame_background.h"
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "ui/views/window/vector_icons/vector_icons.h"
|
||||
#include "ui/views/window/window_shape.h"
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
@ -11,7 +11,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
#include "ui/views/controls/menu/menu_runner.h"
|
||||
#endif
|
||||
|
||||
@@ -350,7 +350,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
|
||||
@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
|
||||
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
|
||||
const gfx::Point& point,
|
||||
const ui::Event* event) {
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.14 2019/02/06 16:41:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
||||
@@ -22,7 +22,7 @@ namespace {
|
||||
|
||||
constexpr int kCaptionButtonHeight = 18;
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
||||
// Default spacing around window caption buttons.
|
||||
constexpr int kCaptionButtonSpacing = 2;
|
||||
#else
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.8 2018/01/30 07:57:25 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.9 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
|
||||
@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
|
||||
|
||||
void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
|
||||
ui::SimpleMenuModel* model) {
|
||||
@ -11,7 +11,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
|
||||
model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
|
||||
model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
|
||||
@@ -89,7 +89,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
|
||||
}
|
||||
@ -20,7 +20,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
|
||||
IDS_SHOW_WINDOW_DECORATIONS_MENU);
|
||||
@@ -125,7 +125,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.29 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.30 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig
|
||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
@@ -387,7 +387,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
|
||||
@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
|
||||
// synchronous on desktop Linux, so use that.
|
||||
// - Chrome OS
|
||||
// Releasing capture on Ash cancels gestures so avoid it.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
can_release_capture_ = false;
|
||||
#endif
|
||||
start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
|
||||
@@ -798,7 +798,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
|
||||
@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
|
||||
else
|
||||
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
// EndMoveLoop is going to snap the window back to its original location.
|
||||
// Hide it so users don't see this. Hiding a window in Linux aura causes
|
||||
// it to lose capture so skip it.
|
||||
@@ -1940,7 +1940,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
if (dragged_window)
|
||||
exclude.insert(dragged_window);
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.50 2018/12/07 11:07:35 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.51 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/about_ui.cc
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig
|
||||
+++ chrome/browser/ui/webui/about_ui.cc
|
||||
@@ -551,7 +551,7 @@ std::string ChromeURLs() {
|
||||
@@ -552,7 +552,7 @@ std::string ChromeURLs() {
|
||||
return html;
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/webui/about_ui.cc
|
||||
std::string AboutLinuxProxyConfig() {
|
||||
std::string data;
|
||||
AppendHeader(&data, 0,
|
||||
@@ -606,7 +606,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
.GetRawDataResource(idr)
|
||||
.as_string();
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.31 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.32 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig
|
||||
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -188,11 +188,11 @@
|
||||
@@ -192,11 +192,11 @@
|
||||
#include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
|
||||
#endif
|
||||
|
||||
@ -17,7 +17,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
#include "chrome/browser/ui/webui/sandbox_internals_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -309,7 +309,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
@@ -314,7 +314,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
#if !defined(OS_ANDROID)
|
||||
|| url.host_piece() == chrome::kChromeUITermsHost
|
||||
#endif
|
||||
@ -26,7 +26,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
|
||||
#endif
|
||||
#if defined(OS_CHROMEOS)
|
||||
@@ -569,7 +569,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
if (url.host_piece() == chrome::kChromeUINaClHost)
|
||||
return &NewWebUI<NaClUI>;
|
||||
#endif
|
||||
@ -35,7 +35,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
|
||||
return &NewWebUI<ConstrainedWebDialogUI>;
|
||||
#endif
|
||||
@@ -630,12 +630,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
return &NewWebUI<CastUI>;
|
||||
}
|
||||
#endif
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc,v 1.21 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc,v 1.22 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
||||
--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig
|
||||
+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
||||
@@ -498,7 +498,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
|
||||
@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
|
||||
{"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
|
||||
{"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
|
||||
{"themes", IDS_SETTINGS_THEMES},
|
||||
@ -11,7 +11,7 @@ Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.c
|
||||
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
|
||||
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
|
||||
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
|
||||
@@ -516,7 +516,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
|
||||
@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
|
||||
{"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
|
||||
{"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
|
||||
#endif
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_common_BUILD_gn,v 1.19 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_BUILD_gn,v 1.20 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/common/BUILD.gn
|
||||
--- chrome/common/BUILD.gn.orig
|
||||
+++ chrome/common/BUILD.gn
|
||||
@@ -301,6 +301,10 @@ static_library("common") {
|
||||
@@ -300,6 +300,10 @@ static_library("common") {
|
||||
public_deps += [ "//ppapi/shared_impl" ]
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_features_cc,v 1.13 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_features_cc,v 1.14 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/chrome_features.cc
|
||||
--- chrome/common/chrome_features.cc.orig
|
||||
+++ chrome/common/chrome_features.cc
|
||||
@@ -95,7 +95,7 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
|
||||
@@ -82,7 +82,7 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
#endif // defined(OS_WIN) || defined(OS_MACOSX)
|
||||
|
||||
@ -12,21 +12,21 @@ Index: chrome/common/chrome_features.cc
|
||||
// Enables the Restart background mode optimization. When all Chrome UI is
|
||||
// closed and it goes in the background, allows to restart the browser to
|
||||
// discard memory.
|
||||
@@ -150,7 +150,7 @@ const base::Feature kThirdPartyModulesBlocking{
|
||||
@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{
|
||||
"ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
#endif
|
||||
|
||||
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
|
||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
|
||||
// Enables the dual certificate verification trial feature.
|
||||
// https://crbug.com/649026
|
||||
const base::Feature kCertDualVerificationTrialFeature{
|
||||
@@ -192,7 +192,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
|
||||
// Enables or disables windowing related features for desktop PWAs.
|
||||
@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
|
||||
const base::Feature kDesktopPWAWindowing {
|
||||
"DesktopPWAWindowing",
|
||||
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
|
||||
+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
- defined(OS_MACOSX)
|
||||
+ defined(OS_MACOSX) || defined(OS_BSD)
|
||||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_features_h,v 1.13 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_features_h,v 1.14 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/chrome_features.h
|
||||
--- chrome/common/chrome_features.h.orig
|
||||
+++ chrome/common/chrome_features.h
|
||||
@@ -68,7 +68,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
|
||||
@@ -61,7 +61,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
|
||||
extern const base::Feature kAutomaticTabDiscarding;
|
||||
#endif // defined(OS_WIN) || defined(OS_MACOSX)
|
||||
|
||||
@ -12,9 +12,9 @@ Index: chrome/common/chrome_features.h
|
||||
COMPONENT_EXPORT(CHROME_FEATURES)
|
||||
extern const base::Feature kBackgroundModeAllowRestart;
|
||||
#endif // defined(OS_WIN) || defined(OS_LINUX)
|
||||
@@ -93,7 +93,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
|
||||
extern const base::Feature kTabStripKeyboardFocus;
|
||||
#endif // defined(OS_MACOSX)
|
||||
@@ -81,7 +81,7 @@ extern const base::Feature kBrowserHangFixesExperiment
|
||||
COMPONENT_EXPORT(CHROME_FEATURES)
|
||||
extern const base::Feature kBundledConnectionHelpFeature;
|
||||
|
||||
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
|
||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
|
@ -1,8 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.46 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.47 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/chrome_paths.cc
|
||||
--- chrome/common/chrome_paths.cc.orig
|
||||
+++ chrome/common/chrome_paths.cc
|
||||
@@ -52,20 +52,22 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
|
||||
@@ -52,14 +52,14 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
|
||||
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
|
||||
#endif
|
||||
|
||||
@ -12,22 +13,15 @@ Index: chrome/common/chrome_paths.cc
|
||||
// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
|
||||
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
|
||||
- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
|
||||
+ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions");
|
||||
#else
|
||||
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
|
||||
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
|
||||
#endif // defined(GOOGLE_CHROME_BUILD)
|
||||
|
||||
+#if !defined(OS_BSD)
|
||||
// The path to the hint file that tells the pepper plugin loader
|
||||
// where it can find the latest component updated flash.
|
||||
const base::FilePath::CharType kComponentUpdatedFlashHint[] =
|
||||
FILE_PATH_LITERAL("latest-component-updated-flash");
|
||||
+#endif
|
||||
#endif // defined(OS_LINUX)
|
||||
|
||||
#if defined(OS_CHROMEOS)
|
||||
@@ -197,7 +199,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
return false;
|
||||
break;
|
||||
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
|
||||
@ -36,25 +30,7 @@ Index: chrome/common/chrome_paths.cc
|
||||
if (!GetUserDownloadsDirectorySafe(&cur))
|
||||
return false;
|
||||
break;
|
||||
@@ -418,7 +420,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
break;
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
|
||||
if (!base::PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
|
||||
&cur)) {
|
||||
@@ -468,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
if (!base::PathExists(cur)) // We don't want to create this
|
||||
return false;
|
||||
break;
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
case chrome::DIR_POLICY_FILES: {
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
|
||||
@@ -479,7 +481,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
}
|
||||
#endif
|
||||
#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
|
||||
@ -63,7 +39,7 @@ Index: chrome/common/chrome_paths.cc
|
||||
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
||||
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
||||
return false;
|
||||
@@ -487,7 +489,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@ -72,7 +48,7 @@ Index: chrome/common/chrome_paths.cc
|
||||
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
|
||||
cur = base::FilePath(kFilepathSinglePrefExtensions);
|
||||
break;
|
||||
@@ -522,7 +524,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
#endif
|
||||
break;
|
||||
|
||||
@ -81,3 +57,21 @@ Index: chrome/common/chrome_paths.cc
|
||||
case chrome::DIR_NATIVE_MESSAGING:
|
||||
#if defined(OS_MACOSX)
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
@@ -539,7 +539,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
return false;
|
||||
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
|
||||
break;
|
||||
-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#endif // defined(OS_LINUX) || defined(OS_MACOSX
|
||||
#if !defined(OS_ANDROID)
|
||||
case chrome::DIR_GLOBAL_GCM_STORE:
|
||||
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
||||
@@ -547,7 +547,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
cur = cur.Append(kGCMStoreDirname);
|
||||
break;
|
||||
#endif // !defined(OS_ANDROID)
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
case chrome::FILE_COMPONENT_FLASH_HINT:
|
||||
if (!base::PathService::Get(
|
||||
chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.20 2018/11/04 12:33:24 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.21 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/common/chrome_paths.h
|
||||
--- chrome/common/chrome_paths.h.orig
|
||||
+++ chrome/common/chrome_paths.h
|
||||
@ -20,7 +20,7 @@ Index: chrome/common/chrome_paths.h
|
||||
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
|
||||
// definition manifest files that
|
||||
// describe extensions which are to be
|
||||
@@ -110,7 +110,7 @@ enum {
|
||||
@@ -107,7 +107,7 @@ enum {
|
||||
DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
|
||||
// supervised user whitelists are
|
||||
// installed.
|
||||
@ -29,3 +29,12 @@ Index: chrome/common/chrome_paths.h
|
||||
DIR_NATIVE_MESSAGING, // System directory where native messaging host
|
||||
// manifest files are stored.
|
||||
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
|
||||
@@ -122,7 +122,7 @@ enum {
|
||||
DIR_GEN_TEST_DATA, // Directory where generated test data resides.
|
||||
DIR_TEST_DATA, // Directory where unit test data resides.
|
||||
DIR_TEST_TOOLS, // Directory where unit test tools reside.
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
|
||||
// the component updated flash plugin.
|
||||
#endif // defined(OS_LINUX)
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.43 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.44 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/chrome_switches.cc
|
||||
--- chrome/common/chrome_switches.cc.orig
|
||||
+++ chrome/common/chrome_switches.cc
|
||||
@@ -940,12 +940,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
|
||||
@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
|
||||
const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
|
||||
#endif
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.48 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.49 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/chrome_switches.h
|
||||
--- chrome/common/chrome_switches.h.orig
|
||||
+++ chrome/common/chrome_switches.h
|
||||
@@ -291,12 +291,12 @@ extern const char kAllowNaClFileHandleAPI[];
|
||||
@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[];
|
||||
extern const char kAllowNaClSocketAPI[];
|
||||
#endif
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_common_extensions_command_cc,v 1.8 2018/04/23 15:00:16 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_extensions_command_cc,v 1.9 2019/03/24 12:24:45 robert Exp $
|
||||
Index: chrome/common/extensions/command.cc
|
||||
--- chrome/common/extensions/command.cc.orig
|
||||
+++ chrome/common/extensions/command.cc
|
||||
@@ -311,7 +311,7 @@ std::string Command::CommandPlatform() {
|
||||
@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() {
|
||||
return values::kKeybindingPlatformMac;
|
||||
#elif defined(OS_CHROMEOS)
|
||||
return values::kKeybindingPlatformChromeOs;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_common_pref_names_cc,v 1.49 2019/02/06 16:41:55 robert Exp $
|
||||
$OpenBSD: patch-chrome_common_pref_names_cc,v 1.50 2019/03/24 12:24:45 robert Exp $
|
||||
|
||||
Index: chrome/common/pref_names.cc
|
||||
--- chrome/common/pref_names.cc.orig
|
||||
+++ chrome/common/pref_names.cc
|
||||
@@ -933,7 +933,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
|
||||
@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
|
||||
// only using an account that belongs to one of the domains from this pref.
|
||||
const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/common/pref_names.cc
|
||||
// Linux specific preference on whether we should match the system theme.
|
||||
const char kUsesSystemTheme[] = "extensions.theme.use_system";
|
||||
#endif
|
||||
@@ -1021,7 +1021,7 @@ const char kShowUpdatePromotionInfoBar[] =
|
||||
@@ -1038,7 +1038,7 @@ const char kShowUpdatePromotionInfoBar[] =
|
||||
"browser.show_update_promotion_info_bar";
|
||||
#endif
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/common/pref_names.cc
|
||||
// Boolean that is false if we should show window manager decorations. If
|
||||
// true, we draw a custom chrome frame (thicker title bar and blue border).
|
||||
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
|
||||
@@ -1393,7 +1393,7 @@ const char kDownloadDefaultDirectory[] = "download.def
|
||||
@@ -1419,7 +1419,7 @@ const char kDownloadDefaultDirectory[] = "download.def
|
||||
// upgrade a unsafe location to a safe location.
|
||||
const char kDownloadDirUpgraded[] = "download.directory_upgrade";
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user