diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 414296ca4bbd..c0b399ea19ef 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -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} diff --git a/www/chromium/distinfo b/www/chromium/distinfo index d0793b1d8fe8..4488231e0aac 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -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 diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 7f469754bb19..7ae5fbc5b6c4 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -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("", 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(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(NULL))); + .WillRepeatedly(Return(static_cast(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::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), @@ -48,19 +48,19 @@ + static_cast(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(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } -@@ -563,7 +563,7 @@ +@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD : CMapTable::CMap::Builder(data ? down_cast( 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( 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* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(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(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } - + diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 1d5eff6a4857..a3a254dc8c72 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -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" ] diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index fc573f16a19b..c7e90fe87c3f 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,4 +1,4 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 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( diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 03fc836a74a3..bab80417a026 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -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); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 43f058c75c70..fe66632d5301 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 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 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) } diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc index ec8cc2627508..29953f7af98a 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc @@ -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( diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index 7b1ac77664ac..af63d279da53 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 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. diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index ee8a83648df9..fc9a47bd3daf 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 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 diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index f51926bd0edf..ecab203687b6 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -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(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(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); diff --git a/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc similarity index 75% rename from www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc rename to www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc index 019c2a8b8b09..cd1d34f21771 100644 --- a/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc @@ -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(address) & align_offset_mask)); diff --git a/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h similarity index 84% rename from www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h rename to www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 69151e2761e2..853a5c49dcb1 100644 --- a/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,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 @@ -9,7 +9,7 @@ #include #include -@@ -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)); diff --git a/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc b/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc deleted file mode 100644 index c4e9d624c6af..000000000000 --- a/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc +++ /dev/null @@ -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 diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 4eb799c2d27a..277dc8eb3238 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -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; diff --git a/www/chromium/files/patch-base_debug_elf_reader_linux.cc b/www/chromium/files/patch-base_debug_elf__reader__linux.cc similarity index 71% rename from www/chromium/files/patch-base_debug_elf_reader_linux.cc rename to www/chromium/files/patch-base_debug_elf__reader__linux.cc index c532de97e0cc..b0e23be85bc6 100644 --- a/www/chromium/files/patch-base_debug_elf_reader_linux.cc +++ b/www/chromium/files/patch-base_debug_elf__reader__linux.cc @@ -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 ElfSegmentBuildIDNoteAsString(co const void* section_end = segment.data() + segment.size_bytes(); const Nhdr* note_header = reinterpret_cast(segment.data()); while (note_header < section_end) { diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index 9eded9c2f218..d01a104d5413 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,4 +1,4 @@ ---- base/debug/proc_maps_linux.cc.orig 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" diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc new file mode 100644 index 000000000000..8d2156f365ff --- /dev/null +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -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 + #include "base/process/process_handle.h" + #include "base/threading/platform_thread.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index c7cc7169d472..415d73c63d02 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.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" diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index c7f4c8235310..b4db467db920 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -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 #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 diff --git a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc deleted file mode 100644 index 3e3a6eadd277..000000000000 --- a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc +++ /dev/null @@ -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 - #else - #include -+#endif - #endif - - namespace base { diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index a0c6dcdd6524..1b23810f1b9d 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -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" }, }; diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index 3b88d7a9fc62..d5712de7a389 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 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_ diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc index cba69a675117..c5e3e567015b 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc @@ -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 { diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index e011562c7fca..875d768c6198 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 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()); diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 1027e7be6f85..171e3d8786ec 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 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); diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc new file mode 100644 index 000000000000..1cfb136f5576 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -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]; diff --git a/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc b/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc similarity index 70% rename from www/chromium/files/patch-base_files_memory_mapped_file_posix.cc rename to www/chromium/files/patch-base_files_memory__mapped__file__posix.cc index e81ed7ae1746..7ebabeead36b 100644 --- a/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc +++ b/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc @@ -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; diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 22780040969d..80e0544ed35b 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -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. diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 1d8fc3e57e5d..c36197ce5d6a 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -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"; diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 8cd0a56dcf8a..53f299987dca 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 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(info->si_addr); #else // OS_POSIX && !OS_MACOSX - struct ucontext* context = reinterpret_cast(context_ptr); + ucontext_t* context = reinterpret_cast(context_ptr); diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index a853d1d48eff..ba6a16756b10 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 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; diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc index 7e769d4b5b7a..f76c5f8fd986 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -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 diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h new file mode 100644 index 000000000000..cd48c1a24031 --- /dev/null +++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h @@ -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) diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc index bf4cad6851c7..3b13c89d4813 100644 --- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc +++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc @@ -1,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; diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 31324d592776..8820cb063006 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -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 #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) { diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc index aaf58fc27d17..0336334a6583 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,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 #include diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index 4ce388e4281f..ca42b91c4296 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,6 +1,6 @@ ---- base/process/internal_linux.cc.orig 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; diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index eabb22e70f33..ba0e347dbe91 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 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 @@ diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index b8da5df6eb71..800bfe47cb6c 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -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); diff --git a/www/chromium/files/patch-base_process_kill_posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc similarity index 59% rename from www/chromium/files/patch-base_process_kill_posix.cc rename to www/chromium/files/patch-base_process_kill__posix.cc index 0f24fdcd8226..12caf81e5eab 100644 --- a/www/chromium/files/patch-base_process_kill_posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -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))); } diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 35a223e5b8bd..bd174cd496bc 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 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; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 5489c617f639..c1b9c706ab46 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -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. diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index aa764c11b69e..8c88a282881d 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -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 diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index d2c40dbbc6a2..f8e1d34c369d 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -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. diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 0afe6514d370..89dbdbcbba11 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -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); diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 6b27c52005f2..b858c9e73024 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -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); } diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 5ba037371727..52c9f6102254 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,6 +1,6 @@ ---- base/process/process_handle.cc.orig 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; } diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index a445193a491d..976217dea9ad 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -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(); diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index e02b802778fd..13a07c3075fd 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -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)) diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index 357ce1033d2b..a89546ccb49d 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -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 #include @@ -9,18 +9,18 @@ +#include + #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; diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index 94c232e5b506..b385b7c7908a 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -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; } diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc new file mode 100644 index 000000000000..e7669ac0afe0 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -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( diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index e0bfd5d880de..e802ac53ea1d 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -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 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) diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 6ffd425658af..ece7783ef208 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -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::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 diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 06aa8b4509ad..acde968b71f8 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -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 #endif -@@ -107,7 +109,7 @@ +@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() { #else return minfo.hblkhd + minfo.arena; #endif diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc new file mode 100644 index 000000000000..3e5aac5b4da7 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -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. diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index b1d245a6f975..3c21942cb31d 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,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 #include #include diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 46151b561d17..3131d65c8d40 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -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) { diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index 450c86a19974..67312e70a631 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -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; + } diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index a1134b9cfedf..3147b0da5500 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -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>:: 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"; diff --git a/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc b/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc similarity index 77% rename from www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc rename to www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc index 9dc1b91d8f19..022b9c6da63c 100644 --- a/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc +++ b/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc @@ -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); } diff --git a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc index 8e9a6e2d76a8..8f0f114e6c7a 100644 --- a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc +++ b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc @@ -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. diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 2aa96398d644..4f76312eca8f 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 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) diff --git a/www/chromium/files/patch-base_test_test__file__util__linux.cc b/www/chromium/files/patch-base_test_test__file__util__linux.cc index 161252128ad2..76dce43e7393 100644 --- a/www/chromium/files/patch-base_test_test__file__util__linux.cc +++ b/www/chromium/files/patch-base_test_test__file__util__linux.cc @@ -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; diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index 7ff08d5fc353..973f405b9184 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,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) diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index b02b2a11a816..67042d6ca3e5 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -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" ] diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index 85bdf78aadcb..b234740a6dd7 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -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(); diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index 55adb6ec47c4..78123188b58a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -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 #include #include -@@ -99,7 +101,7 @@ +@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN Optional 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 GetCurrentThreadPriorityForPl void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 936d327d8a47..e2681e175e63 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -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); diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index e6f1289f01f1..d390e812f5e3 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 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 @@ -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 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 diff --git a/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc similarity index 68% rename from www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc rename to www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 2b39eae715be..f8c73c611a35 100644 --- a/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,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 #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. diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 55db4ea49976..6624e1d04af6 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 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 vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.h b/www/chromium/files/patch-base_trace__event_process__memory__dump.h index fef22583380e..1ae1b93e6409 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.h +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.h @@ -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 diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 7d2ec3bde8dc..432594251e67 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -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", ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index 86fedf3ea6b0..92b0373dfb03 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 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 - # ============================================================================= diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni index d963319c4622..49c04a7928c4 100644 --- a/www/chromium/files/patch-build_config_allocator.gni +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -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 && diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index b79fed03d255..00964ebeb5f6 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 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" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 69fd3e05897a..9de88b63a2de 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -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" || diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index 89de733794c0..2fe94bdc8b84 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -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 diff --git a/www/chromium/files/patch-build_config_freetype_freetype.gni b/www/chromium/files/patch-build_config_freetype_freetype.gni new file mode 100644 index 000000000000..17bed01510f8 --- /dev/null +++ b/www/chromium/files/patch-build_config_freetype_freetype.gni @@ -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 + } diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn index 8622d398e2d8..94faef049b08 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/linux/BUILD.gn.orig 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") && diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index f8a75c937b02..bac7de0165ef 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- build/config/linux/pkg-config.py.orig 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." diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni index 04c1d2026514..83a58cad544a 100644 --- a/www/chromium/files/patch-build_config_sysroot.gni +++ b/www/chromium/files/patch-build_config_sysroot.gni @@ -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" diff --git a/www/chromium/files/patch-build_gn_run_binary.py b/www/chromium/files/patch-build_gn__run__binary.py similarity index 50% rename from www/chromium/files/patch-build_gn_run_binary.py rename to www/chromium/files/patch-build_gn__run__binary.py index f1dfcd53ca79..2b7f4a526104 100644 --- a/www/chromium/files/patch-build_gn_run_binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -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 diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map index 59d983b7963f..7465bc9773c5 100644 --- a/www/chromium/files/patch-build_linux_chrome.map +++ b/www/chromium/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 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 @@ { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index e5e16cabaa0c..86373b5ebf39 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,4 +1,4 @@ ---- build/linux/libpci/BUILD.gn.orig 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. diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn index 55c6dbb7f971..1cc0b00012c6 100644 --- a/www/chromium/files/patch-build_linux_unbundle_libusb.gn +++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn @@ -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 diff --git a/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py similarity index 63% rename from www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py rename to www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index 5dd7a9d2391a..ca2d4fd5e12e 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,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', diff --git a/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni similarity index 84% rename from www/chromium/files/patch-build_toolchain_gcc_toolchain.gni rename to www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 9a32190d6ad9..ffd043fda652 100644 --- a/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -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) { diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index 925ab0611e83..6e50c94426cd 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -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 diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index 65cc0174d610..ab029144a6c4 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -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") { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 479bb03e0142..57edb8265544 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 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", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 481776ba30d1..2b91b797f84d 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,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; diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 549b1400f3a2..1b68ad522dde 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -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 { diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index e18cc4fc4e8d..68fb11092810 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -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 - diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 48d20e66bc65..b06ed0963bd0 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 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. diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 9d2935fdda71..eeb5aaedaec0 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -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. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index e4ba488305d1..83661fcf6838 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 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 @@ -9,7 +9,7 @@ The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. -@@ -1042,7 +1042,7 @@ +@@ -1057,7 +1057,7 @@ Please check your email at $2 diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 5867c9799fbb..ba62605775c3 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 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."> @@ -9,7 +9,7 @@ Press |$1Ctrl|+|$2Shift| followed by |$3Q| to exit -@@ -6117,7 +6117,7 @@ +@@ -6160,7 +6160,7 @@ the Bookmarks menu."> Google Pay @@ -18,7 +18,7 @@ Use system title bar and borders -@@ -6942,7 +6942,7 @@ +@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh Set as default diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index ea8b10e868ef..064f31b18f22 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100 -+++ chrome/app/google_chrome_strings.grd 2019-02-12 16:29:36.841110000 +0100 -@@ -808,7 +808,7 @@ +--- chrome/app/google_chrome_strings.grd.orig 2019-03-11 22:00:52 UTC ++++ chrome/app/google_chrome_strings.grd +@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b @@ -9,7 +9,7 @@ The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. -@@ -1060,7 +1060,7 @@ +@@ -1075,7 +1075,7 @@ Please check your email at $2 diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index c22ac4530096..44c1a7bd1c46 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2017-12-15 02:04:07.000000000 +0100 -+++ chrome/app/settings_strings.grdp 2017-12-24 00:15:33.402792000 +0100 -@@ -363,7 +363,7 @@ +--- chrome/app/settings_strings.grdp.orig 2019-03-11 22:00:52 UTC ++++ chrome/app/settings_strings.grdp +@@ -580,7 +580,7 @@ Themes @@ -9,7 +9,7 @@ GTK+ -@@ -377,7 +377,7 @@ +@@ -594,7 +594,7 @@ Use Classic diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index 32263aaec6fd..a68c54c98713 100644 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,6 +1,6 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-12 22:56:02.000000000 +0100 -+++ chrome/app/shutdown_signal_handlers_posix.cc 2019-01-13 01:50:13.594124000 +0100 -@@ -183,12 +183,18 @@ +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-03-11 22:00:52 UTC ++++ chrome/app/shutdown_signal_handlers_posix.cc +@@ -183,12 +183,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; diff --git a/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd similarity index 70% rename from www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd rename to www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index fe027914c308..d8702ebfc748 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2017-09-07 19:07:10.298267000 +0200 -+++ chrome/app/theme/chrome_unscaled_resources.grd 2017-09-07 19:07:26.024168000 +0200 -@@ -80,7 +80,7 @@ +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC ++++ chrome/app/theme/chrome_unscaled_resources.grd +@@ -100,7 +100,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 12c67093acff..edd420c43ba8 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,15 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2019-01-30 02:17:44.000000000 +0100 -+++ chrome/browser/about_flags.cc 2019-01-31 22:07:28.598255000 +0100 -@@ -832,7 +832,7 @@ +--- chrome/browser/about_flags.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/about_flags.cc +@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050, base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}}; -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = { - {autofill::kAutofillForcedFontWeightParameterName, - autofill::kAutofillForcedFontWeightParameterMedium}, -@@ -859,7 +859,7 @@ + const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = { + {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}}; + const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = { +@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV {"Dedicated Suggestion Line", kPedalSuggestionDedicated, base::size(kPedalSuggestionDedicated), nullptr}, }; @@ -18,7 +18,7 @@ const FeatureEntry::Choice kAutoplayPolicyChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -2497,12 +2497,12 @@ +@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -33,9 +33,9 @@ {"enable-origin-trials", flag_descriptions::kOriginTrialsName, flag_descriptions::kOriginTrialsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -2696,12 +2696,12 @@ - FEATURE_VALUE_TYPE( - password_manager::features::kPasswordsKeyboardAccessory)}, +@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, + #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) @@ -48,25 +48,25 @@ {"enable-experimental-accessibility-features", flag_descriptions::kExperimentalAccessibilityFeaturesName, flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -3127,7 +3127,7 @@ - flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, +@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)}, + #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-new-answer-layout", - flag_descriptions::kOmniboxNewAnswerLayoutName, - flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop, -@@ -3156,7 +3156,7 @@ + {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName, + flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)}, +@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxDriveSuggestionsName, flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - #if defined(OS_ANDROID) - {"enable-custom-feedback-ui", -@@ -3449,7 +3449,7 @@ + {"enable-speculative-service-worker-start-on-query-input", + flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, +@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -75,7 +75,7 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -3460,7 +3460,7 @@ +@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kShowManagedUiDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(features::kShowManagedUi)}, @@ -84,43 +84,7 @@ #if defined(OS_ANDROID) {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName, -@@ -3897,7 +3897,7 @@ - flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll, - FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)}, - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"autofill-primary-info-style", - flag_descriptions::kAutofillPrimaryInfoStyleExperimentName, - flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription, -@@ -3906,7 +3906,7 @@ - autofill::kAutofillPrimaryInfoStyleExperiment, - kAutofillPrimaryInfoStyleVariations, - "AutofillPrimaryInfoStyleExperiment")}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - {"autofill-enable-company-name", - flag_descriptions::kAutofillEnableCompanyNameName, -@@ -4001,7 +4001,7 @@ - flag_descriptions::kExperimentalProductivityFeaturesDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kExperimentalProductivityFeatures)}, - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName, - flag_descriptions::kNtpBackgroundsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kNtpBackgrounds)}, -@@ -4017,7 +4017,7 @@ - {"ntp-ui-md", flag_descriptions::kNtpUIMdName, - flag_descriptions::kNtpUIMdDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kNtpUIMd)}, --#endif // OS_WIN || OS_MACOSX || OS_LINUX -+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) - - #if defined(OS_ANDROID) - {"enable-display-cutout-api", flag_descriptions::kDisplayCutoutAPIName, -@@ -4468,7 +4468,7 @@ +@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) @@ -129,12 +93,28 @@ {"autofill-always-show-server-cards-in-sync-transport", flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, flag_descriptions:: -@@ -4476,7 +4476,7 @@ +@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsLinux, FEATURE_VALUE_TYPE( autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - }; - class FlagsStateSingleton { + #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) + {"enable-custom-mac-paper-sizes", +@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, + #endif // OS_CHROMEOS + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"autofill-settings-split-by-card-type", + flag_descriptions::kAutofillSettingsSplitByCardTypeName, + flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, + kOsMac | kOsWin | kOsLinux, + FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + {"hardware-media-key-handling", diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index 744be8d89266..c59df4a0b8de 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-01-30 02:17:44.000000000 +0100 -+++ chrome/browser/after_startup_task_utils.cc 2019-01-31 22:15:46.765158000 +0100 -@@ -110,7 +110,7 @@ +--- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/after_startup_task_utils.cc +@@ -29,7 +29,7 @@ + #include "content/public/browser/web_contents.h" + #include "content/public/browser/web_contents_observer.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -9,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -118,7 +118,7 @@ +@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -18,3 +27,12 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); +@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { + g_after_startup_tasks.Get().clear(); + g_after_startup_tasks.Get().shrink_to_fit(); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Make sure we complete the startup notification sequence, or launchers will + // get confused by not receiving the expected message from the main process. + views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc similarity index 91% rename from www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc rename to www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc index 8ded81833cff..882f1f84adde 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,5 +1,5 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2018-12-05 14:44:06.182927000 +0100 -+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc 2018-12-05 15:28:09.650594000 +0100 +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h" @@ -12,7 +12,7 @@ #include #include #include -@@ -104,9 +109,36 @@ +@@ -105,9 +110,36 @@ class MacAddressProcessor { const char* const prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -49,7 +49,7 @@ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); -@@ -118,11 +150,18 @@ +@@ -119,11 +151,18 @@ class MacAddressProcessor { const char* mac_address = static_cast(ifinfo.ifr_hwaddr.sa_data); diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc similarity index 80% rename from www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc rename to www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 564a3f44e689..e9475b6ef063 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-01-09 12:28:40.004958000 +0100 -+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc 2019-01-09 12:28:54.516042000 +0100 -@@ -59,7 +59,7 @@ +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +@@ -59,7 +59,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { diff --git a/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc similarity index 76% rename from www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc rename to www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc index 9e6f44cac295..de595924ceb4 100644 --- a/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2017-09-07 23:33:41.430876000 +0200 -+++ chrome/browser/background/background_mode_optimizer.cc 2017-09-07 23:34:04.189439000 +0200 -@@ -30,10 +30,10 @@ +--- chrome/browser/background/background_mode_optimizer.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/background/background_mode_optimizer.cc +@@ -30,10 +30,10 @@ std::unique_ptr BackgroundMod switches::kKeepAliveForTest)) return nullptr; diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc deleted file mode 100644 index 38c4b692880a..000000000000 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/browser_process_impl.cc.orig 2019-02-12 16:31:58.701630000 +0100 -+++ chrome/browser/browser_process_impl.cc 2019-02-12 16:32:33.417312000 +0100 -@@ -1485,7 +1485,7 @@ - } - - // Mac is currently not supported. --#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - - bool BrowserProcessImpl::IsRunningInBackground() const { - // Check if browser is in the background. -@@ -1555,4 +1555,4 @@ - } - } - --#endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h deleted file mode 100644 index 78b07d3f6c9c..000000000000 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/browser_process_impl.h.orig 2019-02-12 16:33:04.676012000 +0100 -+++ chrome/browser/browser_process_impl.h 2019-02-12 16:33:35.429453000 +0100 -@@ -367,7 +367,7 @@ - std::unique_ptr - resource_dispatcher_host_delegate_; - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - base::RepeatingTimer autoupdate_timer_; - - // Gets called by autoupdate timer to see if browser needs restart and can be -@@ -376,7 +376,7 @@ - bool IsRunningInBackground() const; - void OnPendingRestartResult(bool is_update_pending_restart); - void RestartBackgroundInstance(); --#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - // component updater is normally not used under ChromeOS due - // to concerns over integrity of data shared between profiles, diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index c3bd477966d3..18889e38aa1e 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200 -@@ -634,7 +634,7 @@ +--- chrome/browser/browser_resources.grd.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/browser_resources.grd +@@ -679,7 +679,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index ee7ee8bba223..95d001b3ae64 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-02-06 23:06:37.000000000 +0100 -+++ chrome/browser/chrome_browser_main.cc 2019-02-12 20:03:14.042579000 +0100 -@@ -216,7 +216,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/chrome_browser_main.cc +@@ -217,7 +217,7 @@ #include "chromeos/settings/cros_settings_names.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -256,7 +256,7 @@ +@@ -257,7 +257,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -1059,7 +1059,7 @@ +@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -27,7 +27,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1068,14 +1068,14 @@ +@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -45,7 +45,7 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1099,7 +1099,7 @@ +@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -54,7 +54,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1279,6 +1279,7 @@ +@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -62,7 +62,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); BrowserThread::PostAfterStartupTask( -@@ -1287,6 +1288,7 @@ +@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index c177b0adfdaf..45b21faf7412 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2018-12-03 21:16:38.000000000 +0100 -+++ chrome/browser/chrome_browser_main_linux.cc 2018-12-05 14:26:26.555958000 +0100 -@@ -90,12 +90,14 @@ +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/chrome_browser_main_linux.cc +@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -16,7 +16,7 @@ bluez::BluezDBusThreadManager::Initialize(); bluez::BluezDBusManager::Initialize(); #endif -@@ -104,7 +106,7 @@ +@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index 39a217d83346..f5bb295e5563 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -142,7 +142,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index f09816bce69c..c6392dbbb473 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-01-30 02:17:44.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2019-02-06 22:10:31.368688000 +0100 -@@ -367,7 +367,7 @@ - #include "chromeos/services/secure_channel/secure_channel_service.h" +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/chrome_content_browser_client.cc +@@ -395,7 +395,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" + #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -412,11 +412,11 @@ +@@ -441,11 +441,11 @@ #include "components/services/patch/public/interfaces/constants.mojom.h" #endif @@ -23,7 +23,7 @@ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -431,7 +431,7 @@ +@@ -462,7 +462,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -32,7 +32,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -1101,7 +1101,7 @@ +@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos( parameters, chrome_feature_list_creator_); @@ -41,7 +41,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); #elif defined(OS_ANDROID) -@@ -1121,7 +1121,7 @@ +@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -50,16 +50,16 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1913,7 +1913,7 @@ +@@ -1956,7 +1956,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) - if (breakpad::IsCrashReporterEnabled()) { - std::string switch_value; - std::unique_ptr client_info = -@@ -3474,7 +3474,7 @@ + #if defined(OS_ANDROID) + bool enable_crash_reporter = true; + #else +@@ -3550,7 +3550,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -68,16 +68,16 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4207,7 +4207,7 @@ - if (previews_lite_page_throttle) - throttles.push_back(std::move(previews_lite_page_throttle)); +@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + handle)); + } -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) std::unique_ptr browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: -@@ -4328,7 +4328,7 @@ +@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); @@ -86,3 +86,12 @@ frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create)); #endif +@@ -5047,7 +5047,7 @@ std::unique_ptr + ChromeContentBrowserClient::CreateWindowForPictureInPicture( + content::PictureInPictureWindowController* controller) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) ++ defined(OS_CHROMEOS) || defined(OS_BSD) + // Note: content::OverlayWindow::Create() is defined by platform-specific + // implementation in chrome/browser/ui/views. This layering hack, which goes + // through //content and ContentBrowserClient, allows us to work around the diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 70e8ec6942f9..1a82d82e685c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,9 +1,9 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.h 2018-07-14 14:13:02.407023000 +0200 -@@ -299,12 +299,12 @@ +--- chrome/browser/chrome_content_browser_client.h.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/chrome_content_browser_client.h +@@ -363,12 +363,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, - blink::mojom::PageVisibilityState* visibility_state) override; + content::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc new file mode 100644 index 000000000000..7fcec9bf2916 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -0,0 +1,11 @@ +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-03-17 19:35:08 UTC ++++ chrome/browser/custom_handlers/protocol_handler_registry.cc +@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler( + // If true default protocol handlers will be removed if the OS level + // registration for a protocol is no longer Chrome. + bool ShouldRemoveHandlersNotInOS() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // We don't do this on Linux as the OS registration there is not reliable, + // and Chrome OS doesn't have any notion of OS registration. + // TODO(benwells): When Linux support is more reliable remove this diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 096ac2cfbef2..4cf8684d29d3 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,6 +1,6 @@ ---- chrome/browser/defaults.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/defaults.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/defaults.cc -@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true; +@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true; const bool kSyncAutoStarts = false; #endif diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc similarity index 59% rename from www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc rename to www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index 528f4509d309..e5313498ca62 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2017-08-01 23:43:54.195876000 +0200 -+++ chrome/browser/devtools/devtools_eye_dropper.cc 2017-08-01 23:44:16.153565000 +0200 -@@ -149,7 +149,7 @@ +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/devtools/devtools_eye_dropper.cc +@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index 603a75e140e4..e77c2c353dd8 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,6 +1,6 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2019-01-03 21:12:30.399407000 +0100 -+++ chrome/browser/diagnostics/diagnostics_writer.h 2019-01-03 21:12:49.905049000 +0100 -@@ -15,6 +15,8 @@ +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/diagnostics/diagnostics_writer.h +@@ -15,6 +15,8 @@ namespace diagnostics { // Console base class used internally. class SimpleConsole; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index a7d6d5111351..3b529f47fd37 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/download/chrome_download_manager_delegate.cc 2017-12-24 00:58:48.284663000 +0100 -@@ -882,7 +882,7 @@ +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/chrome_download_manager_delegate.cc +@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -902,7 +902,7 @@ +@@ -1251,7 +1251,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index caeb17150ff7..3b12bd740133 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2018-12-03 21:16:39.000000000 +0100 -+++ chrome/browser/download/download_commands.cc 2018-12-05 14:35:24.756358000 +0100 -@@ -220,7 +220,7 @@ +--- chrome/browser/download/download_commands.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_commands.cc +@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const { return browser_displayer.browser(); } @@ -9,7 +9,7 @@ bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = model_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -237,7 +237,7 @@ +@@ -175,7 +175,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index dbe84337d047..ad92f02380b9 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2017-09-05 21:05:12.000000000 +0200 -+++ chrome/browser/download/download_commands.h 2017-09-06 18:02:40.537871000 +0200 -@@ -42,7 +42,7 @@ +--- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_commands.h +@@ -42,7 +42,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index b4a77c70207e..48d6fd2a1ade 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-02-06 22:12:34.810575000 +0100 -+++ chrome/browser/download/download_item_model.cc 2019-02-06 22:13:05.192798000 +0100 -@@ -555,7 +555,7 @@ +--- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_item_model.cc +@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -592,7 +592,7 @@ +@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index 0ca716d8ef5a..2edbf1a66894 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/download/download_prefs.cc 2017-12-24 01:04:45.230590000 +0100 -@@ -56,7 +56,7 @@ +--- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_prefs.cc +@@ -62,7 +62,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -135,7 +135,7 @@ +@@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -219,7 +219,7 @@ +@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -26,8 +26,8 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif - } -@@ -302,7 +302,7 @@ + #if defined(OS_ANDROID) +@@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -316,7 +316,7 @@ +@@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -353,7 +353,7 @@ +@@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -54,7 +54,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -374,7 +374,7 @@ +@@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index fb35df5dcdc1..f6cc56e59c6a 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/download/download_prefs.h.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/download/download_prefs.h -@@ -78,7 +78,7 @@ class DownloadPrefs { +@@ -101,7 +101,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -109,7 +109,7 @@ class DownloadPrefs { +@@ -145,7 +145,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index b7bc9b8160b6..be6e0537adfc 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,5 +1,5 @@ ---- chrome/browser/download/download_query.cc.orig 2018-06-13 00:10:05.000000000 +0200 -+++ chrome/browser/download/download_query.cc 2018-07-15 13:01:15.987418000 +0200 +--- chrome/browser/download/download_query.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_query.cc @@ -27,7 +27,11 @@ #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index d8d342fddee0..a806727be63b 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/download/download_shelf_context_menu.cc @@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; diff --git a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc index db4acbe84cf1..4324a56b1770 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc @@ -1,5 +1,5 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2018-06-13 00:10:05.000000000 +0200 -+++ chrome/browser/download/download_status_updater.cc 2018-07-15 13:07:15.012034000 +0200 +--- chrome/browser/download/download_status_updater.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/download/download_status_updater.cc @@ -13,7 +13,7 @@ #include "base/memory/ptr_util.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -136,7 +136,7 @@ +@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(content: #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) void DownloadStatusUpdater::UpdateAppIconDownloadProgress( download::DownloadItem* download) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 4a083e77eb03..f975a399234e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/extensions/BUILD.gn 2017-12-30 01:58:47.411895000 +0100 -@@ -1117,6 +1117,12 @@ - defines += [ "ENABLE_HOTWORDING" ] +--- chrome/browser/extensions/BUILD.gn.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/BUILD.gn +@@ -1104,6 +1104,12 @@ jumbo_static_library("extensions") { + deps += [ "//chrome/common:service_process_mojom" ] } + if (is_bsd) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 6e77c6f548b7..5ed7b851190f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -50,7 +50,11 @@ +@@ -52,7 +52,11 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "extensions/common/one_shot_event.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc similarity index 73% rename from www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc rename to www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 274b1bcda1d4..556750be0ff6 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2018-01-03 17:00:05.332673000 +0100 -+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc 2018-01-03 17:01:00.459066000 +0100 -@@ -20,6 +20,7 @@ +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc +@@ -20,6 +20,7 @@ static base::LazyInstancePostTask( FROM_HERE, -@@ -33,6 +34,9 @@ +@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h index 2983ece57d61..1cb62fbbfdce 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h +++ b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/extensions/api/input_ime/input_ime_api.h -@@ -28,7 +28,7 @@ +@@ -31,7 +31,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 70f92733e5c8..8a6dfbb8c87b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -278,6 +278,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -296,6 +296,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 08ad6d0318a1..bf8482ac98e5 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2018-03-20 23:05:17.000000000 +0100 -+++ chrome/browser/extensions/api/settings_private/prefs_util.cc 2018-03-24 13:17:26.753666000 +0100 -@@ -102,7 +102,7 @@ +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/api/settings_private/prefs_util.cc +@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -112,7 +112,7 @@ +@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc index cd7b7568b230..2f5e80399717 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-01-30 02:17:45.000000000 +0100 -+++ chrome/browser/extensions/bookmark_app_helper.cc 2019-01-31 22:27:52.602150000 +0100 -@@ -497,7 +497,7 @@ +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/bookmark_app_helper.cc +@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten if (create_shortcuts_) { #if !defined(OS_CHROMEOS) web_app::ShortcutLocations creation_locations; diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 965d8bd1b95b..64894bbb4afd 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-01-30 02:17:45.000000000 +0100 -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2019-01-31 22:23:23.442216000 +0100 -@@ -55,7 +55,7 @@ +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc +@@ -54,7 +54,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -97,7 +97,7 @@ +@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 519e0cda310c..32893bff716f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2018-11-19 19:55:03.000000000 +0100 -+++ chrome/browser/extensions/external_provider_impl.cc 2018-12-04 15:09:57.567637000 +0100 -@@ -711,7 +711,7 @@ +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/extensions/external_provider_impl.cc +@@ -747,7 +747,7 @@ void ExternalProviderImpl::CreateExternalProviders( + chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } - -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - if (!profile->IsLegacySupervised()) { - provider_list->push_back(std::make_unique( - service, -@@ -739,7 +739,7 @@ + provider_list->push_back(std::make_unique( + service, + new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, +@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc b/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc new file mode 100644 index 000000000000..d64e09197a3f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc @@ -0,0 +1,18 @@ +--- chrome/browser/extensions/install_signer.cc.orig 2019-03-17 20:14:24 UTC ++++ chrome/browser/extensions/install_signer.cc +@@ -293,13 +293,13 @@ void LogRequestStartHistograms() { + DCHECK(g_single_thread_checker.Get().CalledOnValidThread()); + + // Process::Current().CreationTime is only defined on some platforms. +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + const base::Time process_creation_time = + base::Process::Current().CreationTime(); + UMA_HISTOGRAM_COUNTS_1M( + "ExtensionInstallSigner.UptimeAtTimeOfRequest", + (base::Time::Now() - process_creation_time).InSeconds()); +-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + base::TimeDelta delta; + base::TimeTicks now = base::TimeTicks::Now(); diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index 122267faeb00..3da7a1c2e1c4 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,16 +1,16 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/first_run/first_run_internal_posix.cc 2018-03-03 21:26:08.717035000 +0100 -@@ -34,7 +34,7 @@ - namespace internal { - namespace { +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/first_run/first_run_internal_posix.cc +@@ -44,7 +44,7 @@ enum class ForcedShowDialogState { + ForcedShowDialogState g_forced_show_dialog_state = + ForcedShowDialogState::kNotForced; -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -80,7 +80,7 @@ - } // namespace +@@ -95,7 +95,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { + } void DoPostImportPlatformSpecificTasks(Profile* profile) { -#if !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index a2bcb198d861..e7c43ca364b8 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2018-12-12 22:56:03.000000000 +0100 -+++ chrome/browser/flag_descriptions.cc 2018-12-28 16:55:56.434650000 +0100 -@@ -3555,13 +3555,13 @@ +--- chrome/browser/flag_descriptions.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/flag_descriptions.cc +@@ -3656,13 +3656,13 @@ const char kWakeOnPacketsDescription[] = // Random platform combinations ----------------------------------------------- @@ -16,7 +16,7 @@ #if defined(OS_WIN) || defined(OS_MACOSX) -@@ -3574,13 +3574,13 @@ +@@ -3675,13 +3675,13 @@ const char kAutomaticTabDiscardingDescription[] = #endif // defined(OS_WIN) || defined(OS_MACOSX) @@ -30,5 +30,5 @@ -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - const char kExperimentalUiName[] = "Use all upcoming UI features"; - const char kExperimentalUiDescription[] = "Use all upcoming UI features."; + #if defined(OS_MACOSX) || defined(OS_CHROMEOS) + diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 9f158272b478..19e70914fb72 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2018-12-12 22:56:03.000000000 +0100 -+++ chrome/browser/flag_descriptions.h 2018-12-28 16:55:56.425688000 +0100 -@@ -2167,12 +2167,12 @@ +--- chrome/browser/flag_descriptions.h.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/flag_descriptions.h +@@ -2192,12 +2192,12 @@ extern const char kWakeOnPacketsDescription[]; // Random platform combinations ----------------------------------------------- @@ -15,7 +15,7 @@ extern const char kExperimentalUiName[]; extern const char kExperimentalUiDescription[]; -@@ -2184,12 +2184,12 @@ +@@ -2209,12 +2209,12 @@ extern const char kAutomaticTabDiscardingDescription[] #endif // defined(OS_WIN) || defined(OS_MACOSX) @@ -28,5 +28,5 @@ -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // Feature flags -------------------------------------------------------------- + #if defined(OS_MACOSX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index f12c6abe6d66..d2e3a19c974f 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -38,10 +38,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index b222bbb0bdac..4b9563aa1359 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -734,7 +734,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc similarity index 86% rename from www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc rename to www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc index dd627d987980..c131ed5d1aa8 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc @@ -1,5 +1,5 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2017-09-10 01:42:30.124986000 +0200 -+++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc 2017-09-10 01:44:26.941752000 +0200 +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -10,6 +10,7 @@ #include #include @@ -17,8 +17,8 @@ #include #else #include -@@ -27,7 +28,7 @@ - +@@ -28,7 +29,7 @@ + namespace media_router { namespace { -#if !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc similarity index 67% rename from www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc rename to www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index 0c36572dff34..23a0d4544e24 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,5 +1,5 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2017-09-05 21:05:13.000000000 +0200 -+++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc 2017-09-10 03:43:00.933828000 +0200 +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc @@ -9,8 +9,6 @@ #include #include @@ -9,18 +9,19 @@ #include "base/files/scoped_file.h" #include "base/logging.h" #include "net/base/network_interfaces_linux.h" -@@ -18,6 +16,7 @@ +@@ -20,6 +18,7 @@ namespace media_router { bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); +#if !defined(OS_BSD) base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); - if (!ioctl_socket.is_valid()) - return false; -@@ -34,5 +33,6 @@ + if (!ioctl_socket.is_valid()) { + // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there +@@ -41,6 +40,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: ssid_out->assign(ssid); return true; } +#endif return false; } + diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc similarity index 77% rename from www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc rename to www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc index 99cc4aa5ab7b..1c9e21e9cfb2 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2018-12-12 22:56:03.000000000 +0100 -+++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc 2018-12-16 14:00:18.522246000 +0100 -@@ -111,6 +111,12 @@ +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc +@@ -111,6 +111,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool incognito, CreateRouteCallback callback) { DCHECK(!base::ContainsKey(presentations_, presentation_id)); @@ -13,7 +13,7 @@ base::Optional display = GetDisplayBySinkId(sink_id); if (!display) { std::move(callback).Run(base::nullopt, nullptr, -@@ -137,6 +143,7 @@ +@@ -137,6 +143,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( std::move(callback).Run(route, nullptr, base::nullopt, RouteRequestResult::OK); NotifyRouteObservers(); diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc similarity index 68% rename from www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc rename to www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 3a42fb397348..08060b059bc0 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2018-07-19 22:14:21.658215000 +0200 -+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc 2018-07-19 22:14:37.578585000 +0200 -@@ -51,7 +51,7 @@ +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +@@ -36,7 +36,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / const char kProduct[] = "Chrome"; #elif defined(OS_MACOSX) const char kProduct[] = "Chrome_Mac"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 4ad76ac610ec..c73fdba76494 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -343,6 +343,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc new file mode 100644 index 000000000000..b6a806a8fb58 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc @@ -0,0 +1,33 @@ +--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-03-17 20:01:28 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc +@@ -26,10 +26,10 @@ + #include "content/public/browser/content_browser_client.h" + #include "content/public/browser/render_process_host.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "content/public/browser/child_process_security_policy.h" + #include "storage/browser/fileapi/isolated_context.h" +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + using content::BrowserThread; + using webrtc_event_logging::WebRtcEventLogManager; +@@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging( + output_period_ms, web_app_id, callback); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void WebRtcLoggingHandlerHost::GetLogsDirectory( + const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback) { +@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces + FROM_HERE, {BrowserThread::UI}, + base::BindOnce(callback, filesystem_id, registered_name)); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD + + void WebRtcLoggingHandlerHost::OnRtpPacket( + std::unique_ptr packet_header, diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h new file mode 100644 index 000000000000..30fe4a793160 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h @@ -0,0 +1,36 @@ +--- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig 2019-03-17 20:00:30 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h +@@ -154,13 +154,13 @@ class WebRtcLoggingHandlerHost : public content::Brows + size_t web_app_id, + const StartEventLoggingCallback& callback); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Ensures that the WebRTC Logs directory exists and then grants render + // process access to the 'WebRTC Logs' directory, and invokes |callback| with + // the ids necessary to create a DirectoryEntry object. + void GetLogsDirectory(const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + private: + friend class content::BrowserThread; +@@ -227,7 +227,7 @@ class WebRtcLoggingHandlerHost : public content::Brows + bool success, + const std::string& error_message); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Grants the render process access to the 'WebRTC Logs' directory, and + // invokes |callback| with the ids necessary to create a DirectoryEntry + // object. If the |logs_path| couldn't be created or found, |error_callback| +@@ -236,7 +236,7 @@ class WebRtcLoggingHandlerHost : public content::Brows + const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback, + const base::FilePath& logs_path); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // The render process ID this object belongs to. + const int render_process_id_; diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 3abfd44bc04e..2c4302248909 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2018-08-01 00:08:30.000000000 +0200 -+++ chrome/browser/memory_details.cc 2018-08-04 14:30:27.145764000 +0200 -@@ -36,7 +36,7 @@ +--- chrome/browser/memory_details.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/memory_details.cc +@@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "services/service_manager/zygote/zygote_host_linux.h" #endif -@@ -341,7 +341,7 @@ +@@ -336,7 +336,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc index 4ac38bb3b945..1112bd81ffcc 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details_linux.cc.orig 2018-06-13 00:10:06.000000000 +0200 -+++ chrome/browser/memory_details_linux.cc 2018-07-20 00:12:53.799188000 +0200 -@@ -70,8 +70,10 @@ +--- chrome/browser/memory_details_linux.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/memory_details_linux.cc +@@ -72,8 +72,10 @@ ProcessData GetProcessDataMemoryInformation( std::unique_ptr metrics( base::ProcessMetrics::CreateProcessMetrics(pid)); diff --git a/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc b/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc new file mode 100644 index 000000000000..ab487829a64c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc @@ -0,0 +1,13 @@ +--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/metrics/bluetooth_available_utility.cc +@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() { + if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported()) + ReportAvailability(BLUETOOTH_NOT_SUPPORTED); + ++#if !defined(OS_BSD) + device::BluetoothAdapterFactory::Get().GetAdapter( + base::BindOnce(&OnGetAdapter)); ++#endif + } + + } // namespace bluetooth_utility diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 1723f2192dc4..bb0ba23c9542 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-09-05 21:05:13.000000000 +0200 -+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc 2017-09-06 18:21:57.565534000 +0200 -@@ -40,7 +40,9 @@ +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -44,7 +44,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -48,7 +50,7 @@ +@@ -52,7 +54,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif diff --git a/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc similarity index 68% rename from www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc rename to www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index f0610ac5ede5..dc2669b3a0cb 100644 --- a/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-01-09 22:09:37.510094000 +0100 -+++ chrome/browser/net/system_network_context_manager.cc 2019-01-09 22:10:30.828698000 +0100 -@@ -67,7 +67,7 @@ +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/net/system_network_context_manager.cc +@@ -69,12 +69,12 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,13 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" #include "chrome/grit/chromium_strings.h" -@@ -513,7 +513,7 @@ + #include "ui/base/l10n/l10n_util.h" +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + + namespace { + +@@ -519,7 +519,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea content::GetNetworkService()->ConfigureStubHostResolver( stub_resolver_enabled, std::move(dns_over_https_servers)); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 760bc7030d88..970ace424458 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,8 +1,8 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-12-15 02:04:09.000000000 +0100 -+++ chrome/browser/password_manager/chrome_password_manager_client.cc 2017-12-24 01:39:48.763209000 +0100 -@@ -67,7 +67,11 @@ - #include "google_apis/gaia/gaia_urls.h" - #include "net/base/url_util.h" +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/password_manager/chrome_password_manager_client.cc +@@ -80,7 +80,11 @@ + #include "net/cert/cert_status_flags.h" + #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" +#if defined(OS_BSD) +#include diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc similarity index 77% rename from www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc rename to www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index 4c5727f18749..fe2ef21d5d65 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-01-09 12:33:02.101317000 +0100 -+++ chrome/browser/password_manager/password_store_factory.cc 2019-01-09 12:33:45.948473000 +0100 -@@ -300,7 +300,7 @@ +--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/password_manager/password_store_factory.cc +@@ -300,7 +300,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60, network_context_getter); diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h index 89545d2b0b86..f5660041edd8 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util.h +++ b/www/chromium/files/patch-chrome_browser_platform__util.h @@ -1,4 +1,4 @@ ---- chrome/browser/platform_util.h.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/platform_util.h @@ -40,7 +40,7 @@ enum OpenOperationResult { enum OpenItemType { diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index fd931902f164..88dec33a15e3 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/plugins/plugins_resource_service.cc -@@ -59,7 +59,7 @@ GURL GetPluginsServerURL() { +@@ -63,7 +63,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; #elif defined(OS_CHROMEOS) filename = "plugins_chromeos.json"; diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index a59dcba9f5bc..cc7d3ae6259e 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-02-06 22:23:27.096383000 +0100 -+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc 2019-02-07 00:04:06.202061000 +0100 -@@ -104,7 +104,7 @@ +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/policy/configuration_policy_handler_list_factory.cc +@@ -107,7 +107,7 @@ #include "chrome/browser/policy/browser_signin_policy_handler.h" #endif @@ -9,7 +9,7 @@ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -928,7 +928,7 @@ +@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kEnterpriseHardwarePlatformAPIEnabled, base::Value::Type::BOOLEAN }, diff --git a/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc b/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc index 5b596ffcec7b..73f455032c54 100644 --- a/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc +++ b/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-02-06 22:26:05.674129000 +0100 -+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc 2019-02-06 22:26:54.109036000 +0100 -@@ -65,7 +65,7 @@ +--- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc +@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() { #endif } @@ -9,7 +9,7 @@ void CleanupUnusedPolicyDirectory() { std::string enrollment_token = BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken(); -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan void MachineLevelUserCloudPolicyController::Init( PrefService* local_state, scoped_refptr url_loader_factory) { diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc index 02457cbf914e..8a88cf1b3f27 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -181,6 +181,8 @@ class PolicyTestCase { +@@ -185,6 +185,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index dcb18adbafc1..99cc2097f2df 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-02-06 22:29:40.393569000 +0100 -+++ chrome/browser/prefs/browser_prefs.cc 2019-02-06 22:30:41.131808000 +0100 -@@ -313,7 +313,7 @@ +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/prefs/browser_prefs.cc +@@ -319,7 +319,7 @@ #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" #endif @@ -9,12 +9,12 @@ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -764,7 +764,7 @@ +@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) - browser_switcher::prefs::RegisterProfilePrefs(registry); + browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc similarity index 73% rename from www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc rename to www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc index 5faa4f7592dc..57bcccf51036 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-01-13 01:45:22.403758000 +0100 -+++ chrome/browser/prefs/pref_service_incognito_whitelist.cc 2019-01-13 01:45:47.793792000 +0100 -@@ -161,7 +161,7 @@ +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/prefs/pref_service_incognito_whitelist.cc +@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 91f3b0a5351f..fe3f353e76b8 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/process_singleton_posix.cc @@ -93,11 +93,11 @@ #include "net/base/network_interfaces.h" @@ -14,19 +14,19 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) - return false; + return g_user_opted_unlock_in_use_profile; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -866,7 +866,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif - // The other process is shutting down, it's safe to start a new process. +@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif + SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; - } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) { + } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Likely NULL in unit tests. diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc similarity index 80% rename from www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc rename to www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 7f597a8c14b4..73cee1e30aac 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-01-10 01:15:46.031074000 +0100 -+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 2019-01-10 01:16:16.877359000 +0100 -@@ -317,7 +317,7 @@ +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !defined(OS_ANDROID) MediaGalleriesPreferencesFactory::GetInstance(); #endif diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index a259fdd93d14..b41d40af3973 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-02-06 22:32:27.013965000 +0100 -+++ chrome/browser/profiles/profile_attributes_entry.cc 2019-02-06 22:32:49.969336000 +0100 -@@ -57,7 +57,7 @@ +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/profiles/profile_attributes_entry.cc +@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 18dfbfec1b3f..8f31da033031 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-03-11 22:00:53 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1376,7 +1376,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1507,7 +1507,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1414,7 +1414,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1549,7 +1549,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,9 +18,9 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1648,7 +1648,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -1823,7 +1823,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: - return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck); + return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); -#if !defined(OS_MACOSX) && defined(OS_POSIX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX) diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index ebfa980b3013..ac9923b9ee0a 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,15 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2018-12-03 21:16:40.000000000 +0100 -+++ chrome/browser/renderer_preferences_util.cc 2018-12-05 15:36:58.307704000 +0100 -@@ -20,7 +20,7 @@ - #include "third_party/blink/public/public_buildflags.h" - #include "third_party/skia/include/core/SkColor.h" - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "ui/gfx/font_render_params.h" - #endif - -@@ -32,7 +32,7 @@ +--- chrome/browser/renderer_preferences_util.cc.orig 2019-03-11 22:00:53 UTC ++++ chrome/browser/renderer_preferences_util.cc +@@ -28,7 +28,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -18,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -131,7 +131,7 @@ +@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere prefs->caret_blink_interval = interval; #endif @@ -27,12 +18,12 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -150,7 +150,7 @@ +@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) - static const base::NoDestructor params( - gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); - prefs->should_antialias_text = params->antialiasing; + content::UpdateFontRendererPreferencesFromSystemSettings(prefs); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py index d63c069e1058..de779e766d99 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -1,4 +1,4 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-06-05 19:03:02 UTC +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py @@ -31,6 +31,7 @@ def PlatformTypes(): "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js similarity index 74% rename from www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js rename to www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index fcfb1883ec6f..992704a5c5e1 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-01-09 12:44:51.519192000 +0100 -+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js 2019-01-09 12:45:25.405099000 +0100 -@@ -35,7 +35,7 @@ +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js +@@ -35,7 +35,7 @@ cr.define('settings', function() { useDefaultTheme() {} @@ -9,7 +9,7 @@ useSystemTheme() {} // -@@ -93,7 +93,7 @@ +@@ -93,7 +93,7 @@ cr.define('settings', function() { chrome.send('useDefaultTheme'); } diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 327593c0e576..4aa3c61f0cec 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2018-06-13 00:10:07.000000000 +0200 -+++ chrome/browser/resources/settings/appearance_page/appearance_page.html 2018-07-15 13:34:27.093948000 +0200 -@@ -75,7 +75,7 @@ +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/resources/settings/appearance_page/appearance_page.html +@@ -65,7 +65,7 @@ hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_"> @@ -9,7 +9,7 @@ @@ -18,7 +18,7 @@