MFH: r497949
www/chromium: Update to 73.0.3683.86 - Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf Approved by: ports-secteam (joneum)
This commit is contained in:
parent
cb986c29b3
commit
761d64be82
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/branches/2019Q2/; revision=497959
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= chromium
|
||||
PORTVERSION= 72.0.3626.121
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 73.0.3683.86
|
||||
CATEGORIES?= www
|
||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
||||
LOCAL/cpm/chromium/:fonts
|
||||
@ -283,7 +282,6 @@ do-configure:
|
||||
.endif
|
||||
|
||||
do-test-TEST-on:
|
||||
cd ${WRKSRC}/out/${BUILDTYPE}/gn_build && ./gn_unittests
|
||||
.for t in ${TEST_TARGETS}
|
||||
cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
|
||||
./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
|
||||
|
@ -1,7 +1,7 @@
|
||||
TIMESTAMP = 1551526903
|
||||
SHA256 (chromium-72.0.3626.121.tar.xz) = 4c1e554ab606eab328e77f5a92d8244b26a10ffd15d7986d30eab95f37adbc1f
|
||||
SIZE (chromium-72.0.3626.121.tar.xz) = 686420260
|
||||
SHA256 (chromium-72.0.3626.121-testdata.tar.xz) = 73a1f09a6467f712487c7c7291f2e61050e5f962b85fa3b6e736f13d50067b19
|
||||
SIZE (chromium-72.0.3626.121-testdata.tar.xz) = 351922596
|
||||
TIMESTAMP = 1553157900
|
||||
SHA256 (chromium-73.0.3683.86.tar.xz) = 9ebb731576d25901cee5505f3458cf7780b0a39243743d7779f66514716bbfa3
|
||||
SIZE (chromium-73.0.3683.86.tar.xz) = 710449412
|
||||
SHA256 (chromium-73.0.3683.86-testdata.tar.xz) = 06e947bfa2de5af00340dcd68341d67794565874a3aa7514799e4af1ba4862d5
|
||||
SIZE (chromium-73.0.3683.86-testdata.tar.xz) = 352701364
|
||||
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
|
||||
SIZE (test_fonts.tar.xz) = 200040
|
||||
|
@ -1,14 +1,14 @@
|
||||
--- base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300
|
||||
+++ base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300
|
||||
@@ -728,6 +728,7 @@
|
||||
--- base/strings/safe_sprintf_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/strings/safe_sprintf_unittest.cc
|
||||
@@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
|
||||
}
|
||||
|
||||
|
||||
TEST(SafeSPrintfTest, EmitNULL) {
|
||||
+/* Avoid compiler error: http://pastebin.com/1edWUE84
|
||||
char buf[40];
|
||||
#if defined(__GNUC__)
|
||||
#pragma GCC diagnostic push
|
||||
@@ -739,6 +740,7 @@
|
||||
@@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
|
||||
EXPECT_EQ("0x0", std::string(buf));
|
||||
EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
|
||||
EXPECT_EQ("<NULL>", std::string(buf));
|
||||
@ -16,9 +16,9 @@
|
||||
#if defined(__GCC__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
--- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200
|
||||
+++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200
|
||||
@@ -60,7 +60,7 @@
|
||||
--- base/threading/thread_local_storage_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/threading/thread_local_storage_unittest.cc
|
||||
@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple
|
||||
void ThreadLocalStorageCleanup(void *value) {
|
||||
int *ptr = reinterpret_cast<int*>(value);
|
||||
// Destructors should never be called with a NULL.
|
||||
@ -27,20 +27,20 @@
|
||||
if (*ptr == kFinalTlsValue)
|
||||
return; // We've been called enough times.
|
||||
ASSERT_LT(kFinalTlsValue, *ptr);
|
||||
--- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200
|
||||
+++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200
|
||||
@@ -387,7 +387,7 @@
|
||||
--- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC
|
||||
+++ media/audio/audio_output_proxy_unittest.cc
|
||||
@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test {
|
||||
// |stream| is closed at this point. Start() should reopen it again.
|
||||
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
|
||||
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _))
|
||||
.Times(2)
|
||||
- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
|
||||
+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
|
||||
|
||||
EXPECT_CALL(callback_, OnError(_))
|
||||
.Times(2);
|
||||
--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC
|
||||
|
||||
EXPECT_CALL(callback_, OnError()).Times(2);
|
||||
|
||||
--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC
|
||||
+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
|
||||
@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i
|
||||
@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor)
|
||||
std::vector<Task *>::iterator it;
|
||||
it = std::remove(tasks_.begin(),
|
||||
tasks_.end(),
|
||||
@ -48,19 +48,19 @@
|
||||
+ static_cast<Task *>(NULL));
|
||||
|
||||
tasks_.erase(it, tasks_.end());
|
||||
|
||||
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
|
||||
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
|
||||
@@ -439,7 +439,7 @@
|
||||
tasks_running_ = false;
|
||||
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC
|
||||
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
|
||||
@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
|
||||
}
|
||||
|
||||
|
||||
CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
|
||||
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
||||
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
||||
CMapFormat::kFormat0,
|
||||
cmap_id) {
|
||||
}
|
||||
@@ -563,7 +563,7 @@
|
||||
@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD
|
||||
: CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
|
||||
data->Slice(offset, data->ReadUShort(
|
||||
offset + Offset::kFormat0Length)))
|
||||
@ -69,7 +69,7 @@
|
||||
CMapFormat::kFormat2, cmap_id) {
|
||||
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
||||
}
|
||||
@@ -574,7 +574,7 @@
|
||||
@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD
|
||||
: CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
|
||||
data->Slice(offset, data->ReadUShort(
|
||||
offset + Offset::kFormat0Length)))
|
||||
@ -78,21 +78,21 @@
|
||||
CMapFormat::kFormat2, cmap_id) {
|
||||
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
||||
}
|
||||
@@ -958,7 +958,7 @@
|
||||
@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD
|
||||
CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
|
||||
IntegerList* glyph_id_array,
|
||||
std::vector<int32_t>* glyph_id_array,
|
||||
const CMapId& cmap_id)
|
||||
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
||||
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
||||
CMapFormat::kFormat4, cmap_id),
|
||||
segments_(segments->begin(), segments->end()),
|
||||
glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
|
||||
@@ -966,7 +966,7 @@
|
||||
@@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList*
|
||||
}
|
||||
|
||||
|
||||
CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
|
||||
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
||||
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
||||
CMapFormat::kFormat4, cmap_id) {
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200
|
||||
+++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200
|
||||
@@ -359,7 +359,7 @@
|
||||
}
|
||||
--- BUILD.gn.orig 2019-03-11 22:00:51 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -381,7 +381,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
- if (is_linux || is_android) {
|
||||
@ -9,7 +9,7 @@
|
||||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -401,8 +401,6 @@
|
||||
@@ -422,8 +422,6 @@ group("gn_all") {
|
||||
"//net:disk_cache_memory_test",
|
||||
"//net:quic_client",
|
||||
"//net:quic_server",
|
||||
@ -18,7 +18,7 @@
|
||||
"//testing:empty_main",
|
||||
]
|
||||
|
||||
@@ -460,10 +458,6 @@
|
||||
@@ -480,10 +478,6 @@ group("gn_all") {
|
||||
"//chrome/test/chromedriver:chromedriver",
|
||||
"//chrome/test/chromedriver:chromedriver_tests",
|
||||
"//components/sync:run_sync_testserver",
|
||||
@ -29,7 +29,7 @@
|
||||
"//media/cast:generate_barcode_video",
|
||||
"//media/cast:generate_timecode_audio",
|
||||
"//net:crash_cache",
|
||||
@@ -519,10 +513,6 @@
|
||||
@@ -538,10 +532,6 @@ group("gn_all") {
|
||||
"//mojo:mojo_perftests",
|
||||
"//services/service_manager/public/cpp",
|
||||
"//testing/gmock:gmock_main",
|
||||
@ -40,7 +40,7 @@
|
||||
]
|
||||
|
||||
if (!is_android) {
|
||||
@@ -598,7 +588,7 @@
|
||||
@@ -615,7 +605,7 @@ group("gn_all") {
|
||||
host_os == "win") {
|
||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
|
||||
}
|
||||
@ -49,7 +49,7 @@
|
||||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -818,7 +808,6 @@
|
||||
@@ -873,7 +863,6 @@ if (is_chromeos) {
|
||||
"//ppapi/examples/video_decode",
|
||||
"//sandbox/linux:chrome_sandbox",
|
||||
"//sandbox/linux:sandbox_linux_unittests",
|
||||
@ -57,7 +57,7 @@
|
||||
|
||||
# Blocked on https://github.com/catapult-project/catapult/issues/2297
|
||||
#"//third_party/catapult/telemetry:bitmaptools",
|
||||
@@ -921,7 +910,7 @@
|
||||
@@ -1001,7 +990,7 @@ if (!is_ios) {
|
||||
]
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -930,7 +919,7 @@
|
||||
@@ -1010,7 +999,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1055,9 +1044,6 @@
|
||||
@@ -1150,9 +1139,6 @@ group("chromium_builder_perf") {
|
||||
|
||||
if (is_win) {
|
||||
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- apps/ui/views/app_window_frame_view.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ apps/ui/views/app_window_frame_view.cc
|
||||
@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
|
||||
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- ash/display/mirror_window_controller.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/BUILD.gn.orig 2019-02-06 23:06:36.000000000 +0100
|
||||
+++ base/BUILD.gn 2019-02-08 20:14:26.420625000 +0100
|
||||
@@ -1176,7 +1176,7 @@
|
||||
--- base/BUILD.gn.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -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.
|
||||
@ -9,7 +9,7 @@
|
||||
host_toolchain != "//build/toolchain/cros:host") {
|
||||
libs += [ "atomic" ]
|
||||
}
|
||||
@@ -1202,7 +1202,7 @@
|
||||
@@ -1211,7 +1211,7 @@ jumbo_component("base") {
|
||||
"allocator/allocator_shim_override_glibc_weak_symbols.h",
|
||||
]
|
||||
deps += [ "//base/allocator:tcmalloc" ]
|
||||
@ -18,7 +18,7 @@
|
||||
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
} else if (is_android && use_allocator == "none") {
|
||||
sources += [
|
||||
@@ -1739,6 +1739,33 @@
|
||||
@@ -1751,6 +1751,33 @@ jumbo_component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
# iOS
|
||||
if (is_ios) {
|
||||
set_sources_assignment_filter([])
|
||||
@@ -2761,6 +2788,12 @@
|
||||
@@ -2808,6 +2835,12 @@ test("base_unittests") {
|
||||
]
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/allocator_shim.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/allocator/allocator_shim.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/allocator_shim.cc
|
||||
@@ -83,7 +83,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,4 +1,4 @@
|
||||
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
|
||||
@@ -3,19 +3,28 @@
|
||||
// found in the LICENSE file.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/allocator_shim_override_libc_symbols.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/allocator_shim_unittest.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/allocator/allocator_shim_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/allocator_shim_unittest.cc
|
||||
@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
@@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
|
||||
#endif // !OS_WIN
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
void* memalign_ptr = memalign(128, 53);
|
||||
ASSERT_NE(nullptr, memalign_ptr);
|
||||
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
|
||||
@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
@@ -361,7 +361,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
|
||||
// pvalloc rounds the size up to the next page.
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
char* realloc_ptr = static_cast<char*>(malloc(10));
|
||||
strcpy(realloc_ptr, "foobar");
|
||||
@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
@@ -377,13 +377,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
free(zero_alloc_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/partition_allocator/page_allocator.cc.orig 2019-02-06 21:56:56.953755000 +0100
|
||||
+++ base/allocator/partition_allocator/page_allocator.cc 2019-02-06 21:57:23.721544000 +0100
|
||||
@@ -114,7 +114,7 @@
|
||||
--- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator.cc
|
||||
@@ -115,7 +115,7 @@ void* AllocPages(void* address,
|
||||
uintptr_t align_base_mask = ~align_offset_mask;
|
||||
DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-02-06 21:59:00.906521000 +0100
|
||||
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h 2019-02-06 22:00:07.553831000 +0100
|
||||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
|
||||
@@ -14,7 +14,7 @@
|
||||
#if defined(OS_MACOSX)
|
||||
#include <mach/mach.h>
|
||||
@ -9,7 +9,7 @@
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <algorithm>
|
||||
@@ -48,7 +48,7 @@
|
||||
@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
// Multiple guarded memory regions may exceed the process address space limit.
|
||||
// This function will raise or lower the limit by |amount|.
|
||||
@@ -68,7 +68,7 @@
|
||||
@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
|
||||
// schemes that reduce that to 4 GiB.
|
||||
constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
void* SystemAllocPagesInternal(void* hint,
|
||||
size_t length,
|
||||
@@ -134,7 +134,7 @@
|
||||
@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
|
||||
void FreePagesInternal(void* address, size_t length) {
|
||||
CHECK(!munmap(address, length));
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2018-12-04 10:27:52.648233000 +0100
|
||||
+++ base/allocator/partition_allocator/partition_alloc_unittest.cc 2018-12-04 10:31:38.008927000 +0100
|
||||
@@ -1324,7 +1324,7 @@
|
||||
#if !defined(OS_WIN) && \
|
||||
(!defined(ARCH_CPU_64_BITS) || \
|
||||
(defined(OS_POSIX) && \
|
||||
- !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID))))
|
||||
+ !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD))))
|
||||
|
||||
// The following four tests wrap a called function in an expect death statement
|
||||
// to perform their test, because they are non-hermetic. Specifically they are
|
@ -1,6 +1,6 @@
|
||||
--- base/debug/debugger_posix.cc.orig 2017-06-18 01:23:49.065175000 +0200
|
||||
+++ base/debug/debugger_posix.cc 2017-06-18 01:58:29.603481000 +0200
|
||||
@@ -84,7 +84,7 @@
|
||||
--- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/debug/debugger_posix.cc
|
||||
@@ -86,7 +86,7 @@ bool BeingDebugged() {
|
||||
KERN_PROC,
|
||||
KERN_PROC_PID,
|
||||
getpid()
|
||||
@ -9,7 +9,7 @@
|
||||
, sizeof(struct kinfo_proc),
|
||||
0
|
||||
#endif
|
||||
@@ -92,33 +92,36 @@
|
||||
@@ -94,33 +94,35 @@ bool BeingDebugged() {
|
||||
|
||||
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
||||
// binary interfaces may change.
|
||||
@ -19,16 +19,15 @@
|
||||
+ 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);
|
||||
+
|
||||
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,6 +1,6 @@
|
||||
--- base/debug/elf_reader_linux.cc.orig 2018-08-04 13:15:46.374048000 +0200
|
||||
+++ base/debug/elf_reader_linux.cc 2018-08-04 13:16:14.292901000 +0200
|
||||
@@ -41,8 +41,10 @@
|
||||
--- base/debug/elf_reader_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/debug/elf_reader_linux.cc
|
||||
@@ -41,8 +41,10 @@ Optional<std::string> ElfSegmentBuildIDNoteAsString(co
|
||||
const void* section_end = segment.data() + segment.size_bytes();
|
||||
const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
|
||||
while (note_header < section_end) {
|
@ -1,4 +1,4 @@
|
||||
--- base/debug/proc_maps_linux.cc.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/debug/proc_maps_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/debug/proc_maps_linux.cc
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "base/strings/string_split.h"
|
||||
|
11
www/chromium/files/patch-base_debug_stack__trace.cc
Normal file
11
www/chromium/files/patch-base_debug_stack__trace.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/debug/stack_trace.cc.orig 2019-03-17 21:37:51 UTC
|
||||
+++ base/debug/stack_trace.cc
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
|
||||
#include <pthread.h>
|
||||
#include "base/process/process_handle.h"
|
||||
#include "base/threading/platform_thread.h"
|
@ -1,5 +1,5 @@
|
||||
--- base/debug/stack_trace.h.orig 2017-08-02 19:09:58.400190000 +0200
|
||||
+++ base/debug/stack_trace.h 2017-08-02 19:10:33.950334000 +0200
|
||||
--- base/debug/stack_trace.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/debug/stack_trace.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "build/build_config.h"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
|
||||
+++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
--- base/debug/stack_trace_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -574,6 +574,11 @@
|
||||
@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
@ -21,7 +21,7 @@
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -589,6 +594,7 @@
|
||||
@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
@ -29,12 +29,3 @@
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
||||
@@ -721,7 +727,7 @@
|
||||
// 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
|
||||
|
@ -1,15 +0,0 @@
|
||||
--- base/debug/thread_heap_usage_tracker.cc.orig 2017-06-05 19:03:00 UTC
|
||||
+++ base/debug/thread_heap_usage_tracker.cc
|
||||
@@ -16,10 +16,12 @@
|
||||
#include "base/threading/thread_local_storage.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
+#if !defined(OS_BSD)
|
||||
#if defined(OS_MACOSX) || defined(OS_IOS)
|
||||
#include <malloc/malloc.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
namespace base {
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_path_unittest.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/files/file_path_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/file_path_unittest.cc
|
||||
@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
|
||||
@@ -1138,7 +1138,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
|
||||
"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/files/file_path_watcher_kqueue.h.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/files/file_path_watcher_kqueue.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/file_path_watcher_kqueue.h
|
||||
@@ -5,6 +5,10 @@
|
||||
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/files/file_path_watcher_stub.cc.orig 2018-07-19 23:00:07.807326000 +0200
|
||||
+++ base/files/file_path_watcher_stub.cc 2018-07-19 23:05:24.785603000 +0200
|
||||
--- base/files/file_path_watcher_stub.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/file_path_watcher_stub.cc
|
||||
@@ -1,14 +1,15 @@
|
||||
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
namespace base {
|
||||
|
||||
@@ -22,12 +23,26 @@
|
||||
@@ -22,12 +23,26 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
|
||||
bool Watch(const FilePath& path,
|
||||
bool recursive,
|
||||
const FilePathWatcher::Callback& callback) override {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2018-08-08 21:10:31.000000000 +0200
|
||||
+++ base/files/file_path_watcher_unittest.cc 2018-08-29 20:20:06.152675000 +0200
|
||||
@@ -435,7 +435,7 @@
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
VLOG(1) << "Waiting for file1 creation";
|
||||
ASSERT_TRUE(WaitForEvents());
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_util.h.orig 2017-07-25 21:04:48.000000000 +0200
|
||||
+++ base/files/file_util.h 2017-07-29 00:57:11.269678000 +0200
|
||||
@@ -406,7 +406,7 @@
|
||||
--- base/files/file_util.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/file_util.h
|
||||
@@ -445,7 +445,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
|
||||
// the directory |path|, in the number of FilePath::CharType, or -1 on failure.
|
||||
BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
|
||||
|
||||
|
11
www/chromium/files/patch-base_files_file__util__posix.cc
Normal file
11
www/chromium/files/patch-base_files_file__util__posix.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path,
|
||||
#endif // !defined(OS_NACL_NONSFI)
|
||||
|
||||
bool CreateLocalNonBlockingPipe(int fds[2]) {
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0;
|
||||
#else
|
||||
int raw_fds[2];
|
@ -1,6 +1,6 @@
|
||||
--- base/files/memory_mapped_file_posix.cc.orig 2018-02-24 16:25:08.000000000 +0100
|
||||
+++ base/files/memory_mapped_file_posix.cc 2018-03-03 19:01:12.448678000 +0100
|
||||
@@ -110,6 +110,8 @@
|
||||
--- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/files/memory_mapped_file_posix.cc
|
||||
@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory(
|
||||
// Only Android API>=21 supports the fallocate call. Older versions need
|
||||
// to manually extend the file by writing zeros at block intervals.
|
||||
do_manual_extension = true;
|
@ -1,5 +1,5 @@
|
||||
--- base/i18n/icu_util.cc.orig 2017-09-05 21:05:11.000000000 +0200
|
||||
+++ base/i18n/icu_util.cc 2017-09-06 16:47:26.158180000 +0200
|
||||
--- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/i18n/icu_util.cc
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "third_party/icu/source/common/unicode/putil.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "third_party/icu/source/i18n/unicode/timezone.h"
|
||||
#endif
|
||||
|
||||
@@ -312,7 +312,7 @@
|
||||
@@ -315,7 +315,7 @@ bool InitializeICU() {
|
||||
// TODO(jungshik): Some callers do not care about tz at all. If necessary,
|
||||
// add a boolean argument to this function to init'd the default tz only
|
||||
// when requested.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/linux_util.cc.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/linux_util.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/linux_util.cc
|
||||
@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
|
||||
@@ -90,12 +90,14 @@ char g_linux_distro[kDistroSize] =
|
||||
"CrOS";
|
||||
#elif defined(OS_ANDROID)
|
||||
"Android";
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/logging_unittest.cc.orig 2017-06-21 19:47:24.089128000 +0200
|
||||
+++ base/logging_unittest.cc 2017-06-21 20:02:08.177123000 +0200
|
||||
@@ -272,7 +272,7 @@
|
||||
--- base/logging_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/logging_unittest.cc
|
||||
@@ -420,7 +420,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
|
||||
// need the arch-specific boilerplate below, which is inspired by breakpad.
|
||||
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
|
||||
uintptr_t crash_addr = 0;
|
||||
@ -8,4 +8,4 @@
|
||||
+#if defined(OS_MACOSX) || defined(OS_BSD)
|
||||
crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
|
||||
#else // OS_POSIX && !OS_MACOSX
|
||||
struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr);
|
||||
ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/native_library_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
|
||||
+++ base/native_library_posix.cc 2017-08-02 21:02:05.991380000 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
--- base/native_library_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/native_library_posix.cc
|
||||
@@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
|
||||
// http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
|
||||
// and http://crbug.com/40794.
|
||||
int flags = RTLD_LAZY;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/native_library_unittest.cc.orig 2018-08-23 19:08:51.430697000 +0200
|
||||
+++ base/native_library_unittest.cc 2018-08-23 19:09:42.937027000 +0200
|
||||
@@ -120,7 +120,7 @@
|
||||
--- base/native_library_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/native_library_unittest.cc
|
||||
@@ -120,7 +120,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
|
||||
// Android dlopen() requires further investigation, as it might vary across
|
||||
// versions with respect to symbol resolution scope.
|
||||
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
|
||||
|
@ -0,0 +1,13 @@
|
||||
--- base/numerics/safe_math_shared_impl.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/numerics/safe_math_shared_impl.h
|
||||
@@ -19,9 +19,7 @@
|
||||
|
||||
// Where available use builtin math overflow support on Clang and GCC.
|
||||
#if !defined(__native_client__) && \
|
||||
- ((defined(__clang__) && \
|
||||
- ((__clang_major__ > 3) || \
|
||||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
||||
+ ((defined(__clang__) && (__clang_major__ > 6)) || \
|
||||
(defined(__GNUC__) && __GNUC__ >= 5))
|
||||
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
||||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
@ -1,6 +1,6 @@
|
||||
--- base/posix/can_lower_nice_to.cc.orig 2018-12-12 22:56:01.000000000 +0100
|
||||
+++ base/posix/can_lower_nice_to.cc 2018-12-16 00:34:34.602103000 +0100
|
||||
@@ -31,6 +31,9 @@
|
||||
--- base/posix/can_lower_nice_to.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/posix/can_lower_nice_to.cc
|
||||
@@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) {
|
||||
if (geteuid() == 0)
|
||||
return true;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
// 2. Skip checking the CAP_SYS_NICE permission because it would require
|
||||
// libcap.so.
|
||||
|
||||
@@ -54,6 +57,7 @@
|
||||
@@ -54,6 +57,7 @@ bool CanLowerNiceTo(int nice_value) {
|
||||
// And lowering niceness to |nice_value| is allowed if it is greater than or
|
||||
// equal to the limit:
|
||||
return nice_value >= lowest_nice_allowed;
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/posix/unix_domain_socket.cc.orig 2018-01-04 21:05:38.000000000 +0100
|
||||
+++ base/posix/unix_domain_socket.cc 2018-01-06 12:44:56.681201000 +0100
|
||||
--- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/posix/unix_domain_socket.cc
|
||||
@@ -5,7 +5,10 @@
|
||||
#include "base/posix/unix_domain_socket.h"
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#if !defined(OS_NACL_NONSFI)
|
||||
#include <sys/un.h>
|
||||
#endif
|
||||
@@ -28,6 +31,14 @@
|
||||
@@ -28,6 +31,14 @@ namespace base {
|
||||
|
||||
const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#if !defined(OS_NACL_NONSFI)
|
||||
bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
|
||||
int raw_socks[2];
|
||||
@@ -150,7 +161,7 @@
|
||||
@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
||||
#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
|
||||
// The PNaCl toolchain for Non-SFI binary build and macOS do not support
|
||||
// ucred. macOS supports xucred, but this structure is insufficient.
|
||||
@ -35,7 +35,7 @@
|
||||
#endif // OS_NACL_NONSFI or OS_MACOSX
|
||||
;
|
||||
char control_buffer[kControlBufferSize];
|
||||
@@ -180,9 +191,9 @@
|
||||
@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
||||
// SCM_CREDENTIALS.
|
||||
if (cmsg->cmsg_level == SOL_SOCKET &&
|
||||
cmsg->cmsg_type == SCM_CREDENTIALS) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/posix/unix_domain_socket_unittest.cc.orig 2017-12-23 20:50:07.237565000 +0100
|
||||
+++ base/posix/unix_domain_socket_unittest.cc 2017-12-23 20:51:05.651558000 +0100
|
||||
--- base/posix/unix_domain_socket_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/posix/unix_domain_socket_unittest.cc
|
||||
@@ -8,6 +8,9 @@
|
||||
#include <stdint.h>
|
||||
#include <sys/socket.h>
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/internal_linux.cc.orig 2017-08-10 00:00:17.842158000 +0200
|
||||
+++ base/process/internal_linux.cc 2017-08-10 00:02:37.838081000 +0200
|
||||
@@ -60,10 +60,13 @@
|
||||
--- base/process/internal_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/internal_linux.cc
|
||||
@@ -60,10 +60,13 @@ bool ReadProcFile(const FilePath& file, std::string* b
|
||||
// Synchronously reading files in /proc is safe.
|
||||
ThreadRestrictions::ScopedAllowIO allow_io;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/process/internal_linux.h.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/process/internal_linux.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/internal_linux.h
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/kill.h.orig 2018-07-19 22:11:43.638992000 +0200
|
||||
+++ base/process/kill.h 2018-07-19 22:12:06.613065000 +0200
|
||||
@@ -111,7 +111,7 @@
|
||||
--- base/process/kill.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/kill.h
|
||||
@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
|
||||
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
|
||||
ProcessHandle handle, int* exit_code);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/kill_posix.cc.orig 2018-07-19 22:11:49.327358000 +0200
|
||||
+++ base/process/kill_posix.cc 2018-07-19 22:12:22.837132000 +0200
|
||||
@@ -167,7 +167,7 @@
|
||||
--- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/kill_posix.cc
|
||||
@@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) {
|
||||
0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/process/launch.cc.orig 2017-06-05 19:03:00 UTC
|
||||
--- base/process/launch.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/launch.cc
|
||||
@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
|
||||
|
||||
|
@ -1,20 +1,20 @@
|
||||
--- base/process/launch.h.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/process/launch.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/launch.h
|
||||
@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
// will be the same as its pid.
|
||||
bool new_process_group = false;
|
||||
@@ -175,7 +175,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
FileHandleMappingVector fds_to_remap;
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
// If non-zero, start the process using clone(), using flags as provided.
|
||||
// Unlike in clone, clone_flags may not contain a custom termination signal
|
||||
// that is sent to the parent when the child dies. The termination signal will
|
||||
@@ -151,7 +151,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
@@ -188,7 +188,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
|
||||
// Sets parent process death signal to SIGKILL.
|
||||
bool kill_on_parent_death = false;
|
||||
-#endif // defined(OS_LINUX)
|
||||
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
||||
|
||||
#if defined(OS_POSIX)
|
||||
// If not empty, launch the specified executable instead of
|
||||
#if defined(OS_FUCHSIA)
|
||||
// If valid, launches the application in that job object.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/launch_posix.cc.orig 2019-01-30 02:17:39.000000000 +0100
|
||||
+++ base/process/launch_posix.cc 2019-01-31 20:45:00.397199000 +0100
|
||||
@@ -63,6 +63,7 @@
|
||||
--- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/launch_posix.cc
|
||||
@@ -64,6 +64,7 @@
|
||||
#error "macOS should use launch_mac.cc"
|
||||
#endif
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/process/memory.cc.orig 2017-12-15 02:04:05.000000000 +0100
|
||||
+++ base/process/memory.cc 2017-12-31 09:49:46.308931000 +0100
|
||||
--- base/process/memory.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/memory.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
namespace base {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
|
||||
#endif
|
||||
|
||||
// Defined in memory_mac.mm for Mac.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/memory.h.orig 2017-07-25 21:04:48.000000000 +0200
|
||||
+++ base/process/memory.h 2017-07-29 01:01:15.601297000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
--- base/process/memory.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/memory.h
|
||||
@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
|
||||
// Crash reporting classifies such crashes as OOM.
|
||||
BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/memory_unittest.cc.orig 2018-08-08 21:10:31.000000000 +0200
|
||||
+++ base/process/memory_unittest.cc 2018-08-20 13:06:25.303428000 +0200
|
||||
@@ -104,7 +104,7 @@
|
||||
--- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/memory_unittest.cc
|
||||
@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) {
|
||||
// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
|
||||
// configurations: only test the real allocator.
|
||||
// Windows only supports these tests with the allocator shim in place.
|
||||
@ -9,7 +9,7 @@
|
||||
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
||||
|
||||
namespace {
|
||||
@@ -529,5 +529,5 @@
|
||||
@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
|
||||
EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
|
||||
EXPECT_TRUE(value_ == nullptr);
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/process_handle.cc.orig 2018-07-19 22:31:30.212555000 +0200
|
||||
+++ base/process/process_handle.cc 2018-07-19 22:32:27.185612000 +0200
|
||||
@@ -39,7 +39,7 @@
|
||||
--- base/process/process_handle.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_handle.cc
|
||||
@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() {
|
||||
return g_unique_id;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/process_handle.h.orig 2018-07-19 22:31:39.988330000 +0200
|
||||
+++ base/process/process_handle.h 2018-07-19 22:32:06.977544000 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
--- base/process/process_handle.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_handle.h
|
||||
@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
|
||||
// a process's PID.
|
||||
BASE_EXPORT uint32_t GetUniqueIdForProcess();
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/process_handle_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100
|
||||
+++ base/process/process_handle_freebsd.cc 2018-01-27 02:11:02.948007000 +0100
|
||||
@@ -16,10 +16,13 @@
|
||||
--- base/process/process_handle_freebsd.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_handle_freebsd.cc
|
||||
@@ -16,10 +16,13 @@ namespace base {
|
||||
|
||||
ProcessId GetParentProcessId(ProcessHandle process) {
|
||||
struct kinfo_proc info;
|
||||
@ -8,7 +8,7 @@
|
||||
+ size_t length = sizeof(struct kinfo_proc);
|
||||
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
|
||||
|
||||
if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
|
||||
if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ if (length < sizeof(struct kinfo_proc))
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/process/process_iterator_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100
|
||||
+++ base/process/process_iterator_freebsd.cc 2018-01-27 17:58:40.475292000 +0100
|
||||
--- base/process/process_iterator_freebsd.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_iterator_freebsd.cc
|
||||
@@ -10,6 +10,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
#include <unistd.h>
|
||||
@ -9,18 +9,18 @@
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include "base/logging.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/stl_util.h"
|
||||
#include "base/strings/string_split.h"
|
||||
@@ -40,7 +44,7 @@
|
||||
@@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
num_of_kinfo_proc += 16;
|
||||
kinfo_procs_.resize(num_of_kinfo_proc);
|
||||
len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
|
||||
- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) {
|
||||
+ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) {
|
||||
- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
|
||||
+ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) {
|
||||
// If we get a mem error, it just means we need a bigger buffer, so
|
||||
// loop around again. Anything else is a real error and give up.
|
||||
if (errno != ENOMEM) {
|
||||
@@ -72,19 +76,13 @@
|
||||
@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() {
|
||||
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
|
||||
size_t length;
|
||||
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
|
||||
@ -31,15 +31,14 @@
|
||||
continue;
|
||||
|
||||
- length = 0;
|
||||
- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) {
|
||||
- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) {
|
||||
- LOG(ERROR) << "failed to figure out the buffer size for a command line";
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- data.resize(length);
|
||||
-
|
||||
+ data.resize(ARG_MAX);
|
||||
+ length = ARG_MAX;
|
||||
if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) {
|
||||
|
||||
if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) {
|
||||
LOG(ERROR) << "failed to fetch a commandline";
|
||||
continue;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/process_linux.cc.orig 2019-02-01 23:15:53.491332000 +0100
|
||||
+++ base/process/process_linux.cc 2019-02-01 23:16:56.937810000 +0100
|
||||
@@ -88,6 +88,7 @@
|
||||
--- base/process/process_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_linux.cc
|
||||
@@ -88,6 +88,7 @@ Time Process::CreationTime() const {
|
||||
return Time(boot_time + start_offset);
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
// static
|
||||
bool Process::CanBackgroundProcesses() {
|
||||
#if defined(OS_CHROMEOS)
|
||||
@@ -139,6 +140,7 @@
|
||||
@@ -139,6 +140,7 @@ bool Process::SetProcessBackgrounded(bool background)
|
||||
DPCHECK(result == 0);
|
||||
return result == 0;
|
||||
}
|
||||
|
20
www/chromium/files/patch-base_process_process__metrics.cc
Normal file
20
www/chromium/files/patch-base_process_process__metrics.cc
Normal file
@ -0,0 +1,20 @@
|
||||
--- base/process/process_metrics.cc.orig 2019-03-21 01:36:27.000000000 +0100
|
||||
+++ base/process/process_metrics.cc 2019-03-24 19:52:47.516944000 +0100
|
||||
@@ -126,7 +126,7 @@
|
||||
}
|
||||
#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,
|
||||
@@ -138,7 +138,7 @@
|
||||
NOTIMPLEMENTED(); // http://crbug.com/120488
|
||||
return 0;
|
||||
}
|
||||
-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
|
||||
+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
int ProcessMetrics::CalculatePackageIdleWakeupsPerSecond(
|
@ -1,15 +1,15 @@
|
||||
--- base/process/process_metrics.h.orig 2018-03-20 23:05:14.000000000 +0100
|
||||
+++ base/process/process_metrics.h 2018-03-24 12:20:53.523721000 +0100
|
||||
@@ -110,7 +110,7 @@
|
||||
size_t image;
|
||||
};
|
||||
--- base/process/process_metrics.h.orig 2019-03-21 01:36:27.000000000 +0100
|
||||
+++ base/process/process_metrics.h 2019-03-24 19:51:50.158637000 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
// Full declaration is in process_metrics_iocounters.h.
|
||||
struct IoCounters;
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
|
||||
// Minor and major page fault counts since the process creation.
|
||||
// Both counts are process-wide, and exclude child processes.
|
||||
//
|
||||
@@ -120,7 +120,7 @@
|
||||
@@ -51,7 +51,7 @@
|
||||
int64_t minor;
|
||||
int64_t major;
|
||||
};
|
||||
@ -18,21 +18,18 @@
|
||||
|
||||
// Convert a POSIX timeval to microseconds.
|
||||
BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv);
|
||||
@@ -252,7 +252,7 @@
|
||||
// otherwise.
|
||||
bool GetIOCounters(IoCounters* io_counters) const;
|
||||
@@ -92,7 +92,7 @@
|
||||
// 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;
|
||||
@@ -260,16 +260,16 @@
|
||||
// Returns the soft limit of file descriptors that can be opened by the
|
||||
// process, or -1 on error.
|
||||
-#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,14 +199,14 @@
|
||||
int GetOpenFdSoftLimit() const;
|
||||
-#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
|
||||
+#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
|
||||
#endif // defined(OS_POSIX)
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
|
||||
@ -47,25 +44,25 @@
|
||||
|
||||
// Returns total memory usage of malloc.
|
||||
size_t GetMallocUsage();
|
||||
@@ -289,7 +289,7 @@
|
||||
bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const;
|
||||
#endif
|
||||
@@ -218,7 +218,7 @@
|
||||
ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
|
||||
#endif // !defined(OS_MACOSX) || defined(OS_IOS)
|
||||
|
||||
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
|
||||
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
|
||||
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
|
||||
#endif
|
||||
#if defined(OS_MACOSX)
|
||||
@@ -310,7 +310,7 @@
|
||||
TimeTicks last_cpu_time_;
|
||||
int64_t last_system_time_;
|
||||
@@ -247,7 +247,7 @@
|
||||
// Number of bytes transferred to/from disk in bytes.
|
||||
uint64_t last_cumulative_disk_usage_ = 0;
|
||||
|
||||
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
|
||||
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
|
||||
// Same thing for idle wakeups.
|
||||
TimeTicks last_idle_wakeups_time_;
|
||||
uint64_t last_absolute_idle_wakeups_;
|
||||
@@ -358,7 +358,7 @@
|
||||
@@ -293,7 +293,7 @@
|
||||
#endif // defined(OS_POSIX)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
|
||||
@ -74,7 +71,7 @@
|
||||
// Data about system-wide memory consumption. Values are in KB. Available on
|
||||
// Windows, Mac, Linux, Android and Chrome OS.
|
||||
//
|
||||
@@ -391,7 +391,7 @@
|
||||
@@ -326,7 +326,7 @@
|
||||
int avail_phys = 0;
|
||||
#endif
|
||||
|
||||
@ -83,7 +80,7 @@
|
||||
// This provides an estimate of available memory as described here:
|
||||
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
|
||||
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
|
||||
@@ -406,7 +406,7 @@
|
||||
@@ -341,7 +341,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
|
||||
@ -92,7 +89,7 @@
|
||||
int buffers = 0;
|
||||
int cached = 0;
|
||||
int active_anon = 0;
|
||||
@@ -416,7 +416,7 @@
|
||||
@@ -351,7 +351,7 @@
|
||||
int dirty = 0;
|
||||
int reclaimable = 0;
|
||||
#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) ||
|
||||
@ -101,9 +98,12 @@
|
||||
|
||||
#if defined(OS_CHROMEOS)
|
||||
int shmem = 0;
|
||||
@@ -444,7 +444,7 @@
|
||||
@@ -377,9 +377,9 @@
|
||||
BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
|
||||
|
||||
#endif // 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_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/process/process_metrics_freebsd.cc.orig 2019-02-06 23:06:36.000000000 +0100
|
||||
+++ base/process/process_metrics_freebsd.cc 2019-02-08 19:11:07.753223000 +0100
|
||||
--- base/process/process_metrics_freebsd.cc.orig 2019-03-21 01:36:27.000000000 +0100
|
||||
+++ base/process/process_metrics_freebsd.cc 2019-03-24 22:18:22.764297000 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "base/process/process_metrics.h"
|
||||
|
||||
@ -26,12 +26,10 @@
|
||||
|
||||
// static
|
||||
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
|
||||
@@ -67,6 +72,95 @@
|
||||
pagesize = getpagesize();
|
||||
|
||||
@@ -69,4 +74,93 @@
|
||||
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
|
||||
+}
|
||||
+
|
||||
}
|
||||
|
||||
+int GetNumberOfThreads(ProcessHandle process) {
|
||||
+ // Taken from FreeBSD top (usr.bin/top/machine.c)
|
||||
+
|
||||
@ -99,26 +97,26 @@
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetOpenFdSoftLimit() const {
|
||||
+ struct kinfo_proc *info;
|
||||
+ size_t length;
|
||||
+ int total_count = 0;
|
||||
+ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC };
|
||||
+
|
||||
+ length = sizeof(total_count);
|
||||
+
|
||||
+ if (sysctl(mib, arraysize(mib), &total_count, &length, NULL, 0) < 0) {
|
||||
+ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) {
|
||||
+ total_count = -1;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+out:
|
||||
+ free(info);
|
||||
+ return total_count;
|
||||
+}
|
||||
+
|
||||
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetIdleWakeupsPerSecond() {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
+}
|
||||
} // namespace base
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/process/process_metrics_posix.cc.orig 2018-08-01 00:08:25.000000000 +0200
|
||||
+++ base/process/process_metrics_posix.cc 2018-08-05 00:53:58.559513000 +0200
|
||||
--- base/process/process_metrics_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/process/process_metrics_posix.cc
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
@ -9,7 +9,7 @@
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -107,7 +109,7 @@
|
||||
@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() {
|
||||
#else
|
||||
return minfo.hblkhd + minfo.arena;
|
||||
#endif
|
||||
|
11
www/chromium/files/patch-base_process_process__unittest.cc
Normal file
11
www/chromium/files/patch-base_process_process__unittest.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/process_unittest.cc.orig 2019-03-18 19:16:37 UTC
|
||||
+++ base/process/process_unittest.cc
|
||||
@@ -148,7 +148,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
|
||||
// was spawned and a time recorded after it was spawned. However, since the
|
||||
// base::Time and process creation clocks don't match, tolerate some error.
|
||||
constexpr base::TimeDelta kTolerance =
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
// On Linux, process creation time is relative to boot time which has a
|
||||
// 1-second resolution. Tolerate 1 second for the imprecise boot time and
|
||||
// 100 ms for the imprecise clock.
|
@ -1,6 +1,6 @@
|
||||
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/profiler/stack_sampling_profiler_unittest.cc
|
||||
@@ -33,7 +33,7 @@
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <intrin.h>
|
||||
#include <malloc.h>
|
||||
#include <windows.h>
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/security_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/security_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/security_unittest.cc
|
||||
@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
|
||||
@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
|
||||
// FAILS_ is too clunky.
|
||||
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
|
||||
if (!overflow_detected) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/system/sys_info_freebsd.cc.orig 2017-12-15 02:04:05.000000000 +0100
|
||||
+++ base/system/sys_info_freebsd.cc 2017-12-23 21:51:22.626194000 +0100
|
||||
--- base/system/sys_info_freebsd.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/system/sys_info_freebsd.cc
|
||||
@@ -13,26 +13,58 @@
|
||||
namespace base {
|
||||
|
||||
@ -51,8 +51,8 @@
|
||||
+std::string SysInfo::CPUModelName() {
|
||||
+ int mib[] = { CTL_HW, HW_MODEL };
|
||||
+ char name[256];
|
||||
+ size_t size = arraysize(name);
|
||||
+ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
|
||||
+ size_t size = base::size(name);
|
||||
+ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0)
|
||||
+ return name;
|
||||
+ return std::string();
|
||||
+}
|
||||
@ -61,7 +61,7 @@
|
||||
+ int mib[] = { CTL_HW, HW_NCPU };
|
||||
+ int ncpu;
|
||||
+ size_t size = sizeof(ncpu);
|
||||
+ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
|
||||
+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) {
|
||||
+ NOTREACHED();
|
||||
+ return 1;
|
||||
+ }
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/system/sys_info_posix.cc.orig 2019-01-31 21:22:45.968524000 +0100
|
||||
+++ base/system/sys_info_posix.cc 2019-01-31 21:25:09.041659000 +0100
|
||||
--- base/system/sys_info_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/system/sys_info_posix.cc
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
namespace {
|
||||
@ -9,7 +9,7 @@
|
||||
int NumberOfProcessors() {
|
||||
// sysconf returns the number of "logical" (not "physical") processors on both
|
||||
// Mac and Linux. So we get the number of max available "logical" processors.
|
||||
@@ -64,7 +64,7 @@
|
||||
@@ -64,7 +64,7 @@ int NumberOfProcessors() {
|
||||
|
||||
base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
|
||||
Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
#if !defined(OS_FUCHSIA)
|
||||
int64_t AmountOfVirtualMemory() {
|
||||
@@ -132,7 +132,7 @@
|
||||
@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
|
||||
|
||||
namespace base {
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
int SysInfo::NumberOfProcessors() {
|
||||
return g_lazy_number_of_processors.Get().value();
|
||||
}
|
||||
@@ -225,6 +225,8 @@
|
||||
@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
|
||||
arch = "x86";
|
||||
} else if (arch == "amd64") {
|
||||
arch = "x86_64";
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2018-12-12 22:56:01.000000000 +0100
|
||||
+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc 2018-12-16 01:43:12.295373000 +0100
|
||||
@@ -295,6 +295,9 @@
|
||||
--- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
|
||||
@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo
|
||||
EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/test/generate_fontconfig_caches.cc.orig 2018-12-16 02:19:42.000000000 +0100
|
||||
+++ base/test/generate_fontconfig_caches.cc 2018-12-16 02:19:45.432130000 +0100
|
||||
@@ -57,7 +57,14 @@
|
||||
--- base/test/generate_fontconfig_caches.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/test/generate_fontconfig_caches.cc
|
||||
@@ -57,7 +57,14 @@ int main() {
|
||||
base::TearDownFontconfig();
|
||||
|
||||
// Check existence of intended fontconfig cache file.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/test/launcher/test_launcher.cc.orig 2017-12-15 02:04:05.000000000 +0100
|
||||
+++ base/test/launcher/test_launcher.cc 2017-12-30 02:02:22.630578000 +0100
|
||||
@@ -51,6 +51,7 @@
|
||||
--- base/test/launcher/test_launcher.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/test/launcher/test_launcher.cc
|
||||
@@ -53,6 +53,7 @@
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#if defined(OS_POSIX)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/test/test_file_util_linux.cc.orig 2017-08-10 16:14:03.505570000 +0200
|
||||
+++ base/test/test_file_util_linux.cc 2017-08-10 16:14:43.299690000 +0200
|
||||
@@ -20,8 +20,10 @@
|
||||
--- base/test/test_file_util_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/test/test_file_util_linux.cc
|
||||
@@ -51,8 +51,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
|
||||
return false;
|
||||
if (fdatasync(fd.get()) != 0)
|
||||
return false;
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- base/test/test_file_util_posix.cc.orig 2017-09-05 21:05:11.000000000 +0200
|
||||
+++ base/test/test_file_util_posix.cc 2017-09-06 16:59:12.993711000 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
return DeleteFile(file, recurse);
|
||||
--- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/test/test_file_util_posix.cc
|
||||
@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() {
|
||||
sync();
|
||||
}
|
||||
|
||||
-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/third_party/libevent/BUILD.gn.orig 2018-01-04 21:05:38.000000000 +0100
|
||||
+++ base/third_party/libevent/BUILD.gn 2018-01-06 01:02:53.058845000 +0100
|
||||
@@ -43,13 +43,20 @@
|
||||
--- base/third_party/libevent/BUILD.gn.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/third_party/libevent/BUILD.gn
|
||||
@@ -43,13 +43,20 @@ static_library("libevent") {
|
||||
"mac/event-config.h",
|
||||
]
|
||||
include_dirs = [ "mac" ]
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/threading/platform_thread.h.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/threading/platform_thread.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/threading/platform_thread.h
|
||||
@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
|
||||
@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread {
|
||||
|
||||
static ThreadPriority GetCurrentThreadPriority();
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/threading/platform_thread_linux.cc.orig 2019-01-30 02:17:39.000000000 +0100
|
||||
+++ base/threading/platform_thread_linux.cc 2019-02-01 16:31:27.360883000 +0100
|
||||
--- base/threading/platform_thread_linux.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/threading/platform_thread_linux.cc
|
||||
@@ -18,7 +18,9 @@
|
||||
|
||||
#if !defined(OS_NACL) && !defined(OS_AIX)
|
||||
@ -10,7 +10,7 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
@@ -99,7 +101,7 @@
|
||||
@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
|
||||
|
||||
Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform(
|
||||
ThreadPriority priority) {
|
||||
@ -19,7 +19,7 @@
|
||||
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
|
||||
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
|
||||
struct rlimit rlim;
|
||||
@@ -141,7 +143,7 @@
|
||||
@@ -141,7 +143,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl
|
||||
void PlatformThread::SetName(const std::string& name) {
|
||||
ThreadIdNameManager::GetInstance()->SetName(name);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/threading/platform_thread_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
--- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/threading/platform_thread_posix.cc
|
||||
@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
|
||||
@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) {
|
||||
if (!thread_params->joinable)
|
||||
base::ThreadRestrictions::SetSingletonAllowed(false);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/threading/thread_task_runner_handle.cc.orig 2017-06-05 19:03:01 UTC
|
||||
--- base/threading/thread_task_runner_handle.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/threading/thread_task_runner_handle.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <utility>
|
||||
@ -8,17 +8,17 @@
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
@@ -34,6 +35,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
|
||||
return !!lazy_tls_ptr.Pointer()->Get();
|
||||
@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
|
||||
return !!thread_task_runner_tls.Pointer()->Get();
|
||||
}
|
||||
|
||||
+#if defined(OS_BSD)
|
||||
// static
|
||||
ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
|
||||
scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
|
||||
@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
|
||||
base::Passed(&overriding_task_runner),
|
||||
base::Unretained(ttrh->task_runner_.get())));
|
||||
@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
|
||||
base::Unretained(ttrh->task_runner_.get()),
|
||||
std::move(no_running_during_override)));
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- base/trace_event/malloc_dump_provider.cc.orig 2019-01-30 02:17:39.000000000 +0100
|
||||
+++ base/trace_event/malloc_dump_provider.cc 2019-01-31 22:27:52.377125000 +0100
|
||||
--- base/trace_event/malloc_dump_provider.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/trace_event/malloc_dump_provider.cc
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
@ -9,7 +9,7 @@
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -132,6 +134,9 @@
|
||||
@@ -132,6 +134,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
}
|
||||
#elif defined(OS_FUCHSIA)
|
||||
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
@ -1,6 +1,6 @@
|
||||
--- base/trace_event/process_memory_dump.cc.orig 2018-08-01 00:08:26.000000000 +0200
|
||||
+++ base/trace_event/process_memory_dump.cc 2018-08-04 13:42:42.870211000 +0200
|
||||
@@ -95,7 +95,7 @@
|
||||
--- base/trace_event/process_memory_dump.cc.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/trace_event/process_memory_dump.cc
|
||||
@@ -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,5 +1,5 @@
|
||||
--- base/trace_event/process_memory_dump.h.orig 2018-08-01 00:08:26.000000000 +0200
|
||||
+++ base/trace_event/process_memory_dump.h 2018-08-04 13:49:22.487126000 +0200
|
||||
--- base/trace_event/process_memory_dump.h.orig 2019-03-11 22:00:51 UTC
|
||||
+++ base/trace_event/process_memory_dump.h
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
// Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
|
||||
+++ build/config/BUILD.gn 2019-01-31 21:42:37.569620000 +0100
|
||||
@@ -170,7 +170,7 @@
|
||||
--- build/config/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/BUILD.gn
|
||||
@@ -162,7 +162,7 @@ config("debug") {
|
||||
# builds, and we have to tell it to turn it off.
|
||||
defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
# Enable libstdc++ debugging facilities to help catch problems early, see
|
||||
# http://crbug.com/65151 .
|
||||
# TODO(phajdan.jr): Should we enable this for all of POSIX?
|
||||
@@ -272,9 +272,7 @@
|
||||
@@ -263,9 +263,7 @@ config("default_libs") {
|
||||
]
|
||||
} else if (is_linux) {
|
||||
libs = [
|
||||
@ -19,7 +19,7 @@
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -351,7 +349,7 @@
|
||||
@@ -342,7 +340,7 @@ config("executable_config") {
|
||||
"//build/config/ios:ios_dynamic_flags",
|
||||
"//build/config/ios:ios_executable_flags",
|
||||
]
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/BUILDCONFIG.gn.orig 2019-02-06 23:06:36.000000000 +0100
|
||||
+++ build/config/BUILDCONFIG.gn 2019-02-08 19:05:14.524345000 +0100
|
||||
@@ -131,10 +131,10 @@
|
||||
--- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/BUILDCONFIG.gn
|
||||
@@ -131,10 +131,10 @@ declare_args() {
|
||||
is_official_build = false
|
||||
|
||||
# Whether we're a traditional desktop unix.
|
||||
@ -13,18 +13,18 @@
|
||||
(current_cpu != "s390x" && current_cpu != "s390" &&
|
||||
current_cpu != "ppc64" && current_cpu != "ppc" &&
|
||||
current_cpu != "mips" && current_cpu != "mips64")
|
||||
@@ -186,8 +186,8 @@
|
||||
@@ -186,8 +186,8 @@ if (host_toolchain == "") {
|
||||
# TODO(dpranke): Add some sort of assert here that verifies that
|
||||
# no toolchain omitted host_toolchain from its toolchain_args().
|
||||
|
||||
- if (host_os == "linux") {
|
||||
- if (target_os != "linux") {
|
||||
+ if (host_os == "linux" || host_os == "freebsd") {
|
||||
+ if (target_os != "linux" || target_os != "freebsd") {
|
||||
# TODO(dpranke) - is_clang normally applies only to the target
|
||||
# build, and there is no way to indicate that you want to override
|
||||
# it for both the target build *and* the host build. Do we need to
|
||||
@@ -228,7 +228,7 @@
|
||||
+ if (target_os != "linux" && target_os != "freebsd") {
|
||||
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
|
||||
} else if (is_clang) {
|
||||
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
|
||||
@@ -224,7 +224,7 @@ if (target_os == "android") {
|
||||
assert(host_os == "linux" || host_os == "mac",
|
||||
"Android builds are only supported on Linux and Mac hosts.")
|
||||
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
|
||||
@ -33,87 +33,16 @@
|
||||
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
|
||||
if (is_clang) {
|
||||
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
|
||||
@@ -302,6 +302,7 @@
|
||||
is_nacl = false
|
||||
is_posix = false
|
||||
is_win = true
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "mac") {
|
||||
is_aix = false
|
||||
is_android = false
|
||||
@@ -313,6 +314,7 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "android") {
|
||||
is_aix = false
|
||||
is_android = true
|
||||
@@ -324,6 +326,7 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "chromeos") {
|
||||
is_aix = false
|
||||
is_android = false
|
||||
@@ -335,6 +338,7 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = 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 +353,7 @@
|
||||
is_nacl = true
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "fuchsia") {
|
||||
is_aix = false
|
||||
is_android = false
|
||||
@@ -360,6 +365,7 @@
|
||||
is_nacl = false
|
||||
is_posix = false
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "ios") {
|
||||
is_aix = false
|
||||
is_android = false
|
||||
@@ -371,6 +377,7 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "linux") {
|
||||
is_aix = false
|
||||
is_android = false
|
||||
@@ -382,6 +389,7 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
} else if (current_os == "aix") {
|
||||
is_aix = true
|
||||
is_android = false
|
||||
@@ -393,6 +401,19 @@
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
is_win = false
|
||||
+ is_bsd = false
|
||||
+} else if (current_os == "freebsd") {
|
||||
+ 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_bsd = true
|
||||
}
|
||||
@@ -291,10 +291,11 @@ 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 == "freebsd"
|
||||
is_mac = current_os == "mac"
|
||||
is_nacl = current_os == "nacl"
|
||||
is_win = current_os == "win" || current_os == "winuwp"
|
||||
+is_bsd = current_os == "freebsd"
|
||||
|
||||
is_posix = !is_win && !is_fuchsia
|
||||
|
||||
# =============================================================================
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200
|
||||
+++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
--- build/config/allocator.gni.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/allocator.gni
|
||||
@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||
|
||||
# Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
|
||||
if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
|
||||
@ -9,7 +9,7 @@
|
||||
_default_allocator = "none"
|
||||
} else {
|
||||
_default_allocator = "tcmalloc"
|
||||
@@ -17,7 +17,7 @@
|
||||
@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
|
||||
# against the debug CRT with "is_nacl=false".
|
||||
if ((is_linux || is_android || is_mac ||
|
||||
(is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/compiler/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
|
||||
+++ build/config/compiler/BUILD.gn 2019-01-31 21:56:18.122280000 +0100
|
||||
@@ -53,7 +53,7 @@
|
||||
--- build/config/compiler/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -53,7 +53,7 @@ declare_args() {
|
||||
# only two architectures that are currently checked in). Turn this off when
|
||||
# you are using a custom toolchain and need to control -B in cflags.
|
||||
linux_use_bundled_binutils =
|
||||
@ -9,7 +9,7 @@
|
||||
(current_cpu == "x64" || current_cpu == "x86")
|
||||
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
|
||||
root_build_dir)
|
||||
@@ -274,7 +274,7 @@
|
||||
@@ -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 &&
|
||||
@ -18,7 +18,7 @@
|
||||
# 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
|
||||
@@ -393,7 +393,7 @@
|
||||
@@ -394,7 +394,7 @@ config("compiler") {
|
||||
|
||||
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
|
||||
# the executable they are loaded into, so they are unresolved at link-time.
|
||||
@ -27,7 +27,7 @@
|
||||
ldflags += [
|
||||
"-Wl,-z,defs",
|
||||
"-Wl,--as-needed",
|
||||
@@ -501,7 +501,7 @@
|
||||
@@ -502,7 +502,7 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
cflags += [
|
||||
# TODO(hans): Remove this once Clang generates better optimized debug info
|
||||
# by default. https://crbug.com/765793
|
||||
@@ -808,7 +808,7 @@
|
||||
@@ -809,7 +809,7 @@ config("compiler_cpu_abi") {
|
||||
cflags += [ "-mtune=$arm_tune" ]
|
||||
}
|
||||
} else if (current_cpu == "arm64") {
|
||||
@ -45,35 +45,25 @@
|
||||
cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
}
|
||||
@@ -1488,11 +1488,13 @@
|
||||
if (current_toolchain == host_toolchain || !use_xcode_clang) {
|
||||
@@ -1494,7 +1494,7 @@ config("default_warnings") {
|
||||
cflags += [ "-Wno-nonportable-include-path" ]
|
||||
}
|
||||
|
||||
- if (current_toolchain == host_toolchain || !use_xcode_clang) {
|
||||
+ if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) {
|
||||
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
|
||||
# recognize.
|
||||
- cflags += [
|
||||
- # Ignore warnings about MSVC optimization pragmas.
|
||||
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
|
||||
- "-Wno-ignored-pragma-optimize",
|
||||
- ]
|
||||
+ if (!is_bsd) {
|
||||
+ cflags += [
|
||||
+ # Ignore warnings about MSVC optimization pragmas.
|
||||
+ # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
|
||||
+ "-Wno-ignored-pragma-optimize",
|
||||
+ ]
|
||||
+ }
|
||||
if (is_fuchsia) {
|
||||
cflags += [
|
||||
# TODO(hans): https://crbug.com/890307
|
||||
@@ -1684,7 +1686,7 @@
|
||||
cflags += [
|
||||
@@ -1694,7 +1694,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_bsd) || is_fuchsia) {
|
||||
arflags = [ "-T" ]
|
||||
}
|
||||
}
|
||||
@@ -2269,7 +2271,7 @@
|
||||
} else if (is_win && use_lld) {
|
||||
arflags = [ "/llvmlibthin" ]
|
||||
@@ -2278,7 +2278,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) {
|
||||
@ -82,7 +72,7 @@
|
||||
}
|
||||
}
|
||||
if (use_debug_fission && !is_nacl && !is_android) {
|
||||
@@ -2290,7 +2292,7 @@
|
||||
@@ -2299,7 +2299,7 @@ config("symbols") {
|
||||
# DWARF info may be corrupt; offsets in a range list entry are in different
|
||||
# sections" there. Maybe just a bug in nacl_switch_32.S.
|
||||
if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- build/config/compiler/compiler.gni.orig 2018-08-01 00:08:26.000000000 +0200
|
||||
+++ build/config/compiler/compiler.gni 2018-08-04 14:04:44.799794000 +0200
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
--- build/config/compiler/compiler.gni.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/compiler/compiler.gni
|
||||
@@ -179,7 +179,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_bsd && !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" ||
|
||||
use_gold =
|
||||
- !use_lld && !(is_chromecast && is_linux &&
|
||||
+ !is_bsd && !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 == "arm64" ||
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- build/config/features.gni.orig 2017-12-15 02:04:05.000000000 +0100
|
||||
+++ build/config/features.gni 2017-12-23 23:30:21.417932000 +0100
|
||||
@@ -46,7 +46,7 @@
|
||||
fieldtrial_testing_like_official_build = is_chrome_branded
|
||||
--- build/config/features.gni.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/features.gni
|
||||
@@ -41,7 +41,7 @@ declare_args() {
|
||||
}
|
||||
|
||||
# libudev usage. This currently only affects the content layer.
|
||||
- use_udev = is_linux && !is_chromecast
|
||||
|
@ -0,0 +1,9 @@
|
||||
--- build/config/freetype/freetype.gni.orig 2019-03-18 08:59:45 UTC
|
||||
+++ build/config/freetype/freetype.gni
|
||||
@@ -10,5 +10,5 @@ declare_args() {
|
||||
# than version 2.7.1 and have color bitmap support compiled in. WARNING:
|
||||
# System FreeType configurations other than as described WILL INTRODUCE TEXT
|
||||
# RENDERING AND SECURITY REGRESSIONS.
|
||||
- use_system_freetype = false
|
||||
+ use_system_freetype = true
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
--- build/config/linux/BUILD.gn.orig 2018-07-19 22:09:59.968726000 +0200
|
||||
+++ build/config/linux/BUILD.gn 2018-07-19 22:10:16.334896000 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
--- build/config/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/linux/BUILD.gn
|
||||
@@ -28,7 +28,7 @@ config("runtime_library") {
|
||||
}
|
||||
|
||||
if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- build/config/linux/pkg-config.py.orig 2017-04-19 19:06:28 UTC
|
||||
--- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/linux/pkg-config.py
|
||||
@@ -57,8 +57,12 @@ def SetConfigPath(options):
|
||||
print "You must specify an architecture via -a if using a sysroot."
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/sysroot.gni.orig 2018-12-12 22:56:02.000000000 +0100
|
||||
+++ build/config/sysroot.gni 2018-12-15 22:15:59.771804000 +0100
|
||||
@@ -15,9 +15,10 @@
|
||||
--- build/config/sysroot.gni.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/config/sysroot.gni
|
||||
@@ -15,9 +15,10 @@ declare_args() {
|
||||
# The absolute path to directory containing linux sysroot images
|
||||
target_sysroot_dir = "//build/linux"
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- build/gn_run_binary.py.orig 2017-12-30 01:00:32.419195000 +0100
|
||||
+++ build/gn_run_binary.py 2017-12-30 01:01:14.497716000 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
--- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/gn_run_binary.py
|
||||
@@ -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"})
|
||||
if ret != 0:
|
||||
print '%s failed with exit code %d' % (sys.argv[1], ret)
|
||||
sys.exit(ret)
|
||||
if ret <= -100:
|
||||
# Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to
|
@ -1,4 +1,4 @@
|
||||
--- build/linux/chrome.map.orig 2018-08-08 19:10:32 UTC
|
||||
--- build/linux/chrome.map.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/linux/chrome.map
|
||||
@@ -1,4 +1,7 @@
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- build/linux/libpci/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
--- build/linux/libpci/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/linux/libpci/BUILD.gn
|
||||
@@ -3,20 +3,36 @@
|
||||
# found in the LICENSE file.
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- build/linux/unbundle/libusb.gn.orig 2018-07-20 03:07:05.793992000 +0200
|
||||
+++ build/linux/unbundle/libusb.gn 2018-07-20 03:07:35.792417000 +0200
|
||||
--- build/linux/unbundle/libusb.gn.orig 2019-03-17 01:47:13 UTC
|
||||
+++ build/linux/unbundle/libusb.gn
|
||||
@@ -0,0 +1,24 @@
|
||||
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||
+# Use of this source code is governed by a BSD-style license that can be
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/linux/unbundle/replace_gn_files.py.orig 2018-07-20 03:07:59.446131000 +0200
|
||||
+++ build/linux/unbundle/replace_gn_files.py 2018-07-20 03:08:31.519350000 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
--- build/linux/unbundle/replace_gn_files.py.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/linux/unbundle/replace_gn_files.py
|
||||
@@ -27,6 +27,7 @@ REPLACEMENTS = {
|
||||
'libevent': 'base/third_party/libevent/BUILD.gn',
|
||||
'libjpeg': 'third_party/libjpeg.gni',
|
||||
'libpng': 'third_party/libpng/BUILD.gn',
|
@ -1,6 +1,6 @@
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2018-03-20 23:05:14.000000000 +0100
|
||||
+++ build/toolchain/gcc_toolchain.gni 2018-06-18 20:55:17.080248000 +0200
|
||||
@@ -25,6 +25,11 @@
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/toolchain/gcc_toolchain.gni
|
||||
@@ -47,6 +47,11 @@ analyzer_wrapper =
|
||||
rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
|
||||
root_build_dir) + " --mode=clang"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -596,13 +601,23 @@
|
||||
@@ -610,13 +615,23 @@ template("clang_toolchain") {
|
||||
}
|
||||
|
||||
gcc_toolchain(target_name) {
|
@ -1,6 +1,6 @@
|
||||
--- build/toolchain/get_concurrent_links.py.orig 2017-04-19 19:06:28 UTC
|
||||
--- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/toolchain/get_concurrent_links.py
|
||||
@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
|
||||
@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes():
|
||||
return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
|
||||
except Exception:
|
||||
return 0
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/toolchain/linux/BUILD.gn.orig 2017-09-11 02:58:56.145741000 +0200
|
||||
+++ build/toolchain/linux/BUILD.gn 2017-09-11 02:59:18.322655000 +0200
|
||||
@@ -14,7 +14,6 @@
|
||||
--- build/toolchain/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ build/toolchain/linux/BUILD.gn
|
||||
@@ -14,7 +14,6 @@ clang_toolchain("clang_arm") {
|
||||
}
|
||||
|
||||
clang_toolchain("clang_arm64") {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/BUILD.gn.orig 2018-11-19 19:55:02.000000000 +0100
|
||||
+++ cc/BUILD.gn 2018-12-04 13:07:27.981323000 +0100
|
||||
@@ -551,7 +551,7 @@
|
||||
--- cc/BUILD.gn.orig 2019-03-11 22:00:52 UTC
|
||||
+++ cc/BUILD.gn
|
||||
@@ -548,7 +548,7 @@ cc_test_static_library("test_support") {
|
||||
"//ui/gl:test_support",
|
||||
"//ui/latency",
|
||||
]
|
||||
@ -9,7 +9,7 @@
|
||||
data_deps = [
|
||||
"//third_party/mesa_headers",
|
||||
]
|
||||
@@ -751,9 +751,6 @@
|
||||
@@ -746,9 +746,6 @@ cc_test("cc_unittests") {
|
||||
"//ui/gfx/geometry",
|
||||
"//ui/gl",
|
||||
"//ui/gl:test_support",
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-06-05 19:03:01 UTC
|
||||
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-03-11 22:00:52 UTC
|
||||
+++ cc/layers/scrollbar_layer_impl_base.cc
|
||||
@@ -175,8 +175,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
|
||||
@@ -218,8 +218,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
|
||||
int thumb_offset = TrackStart();
|
||||
if (maximum > 0) {
|
||||
float ratio = clamped_current_pos / maximum;
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- cc/trees/property_tree.cc.orig 2017-06-05 19:03:01 UTC
|
||||
--- cc/trees/property_tree.cc.orig 2019-03-11 22:00:52 UTC
|
||||
+++ cc/trees/property_tree.cc
|
||||
@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
|
||||
@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
|
||||
|
||||
gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
|
||||
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
|
||||
|
||||
- gfx::ScrollOffset max_offset(
|
||||
+ gfx::ScrollOffset _max_offset(
|
||||
@ -17,4 +17,4 @@
|
||||
+ return _max_offset;
|
||||
}
|
||||
|
||||
void ScrollTree::OnScrollOffsetAnimated(int layer_id,
|
||||
gfx::SizeF ScrollTree::scroll_bounds(int scroll_node_id) const {
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- chrome/app/chrome_command_ids.h.orig 2017-06-05 19:03:01 UTC
|
||||
--- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC
|
||||
+++ chrome/app/chrome_command_ids.h
|
||||
@@ -67,7 +67,7 @@
|
||||
@@ -63,7 +63,7 @@
|
||||
#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
|
||||
#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
||||
#define IDC_USE_SYSTEM_TITLE_BAR 34051
|
||||
#define IDC_RESTORE_WINDOW 34052
|
||||
#endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/app/chrome_main.cc.orig 2018-12-03 21:16:35.000000000 +0100
|
||||
+++ chrome/app/chrome_main.cc 2018-12-05 14:12:24.772160000 +0100
|
||||
@@ -93,11 +93,11 @@
|
||||
--- chrome/app/chrome_main.cc.orig 2019-03-11 22:00:52 UTC
|
||||
+++ chrome/app/chrome_main.cc
|
||||
@@ -93,11 +93,11 @@ int ChromeMain(int argc, const char** argv) {
|
||||
#endif
|
||||
|
||||
// Chrome-specific process modes.
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2019-01-30 02:17:41.000000000 +0100
|
||||
+++ chrome/app/chrome_main_delegate.cc 2019-02-06 19:21:07.067687000 +0100
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2019-03-11 22:00:52 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -101,7 +101,7 @@
|
||||
#include "chrome/app/shutdown_signal_handlers_posix.h"
|
||||
#endif
|
||||
@ -18,7 +18,7 @@
|
||||
#include "base/environment.h"
|
||||
#endif
|
||||
|
||||
@@ -235,7 +235,7 @@
|
||||
@@ -232,7 +232,7 @@ bool UseHooks() {
|
||||
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
@ -27,7 +27,16 @@
|
||||
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 @@
|
||||
@@ -291,7 +291,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
if (score > -1)
|
||||
base::AdjustOOMScore(base::GetCurrentProcId(), score);
|
||||
}
|
||||
-#endif // defined(OS_LINUX)
|
||||
+#endif // defined(OS_LINUX) && !defined(OS_BSD)
|
||||
|
||||
// Returns true if this subprocess type needs the ResourceBundle initialized
|
||||
// and resources loaded.
|
||||
@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -36,7 +45,7 @@
|
||||
// Show the man page if --help or -h is on the command line.
|
||||
void HandleHelpSwitches(const base::CommandLine& command_line) {
|
||||
if (command_line.HasSwitch(switches::kHelp) ||
|
||||
@@ -349,7 +349,7 @@
|
||||
@@ -346,7 +346,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
PLOG(FATAL) << "execlp failed";
|
||||
}
|
||||
}
|
||||
@ -45,7 +54,7 @@
|
||||
|
||||
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
@@ -403,7 +403,7 @@
|
||||
@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -54,7 +63,25 @@
|
||||
// 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 @@
|
||||
@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
|
||||
}
|
||||
}
|
||||
-#endif // OS_LINUX
|
||||
+#endif // OS_LINUX || OS_BSD
|
||||
#if defined(OS_MACOSX)
|
||||
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
|
||||
#endif // OS_MAC
|
||||
@@ -469,7 +469,7 @@ void InitLogging(const std::string& process_type) {
|
||||
void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
|
||||
if (!exe_entry_point_ticks.is_null())
|
||||
startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
|
||||
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
|
||||
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
// Record the startup process creation time on supported platforms.
|
||||
startup_metric_utils::RecordStartupProcessCreationTime(
|
||||
base::Process::Current().CreationTime());
|
||||
@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
*exit_code = 0;
|
||||
return true; // Got a --version switch; exit with a success error code.
|
||||
}
|
||||
@ -63,7 +90,7 @@
|
||||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -609,7 +609,7 @@
|
||||
@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
#if defined(OS_CHROMEOS)
|
||||
chromeos::RegisterPathProvider();
|
||||
#endif
|
||||
@ -72,7 +99,7 @@
|
||||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -925,7 +925,7 @@
|
||||
@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
InitializePDF();
|
||||
#endif
|
||||
|
||||
@ -81,7 +108,7 @@
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != service_manager::switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -941,7 +941,7 @@
|
||||
@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
breakpad::InitCrashReporter(process_type);
|
||||
#endif // defined(OS_ANDROID)
|
||||
}
|
||||
@ -90,7 +117,7 @@
|
||||
|
||||
// After all the platform Breakpads have been initialized, store the command
|
||||
// line for crash reporting.
|
||||
@@ -951,7 +951,7 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- chrome/app/chromium_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100
|
||||
+++ chrome/app/chromium_strings.grd 2019-02-12 16:28:22.555513000 +0100
|
||||
@@ -797,7 +797,7 @@
|
||||
--- chrome/app/chromium_strings.grd.orig 2019-03-11 22:00:52 UTC
|
||||
+++ chrome/app/chromium_strings.grd
|
||||
@@ -809,7 +809,7 @@ Signing in anyway will merge Chromium information like
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
@ -9,7 +9,7 @@
|
||||
<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 @@
|
||||
@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
|
||||
</message>
|
||||
|
||||
<!-- Plugin Placeholders -->
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/app/generated_resources.grd.orig 2018-11-19 19:55:02.000000000 +0100
|
||||
+++ chrome/app/generated_resources.grd 2018-12-04 14:09:27.327735000 +0100
|
||||
@@ -5265,7 +5265,7 @@
|
||||
--- chrome/app/generated_resources.grd.orig 2019-03-11 22:00:52 UTC
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -5339,7 +5339,7 @@ the Bookmarks menu.">
|
||||
</message>
|
||||
</if>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<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>
|
||||
@@ -6117,7 +6117,7 @@
|
||||
@@ -6160,7 +6160,7 @@ the Bookmarks menu.">
|
||||
Google Pay
|
||||
</message>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
|
||||
Use system title bar and borders
|
||||
</message>
|
||||
@@ -6942,7 +6942,7 @@
|
||||
@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user