diff options
725 files changed, 4095 insertions, 3498 deletions
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("<NULL>", std::string(buf)); @@ -16,9 +16,9 @@ #if defined(__GCC__) #pragma GCC diagnostic pop #endif ---- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 -+++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 -@@ -60,7 +60,7 @@ +--- base/threading/thread_local_storage_unittest.cc.orig 2019-03-11 22:00:51 UTC ++++ base/threading/thread_local_storage_unittest.cc +@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast<int*>(value); // Destructors should never be called with a NULL. @@ -27,20 +27,20 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 -+++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 -@@ -387,7 +387,7 @@ +--- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC ++++ media/audio/audio_output_proxy_unittest.cc +@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test { // |stream| is closed at this point. Start() should reopen it again. - EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) + EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL))); + .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL))); - - EXPECT_CALL(callback_, OnError(_)) - .Times(2); ---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC + + EXPECT_CALL(callback_, OnError()).Times(2); + +--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC +++ third_party/libjingle_xmpp/task_runner/taskrunner.cc -@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i +@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) std::vector<Task *>::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), @@ -48,19 +48,19 @@ + static_cast<Task *>(NULL)); tasks_.erase(it, tasks_.end()); - ---- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 -+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 -@@ -439,7 +439,7 @@ + tasks_running_ = false; +--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC ++++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc +@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder( } - + CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat0, cmap_id) { } -@@ -563,7 +563,7 @@ +@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) @@ -69,7 +69,7 @@ CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } -@@ -574,7 +574,7 @@ +@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) @@ -78,21 +78,21 @@ CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } -@@ -958,7 +958,7 @@ +@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, - IntegerList* glyph_id_array, + std::vector<int32_t>* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { -@@ -966,7 +966,7 @@ +@@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* } - + CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat4, cmap_id) { } - + 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 <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -9,7 +9,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1202,7 +1202,7 @@ +@@ -1211,7 +1211,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1739,6 +1739,33 @@ +@@ -1751,6 +1751,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2761,6 +2788,12 @@ +@@ -2808,6 +2835,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } 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<const allocator::AllocatorDispatch*>( 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<uintptr_t>(memalign_ptr) % 128); -@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -361,7 +361,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); @@ -18,7 +18,7 @@ char* realloc_ptr = static_cast<char*>(malloc(10)); strcpy(realloc_ptr, "foobar"); -@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -377,13 +377,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); 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 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<uintptr_t>(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 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 <mach/mach.h> @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <algorithm> -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce } } @@ -18,7 +18,7 @@ // Multiple guarded memory regions may exceed the process address space limit. // This function will raise or lower the limit by |amount|. -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) { // schemes that reduce that to 4 GiB. constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB @@ -27,7 +27,7 @@ void* SystemAllocPagesInternal(void* hint, size_t length, -@@ -134,7 +134,7 @@ +@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal( void FreePagesInternal(void* address, size_t length) { CHECK(!munmap(address, length)); 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 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<std::string> ElfSegmentBuildIDNoteAsString(co const void* section_end = segment.data() + segment.size_bytes(); const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data()); while (note_header < section_end) { 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 <pthread.h> + #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 <AvailabilityMacros.h> #endif @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -574,6 +574,11 @@ +@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -21,7 +21,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -589,6 +594,7 @@ +@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -29,12 +29,3 @@ } // Opens all object files and caches their file descriptors. -@@ -721,7 +727,7 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) - count = std::min(arraysize(trace_), count); - - // Though the backtrace API man page does not list any possible negative 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 <malloc/malloc.h> - #else - #include <malloc.h> -+#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 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<uintptr_t>(info->si_addr); #else // OS_POSIX && !OS_MACOSX - struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr); + ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); 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 <sys/un.h> #endif -@@ -28,6 +31,14 @@ +@@ -28,6 +31,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; @@ -26,7 +26,7 @@ #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; -@@ -150,7 +161,7 @@ +@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. @@ -35,7 +35,7 @@ #endif // OS_NACL_NONSFI or OS_MACOSX ; char control_buffer[kControlBufferSize]; -@@ -180,9 +191,9 @@ +@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { 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 <stdint.h> #include <sys/socket.h> 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 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 <sys/sysctl.h> #include <unistd.h> @@ -9,18 +9,18 @@ +#include <sys/types.h> + #include "base/logging.h" - #include "base/macros.h" + #include "base/stl_util.h" #include "base/strings/string_split.h" -@@ -40,7 +44,7 @@ +@@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) { -+ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) { +- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { ++ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -72,19 +76,13 @@ +@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; @@ -31,15 +31,14 @@ continue; - length = 0; -- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) { +- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to figure out the buffer size for a command line"; - continue; - } - - data.resize(length); -- + data.resize(ARG_MAX); + length = ARG_MAX; - if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) { + + if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { LOG(ERROR) << "failed to fetch a commandline"; - continue; 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<ProcessMetrics> CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) - // Returns the number of file descriptors currently open by the process, or - // -1 on error. - int GetOpenFdCount() const; -@@ -260,16 +260,16 @@ - // Returns the soft limit of file descriptors that can be opened by the - // process, or -1 on error. +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Resident Set Size is a Linux/Android specific memory concept. Do not + // attempt to extend this to other platforms. + BASE_EXPORT size_t GetResidentSetSize() const; +@@ -199,14 +199,14 @@ int GetOpenFdSoftLimit() const; --#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) + #endif // defined(OS_POSIX) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) @@ -47,25 +44,25 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -289,7 +289,7 @@ - bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const; - #endif +@@ -218,7 +218,7 @@ + ProcessMetrics(ProcessHandle process, PortProvider* port_provider); + #endif // !defined(OS_MACOSX) || defined(OS_IOS) -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -310,7 +310,7 @@ - TimeTicks last_cpu_time_; - int64_t last_system_time_; +@@ -247,7 +247,7 @@ + // Number of bytes transferred to/from disk in bytes. + uint64_t last_cumulative_disk_usage_ = 0; -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -358,7 +358,7 @@ +@@ -293,7 +293,7 @@ #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ @@ -74,7 +71,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -391,7 +391,7 @@ +@@ -326,7 +326,7 @@ int avail_phys = 0; #endif @@ -83,7 +80,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -406,7 +406,7 @@ +@@ -341,7 +341,7 @@ #endif #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ @@ -92,7 +89,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -416,7 +416,7 @@ +@@ -351,7 +351,7 @@ int dirty = 0; int reclaimable = 0; #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || @@ -101,9 +98,12 @@ #if defined(OS_CHROMEOS) int shmem = 0; -@@ -444,7 +444,7 @@ +@@ -377,9 +377,9 @@ + BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); + #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || - // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) ++ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) 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> 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 <malloc.h> #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 <intrin.h> #include <malloc.h> #include <windows.h> 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<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; @@ -18,7 +18,7 @@ #if !defined(OS_FUCHSIA) int64_t AmountOfVirtualMemory() { -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -27,7 +27,7 @@ int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } -@@ -225,6 +225,8 @@ +@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; 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 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 <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -99,7 +101,7 @@ +@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( ThreadPriority priority) { @@ -19,7 +19,7 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; -@@ -141,7 +143,7 @@ +@@ -141,7 +143,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); 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 <utility> @@ -8,17 +8,17 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -@@ -34,6 +35,7 @@ bool ThreadTaskRunnerHandle::IsSet() { - return !!lazy_tls_ptr.Pointer()->Get(); +@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() { + return !!thread_task_runner_tls.Pointer()->Get(); } +#if defined(OS_BSD) // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { -@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo - base::Passed(&overriding_task_runner), - base::Unretained(ttrh->task_runner_.get()))); +@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo + base::Unretained(ttrh->task_runner_.get()), + std::move(no_running_during_override))); } +#endif diff --git a/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 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 <malloc.h> #endif -@@ -132,6 +134,9 @@ +@@ -132,6 +134,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. 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<PSAPI_WORKING_SET_EX_INFORMATION[]> 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 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 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 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 </message> <!-- ProcessSingleton --> @@ -9,7 +9,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. </message> -@@ -1042,7 +1042,7 @@ +@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 </message> <!-- Plugin Placeholders --> 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."> </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts."> Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit </message> -@@ -6117,7 +6117,7 @@ +@@ -6160,7 +6160,7 @@ the Bookmarks menu."> Google Pay </message> @@ -18,7 +18,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -6942,7 +6942,7 @@ +@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> 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 </message> <!-- ProcessSingleton --> @@ -9,7 +9,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1060,7 +1060,7 @@ +@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 </message> <!-- Plugin Placeholders --> 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 </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -377,7 +377,7 @@ +@@ -594,7 +594,7 @@ Use Classic </message> </if> 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 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 @@ <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" /> <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" /> </if> 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<AfterStartupTask> 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 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 <ifaddrs.h> #include <net/if.h> #include <stddef.h> -@@ -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<const char*>(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 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 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<BackgroundModeOptimizer> 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<ChromeResourceDispatcherHostDelegate> - 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 @@ <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" /> </if> <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" /> 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<metrics::ClientInfo> 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<content::NavigationThrottle> 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<blink::mojom::ShareService>)); @@ -86,3 +86,12 @@ frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create)); #endif +@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow> + 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 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 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::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -8,7 +8,7 @@ if (g_test_device_list.Get().get() != nullptr) { base::ThreadTaskRunnerHandle::Get()->PostTask( 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<ExternalProviderImpl>( - service, -@@ -739,7 +739,7 @@ + provider_list->push_back(std::make_unique<ExternalProviderImpl>( + service, + new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, +@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. 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 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 <netinet/in.h> #include <sys/socket.h> @@ -17,8 +17,8 @@ #include <netpacket/packet.h> #else #include <net/if_dl.h> -@@ -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 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 <sys/socket.h> #include <sys/types.h> @@ -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 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> 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 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<uint8_t[]> 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<base::ProcessMetrics> 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 <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -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 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 <re2/re2.h> diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index 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<network::SharedURLLoaderFactory> 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 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 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<gfx::FontRenderParams> 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 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() {} // </if> -@@ -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_"></cr-link-row> @@ -9,7 +9,7 @@ <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <paper-button id="useDefault" on-click="onUseDefaultTap_" -@@ -84,7 +84,7 @@ +@@ -74,7 +74,7 @@ </paper-button> </template> </if> @@ -18,7 +18,7 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -149,7 +149,7 @@ +@@ -139,7 +139,7 @@ pref="{{prefs.bookmark_bar.show_on_all_tabs}}" label="$i18n{showBookmarksBar}"> </settings-toggle-button> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 64edd249c523..9a48cb455280 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-01-09 12:45:37.575004000 +0100 -+++ chrome/browser/resources/settings/appearance_page/appearance_page.js 2019-01-09 12:46:51.094149000 +0100 -@@ -120,7 +120,7 @@ +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/resources/settings/appearance_page/appearance_page.js +@@ -120,7 +120,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', @@ -9,7 +9,7 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -221,7 +221,7 @@ +@@ -223,7 +223,7 @@ Polymer({ this.browserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -289,10 +289,10 @@ +@@ -292,10 +292,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 6bb5ded691a6..881a83112e53 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 735016a983f1..9c2d5ef45d79 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-01-30 02:17:47.000000000 +0100 -+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc 2019-01-31 22:32:06.707636000 +0100 -@@ -715,7 +715,7 @@ +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +@@ -715,7 +715,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. diff --git a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc index 231ba4dd4a8d..e25c43ecb50b 100644 --- a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc +++ b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc @@ -1,4 +1,4 @@ ---- chrome/browser/search/local_files_ntp_source.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/search/local_files_ntp_source.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/search/local_files_ntp_source.cc @@ -20,8 +20,13 @@ #include "build/build_config.h" diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index fcf6a9c74607..1bd2e0affda7 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-02-06 22:35:27.697597000 +0100 -+++ chrome/browser/signin/signin_util.cc 2019-02-06 22:35:53.931412000 +0100 -@@ -40,7 +40,7 @@ +--- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/signin/signin_util.cc +@@ -42,7 +42,7 @@ namespace { constexpr char kSignoutSettingKey[] = "signout_setting"; diff --git a/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc index 7a81287db276..58e3c1beecda 100644 --- a/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc +++ b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2018-03-03 21:13:39.612526000 +0100 -+++ chrome/browser/ssl/ssl_error_controller_client.cc 2018-03-03 21:14:15.298290000 +0100 -@@ -55,7 +55,7 @@ +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ssl/ssl_error_controller_client.cc +@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) chrome::android::OpenDateAndTimeSettings(); @@ -9,7 +9,7 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -185,7 +185,7 @@ +@@ -219,7 +219,7 @@ void SSLErrorControllerClient::Proceed() { bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 1eaf4b8adca0..92f874d0cb6a 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2017-12-15 02:04:10.000000000 +0100 -+++ chrome/browser/sync/chrome_sync_client.cc 2017-12-24 02:09:05.300500000 +0100 -@@ -668,7 +668,7 @@ +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/sync/chrome_sync_client.cc +@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy } #endif // BUILDFLAG(ENABLE_APP_LIST) @@ -8,13 +8,13 @@ +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { - sync_service->RegisterDataTypeController( -@@ -676,7 +676,7 @@ - syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI, - BrowserThread::GetTaskRunnerForThread(BrowserThread::UI))); + if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) { +@@ -444,7 +444,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}))); + } } -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_SUPERVISED_USERS) - sync_service->RegisterDataTypeController( + #if defined(OS_CHROMEOS) + if (arc::IsArcAllowedForProfile(profile_) && diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index d39e8c05bab2..12d416f849fa 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,56 +1,56 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2018-02-24 16:25:10.000000000 +0100 -+++ chrome/browser/task_manager/sampling/task_group.cc 2018-03-03 21:46:29.318291000 +0100 -@@ -29,9 +29,9 @@ +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/task_manager/sampling/task_group.cc +@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) REFRESH_TYPE_FD_COUNT | --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -105,9 +105,9 @@ +@@ -112,9 +112,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) open_fd_count_(-1), --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false), -@@ -121,10 +121,10 @@ +@@ -128,10 +128,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) base::Bind(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -284,14 +284,14 @@ +@@ -296,14 +296,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); open_fd_count_ = open_fd_count; OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void TaskGroup::OnCpuRefreshDone(double cpu_usage) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 988543e7cf6d..9cf571bed1d7 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,39 +1,39 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2018-02-24 16:25:10.000000000 +0100 -+++ chrome/browser/task_manager/sampling/task_group.h 2018-03-03 21:51:35.928601000 +0100 -@@ -106,9 +106,9 @@ +--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/task_manager/sampling/task_group.h +@@ -106,9 +106,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int open_fd_count() const { return open_fd_count_; } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } - -@@ -122,9 +122,9 @@ + private: +@@ -121,9 +121,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void OnCpuRefreshDone(double cpu_usage); - void OnMemoryUsageRefreshDone(MemoryUsageStats memory_usage); -@@ -184,10 +184,10 @@ + void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); +@@ -191,10 +191,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int idle_wakeups_per_second_; bool gpu_memory_has_duplicates_; bool is_backgrounded_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index b8db0cfbd445..1f4bae75e90b 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,30 +1,30 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-01-30 02:17:47.000000000 +0100 -+++ chrome/browser/task_manager/sampling/task_group_sampler.cc 2019-02-06 22:39:09.250640000 +0100 -@@ -42,9 +42,9 @@ +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/task_manager/sampling/task_group_sampler.cc +@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority) : process_(std::move(process)), process_metrics_(CreateProcessMetrics(process_.Handle())), -@@ -52,9 +52,9 @@ +@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) on_open_fd_count_callback_(on_open_fd_count), --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) on_swapped_mem_refresh_callback_); } @@ -33,40 +33,40 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -94,9 +94,9 @@ +@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), on_idle_wakeups_callback_); } -#endif // defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -105,7 +105,7 @@ +@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this), on_open_fd_count_callback_); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -144,13 +144,13 @@ +@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int TaskGroupSampler::RefreshOpenFdCount() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); return process_metrics_->GetOpenFdCount(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool TaskGroupSampler::RefreshProcessPriority() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 083a3bb398d3..317827df924a 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,50 +1,50 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h -@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::Callback<void(double)>; - using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>; + using OnSwappedMemRefreshCallback = base::Callback<void(int64_t)>; using OnIdleWakeupsCallback = base::Callback<void(int)>; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) using OnOpenFdCountCallback = base::Callback<void(int)>; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) using OnProcessPriorityCallback = base::Callback<void(bool)>; TaskGroupSampler( -@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -43,9 +43,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, - const OnMemoryRefreshCallback& on_memory_refresh, + const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority); // Refreshes the expensive process' stats (CPU usage, memory usage, and idle -@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -60,9 +60,9 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); - MemoryUsageStats RefreshMemoryUsage(); + int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int RefreshOpenFdCount(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for -@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; - const OnMemoryRefreshCallback on_memory_refresh_callback_; + const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback on_open_fd_count_callback_; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback on_process_priority_callback_; // To assert we're running on the correct thread. diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index af206cbfba03..d2d95cd4af50 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -207,11 +207,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) } bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 56461cfc4ed6..ee059c93979b 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -42,11 +42,11 @@ enum RefreshType { +@@ -43,11 +43,11 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // For observers interested in getting the number of open file descriptors of // processes. REFRESH_TYPE_FD_COUNT = 1 << 14, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - REFRESH_TYPE_MEMORY_STATE = 1 << 15, - REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 16, + REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 15, + REFRESH_TYPE_MEMORY_FOOTPRINT = 1 << 16, diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index de186ad74eed..d696fb66bcaf 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2018-08-01 00:08:32.000000000 +0200 -+++ chrome/browser/tracing/crash_service_uploader.cc 2018-08-04 14:37:55.834228000 +0200 -@@ -158,6 +158,8 @@ +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/tracing/crash_service_uploader.cc +@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 72886af02f70..e623667e5a05 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2018-02-24 16:25:10.000000000 +0100 -+++ chrome/browser/ui/browser_command_controller.cc 2018-03-03 21:58:39.480640000 +0100 -@@ -83,7 +83,7 @@ - #include "ui/base/clipboard/clipboard_types.h" +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/browser_command_controller.cc +@@ -79,7 +79,7 @@ + #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -216,7 +216,7 @@ +@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -425,7 +425,7 @@ +@@ -421,7 +421,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -853,7 +853,7 @@ +@@ -860,7 +860,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index 4bbb4fb97139..c393ceb5d02d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2018-12-30 03:14:18.095305000 +0100 -+++ chrome/browser/ui/browser_view_prefs.cc 2018-12-30 03:14:37.732345000 +0100 -@@ -34,7 +34,7 @@ +--- chrome/browser/ui/browser_view_prefs.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/browser_view_prefs.cc +@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -9,7 +9,7 @@ bool custom_frame_pref_default = false; #if defined(USE_X11) custom_frame_pref_default = ui::GetCustomFramePrefDefault(); -@@ -45,7 +45,7 @@ +@@ -45,7 +45,7 @@ void RegisterBrowserViewProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, custom_frame_pref_default); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__window.h b/www/chromium/files/patch-chrome_browser_ui_browser__window.h index 55a2e90e78e4..29e27d552ae6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__window.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_window.h.orig 2018-12-12 22:56:03.000000000 +0100 -+++ chrome/browser/ui/browser_window.h 2018-12-16 14:18:41.738945000 +0100 -@@ -405,7 +405,7 @@ +--- chrome/browser/ui/browser_window.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/browser_window.h +@@ -423,7 +423,7 @@ class BrowserWindow : public ui::BaseWindow { bool is_source_keyboard) = 0; #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index 15c9394f1037..c3704c9ebe7d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h index 7422f066c1f0..5fe24a4fb65c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/input_method/input_method_engine.h.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/input_method/input_method_engine.h @@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc index 8dc37d035990..2772be3932aa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -35,7 +35,7 @@ +@@ -29,7 +29,7 @@ #include "ui/base/ime/chromeos/ime_keymap.h" #elif defined(OS_WIN) #include "ui/events/keycodes/keyboard_codes_win.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc index 7620e36c22d7..f2e025b23342 100644 --- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog( +@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( diff --git a/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc index c8895cf8be41..611d7d2c0ae2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2018-03-03 21:11:09.039038000 +0100 -+++ chrome/browser/ui/sad_tab.cc 2018-03-03 21:11:28.213027000 +0100 -@@ -180,7 +180,7 @@ +--- chrome/browser/ui/sad_tab.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/sad_tab.cc +@@ -180,7 +180,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 3bf1a0a4851c..6ada31571847 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) { - // This flag gives extensions more powers. +@@ -84,7 +84,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 2ee47ecce2c2..311a4a2f5833 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -94,7 +94,7 @@ - #include "components/user_manager/user_manager.h" +@@ -79,7 +79,7 @@ + #include "chrome/browser/ui/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -633,8 +633,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index f15c10d0ee5f..5b07ae6352d2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-01-30 02:17:48.000000000 +0100 -+++ chrome/browser/ui/tab_helpers.cc 2019-02-02 00:32:46.587950000 +0100 -@@ -117,7 +117,7 @@ +--- chrome/browser/ui/tab_helpers.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/tab_helpers.cc +@@ -116,7 +116,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -311,11 +311,11 @@ +@@ -309,11 +309,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index c9c14dedf418..a5abcc83206d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc -@@ -80,10 +80,10 @@ const TableColumnData kColumns[] = { - {IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0, - arraysize("idlewakeups") * kCharWidth, -1, true, false, false}, +@@ -93,10 +93,10 @@ const TableColumnData kColumns[] = { + base::size("100000") * kCharWidth, -1, true, false, false}, + #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, - arraysize("999") * kCharWidth, -1, true, false, false}, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) + base::size("999") * kCharWidth, -1, true, false, false}, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) {IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, - arraysize("background") * kCharWidth, -1, true, true, false}, - {IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0, + base::size("background") * kCharWidth, -1, true, true, false}, + {IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index f25adb71292a..a1e8ca158374 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,50 +1,50 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -430,13 +430,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) : stringifier_->n_a_string(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { - return stringifier_->GetMemoryStateText( -@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1, + case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { + return stringifier_->GetKeepaliveCountText( +@@ -590,7 +590,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -598,7 +598,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) default: NOTREACHED(); -@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -760,11 +760,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) default: NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index 1eaed6420b64..97facbead071 100644 --- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-01-30 02:17:48.000000000 +0100 -+++ chrome/browser/ui/toolbar/app_menu_model.cc 2019-01-31 23:16:29.559467000 +0100 -@@ -664,7 +664,7 @@ +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/toolbar/app_menu_model.cc +@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index c928b32cd7f6..02759854c0fa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2018-08-01 00:08:32.000000000 +0200 -+++ chrome/browser/ui/views/accelerator_table.cc 2018-08-04 17:21:33.552862000 +0200 -@@ -44,7 +44,7 @@ +--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/accelerator_table.cc +@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -9,7 +9,7 @@ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -74,7 +74,7 @@ +@@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -18,8 +18,17 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -119,7 +119,7 @@ - #endif // !OS_MACOSX +@@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, + {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, + {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, +-#endif // OS_LINUX && !OS_CHROMEOS ++#endif // (OS_LINUX || OS_BSD) && !OS_CHROMEOS + {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, + IDC_SHOW_BOOKMARK_BAR}, + {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, +@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN}, // Platform-specific key maps. -#if defined(OS_LINUX) @@ -27,3 +36,11 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, + {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD}, + {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE}, + {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE}, +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index dacfafc50635..9ab402f6a4dd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -29,7 +29,7 @@ +@@ -35,7 +35,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,17 +9,17 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -40,7 +40,7 @@ +@@ -45,7 +45,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #if defined(OS_CHROMEOS) - #include "chrome/browser/chromeos/ash_config.h" -@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( - IMEDriver::Register(); + ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} + +@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + } #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -27,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -124,7 +124,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); @@ -35,4 +35,4 @@ +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) } - void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted( + void ChromeBrowserMainExtraPartsViews::PostBrowserStart() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index 50e92b9cc78e..7f2632495c6e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat HICON GetSmallWindowIcon() const override; int GetAppbarAutohideEdges(HMONITOR monitor, const base::Closure& callback) override; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 01251ed892cd..9e9039a5fdbd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -40,8 +40,10 @@ using views::GridLayout; +@@ -37,8 +37,10 @@ namespace { void InitCrashReporterIfEnabled(bool enabled) { @@ -11,7 +11,7 @@ } } // namespace -@@ -120,8 +122,10 @@ views::View* FirstRunDialog::CreateExtraView() { +@@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index d70006f3cc61..adf0dd59027e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2017-07-25 21:04:51.000000000 +0200 -+++ chrome/browser/ui/views/frame/browser_frame.cc 2017-08-02 00:17:41.951632000 +0200 -@@ -36,7 +36,7 @@ +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/frame/browser_frame.cc +@@ -37,7 +37,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,16 @@ #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" #endif -@@ -97,7 +97,7 @@ +@@ -48,7 +48,7 @@ + namespace { + + bool IsUsingGtkTheme(Profile* profile) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); + #else + return false; +@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() { non_client_view()->set_context_menu_controller(this); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc new file mode 100644 index 000000000000..cca78f0e9ece --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc +@@ -13,7 +13,7 @@ + #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -32,7 +32,7 @@ OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView( + BrowserView* browser_view) { + #if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + std::unique_ptr<views::NavButtonProvider> nav_button_provider; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (ThemeServiceFactory::GetForProfile(browser_view->browser()->profile()) + ->UsingSystemTheme() && + views::LinuxUI::instance()) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 87f8e9aab746..34642d2ba882 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-02-06 22:42:13.515085000 +0100 -+++ chrome/browser/ui/views/frame/browser_view.cc 2019-02-06 22:43:58.340147000 +0100 -@@ -1255,7 +1255,7 @@ +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/frame/browser_view.cc +@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) { } void BrowserView::DestroyBrowser() { @@ -9,7 +9,7 @@ if (quit_instruction_bubble_controller_) { GetWidget()->GetNativeView()->RemovePreTargetHandler( quit_instruction_bubble_controller_.get()); -@@ -2089,7 +2089,7 @@ +@@ -2130,7 +2130,7 @@ views::View* BrowserView::CreateOverlayView() { } void BrowserView::OnWidgetDestroying(views::Widget* widget) { @@ -18,7 +18,7 @@ if (quit_instruction_bubble_controller_) { GetWidget()->GetNativeView()->RemovePreTargetHandler( quit_instruction_bubble_controller_.get()); -@@ -2435,7 +2435,7 @@ +@@ -2474,7 +2474,7 @@ void BrowserView::InitViews() { GetWidget()->SetNativeWindowProperty(Profile::kProfileKey, browser_->profile()); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h index 877ceb60236b..6cf75f921454 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.h.orig 2019-02-06 22:45:00.117437000 +0100 -+++ chrome/browser/ui/views/frame/browser_view.h 2019-02-06 22:46:12.076822000 +0100 -@@ -49,7 +49,7 @@ +--- chrome/browser/ui/views/frame/browser_view.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/frame/browser_view.h +@@ -50,7 +50,7 @@ #include "chrome/browser/ui/views/intent_picker_bubble_view.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/quit_instruction_bubble_controller.h" #endif -@@ -833,7 +833,7 @@ +@@ -850,7 +850,7 @@ class BrowserView : public BrowserWindow, }; base::Optional<ResizeSession> interactive_resize_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc deleted file mode 100644 index c264949e1cb9..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2018-03-03 21:07:27.595112000 +0100 -+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc 2018-03-03 21:07:57.689186000 +0100 -@@ -18,7 +18,7 @@ - #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" - #endif - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "ui/views/linux_ui/linux_ui.h" - #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 7c36498cc1d5..794a1d2c3b13 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -38,7 +38,7 @@ - #include "ui/views/window/frame_background.h" +@@ -49,7 +49,7 @@ + #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source, const gfx::Point& point, const ui::Event* event) { @@ -17,4 +17,13 @@ +#if defined(OS_LINUX) || defined(OS_BSD) views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); - ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), + menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_, +@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT + + OpaqueBrowserFrameView::FrameButtonStyle + OpaqueBrowserFrameView::GetFrameButtonStyle() const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return FrameButtonStyle::kMdButton; + #else + return FrameButtonStyle::kImageButton; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc deleted file mode 100644 index 51eae69e08c6..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2018-08-01 00:08:32.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2018-08-04 17:27:55.912686000 +0200 -@@ -21,7 +21,7 @@ - - constexpr int kCaptionButtonHeight = 18; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Default spacing around window caption buttons. - constexpr int kCaptionButtonSpacing = 2; - #else diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index fa3b1692a1fc..b75ea8b7056f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc @@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 5af3208d620a..f9af94718fda 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,15 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM + + void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( + ui::SimpleMenuModel* model) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); + model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); + model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); +@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -9,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index df7ddf468159..329ca29c6d7b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc -@@ -13,7 +13,7 @@ +@@ -15,7 +15,7 @@ #include "components/sessions/core/tab_restore_service.h" #include "ui/base/l10n/l10n_util.h" @@ -9,8 +9,8 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() { - } +@@ -30,7 +30,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( + SystemMenuModelDelegate::~SystemMenuModelDelegate() {} bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc new file mode 100644 index 000000000000..ca3cec36db89 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC ++++ chrome/browser/ui/views/hung_renderer_view.cc +@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() { + content::RenderProcessHost* rph = + hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); + if (rph) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. + // Instead we send an explicit IPC to crash on the renderer's IO thread. + rph->ForceCrash(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc new file mode 100644 index 000000000000..8edcc381d29e --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/tabs/new_tab_button.cc +@@ -63,7 +63,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; + NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) + : views::ImageButton(listener), tab_strip_(tab_strip) { + set_animate_on_state_change(true); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + set_triggerable_event_flags(triggerable_event_flags() | + ui::EF_MIDDLE_MOUSE_BUTTON); + #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc deleted file mode 100644 index ada559317302..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2017-09-10 00:35:35.638045000 +0200 -+++ chrome/browser/ui/views/tabs/new_tab_button.cc 2017-09-10 00:36:04.851309000 +0200 -@@ -49,7 +49,7 @@ - destroyed_(nullptr), - new_tab_promo_observer_(this) { - set_animate_on_state_change(true); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - set_triggerable_event_flags(triggerable_event_flags() | - ui::EF_MIDDLE_MOUSE_BUTTON); - #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index dea233ae2fbd..8c91255df89d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-12-15 02:04:11.000000000 +0100 -+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc 2017-12-24 02:45:43.317955000 +0100 -@@ -261,7 +261,7 @@ +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc +@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -599,7 +599,7 @@ +@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* else target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1792,7 +1792,7 @@ +@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 58a159e270a0..9c0ea349e17d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2018-11-19 19:55:04.000000000 +0100 -+++ chrome/browser/ui/webui/about_ui.cc 2018-12-04 17:47:53.178444000 +0100 -@@ -393,7 +393,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/webui/about_ui.cc +@@ -552,7 +552,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -448,7 +448,7 @@ +@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest( .GetRawDataResource(idr) .as_string(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index ae36578a9e02..ba760d11b5e9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2018-02-24 16:25:10.000000000 +0100 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2018-03-03 22:18:39.234352000 +0100 -@@ -176,11 +176,11 @@ - #include "chrome/browser/ui/webui/welcome_win10_ui.h" +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +@@ -192,11 +192,11 @@ + #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox_internals_ui.h" #endif -@@ -285,7 +285,7 @@ +@@ -314,7 +314,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -23,7 +23,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -524,7 +524,7 @@ +@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,7 +32,7 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -585,12 +585,12 @@ +@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 03e3af1d34b1..c545d3ba2d85 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2018-06-13 00:10:09.000000000 +0200 -+++ chrome/browser/ui/webui/settings/appearance_handler.cc 2018-07-18 23:00:36.362422000 +0200 -@@ -31,7 +31,7 @@ +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/ui/webui/settings/appearance_handler.cc +@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme, base::Unretained(this))); @@ -9,7 +9,7 @@ web_ui()->RegisterMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index 5fa324448a86..79f7e3050fff 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h -@@ -35,7 +35,7 @@ class AppearanceHandler : public SettingsPageUIHandler +@@ -36,7 +36,7 @@ class AppearanceHandler : public SettingsPageUIHandler // Changes the UI theme of the browser to the default theme. void HandleUseDefaultTheme(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc index 7c2bf66a735f..7aa51f364344 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -332,7 +332,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,7 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -350,7 +350,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, #endif diff --git a/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc index 39fe18258967..0468435bbe7d 100644 --- a/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2018-12-04 19:15:58.107791000 +0100 -+++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc 2018-12-04 19:16:47.545127000 +0100 -@@ -38,7 +38,7 @@ +--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc +@@ -46,7 +46,7 @@ namespace { #if defined(OS_MACOSX) const int kDesiredSizes[] = {16, 32, 128, 256, 512}; const size_t kNumDesiredSizes = base::size(kDesiredSizes); diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 39edb2bf620e..0cefd2907159 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2017-12-15 02:04:11.000000000 +0100 -+++ chrome/common/BUILD.gn 2017-12-30 02:27:17.872477000 +0100 -@@ -287,6 +287,10 @@ +--- chrome/common/BUILD.gn.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/BUILD.gn +@@ -300,6 +300,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index cae6621ecb32..87c61435a02d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2018-12-03 21:16:43.000000000 +0100 -+++ chrome/common/chrome_features.cc 2018-12-05 16:12:25.391529000 +0100 -@@ -91,13 +91,13 @@ +--- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/chrome_features.cc +@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_MACOSX) @@ -16,7 +16,7 @@ // Enables or disables whether permission prompts are automatically blocked // after the user has explicitly dismissed them too many times. -@@ -152,7 +152,7 @@ +@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{ "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -25,12 +25,12 @@ // Enables the dual certificate verification trial feature. // https://crbug.com/649026 const base::Feature kCertDualVerificationTrialFeature{ -@@ -201,7 +201,7 @@ - // Enables or disables windowing related features for desktop PWAs. +@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi const base::Feature kDesktopPWAWindowing { "DesktopPWAWindowing", --#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ +- defined(OS_MACOSX) ++ defined(OS_MACOSX) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 64987c1dcac6..7fda4187540d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2018-12-03 21:16:43.000000000 +0100 -+++ chrome/common/chrome_features.h 2018-12-05 16:20:22.595072000 +0100 -@@ -65,10 +65,10 @@ +--- chrome/common/chrome_features.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/chrome_features.h +@@ -61,10 +61,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutomaticTabDiscarding; #endif // defined(OS_WIN) || defined(OS_MACOSX) @@ -13,9 +13,9 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -90,7 +90,7 @@ - extern const base::Feature kTabStripKeyboardFocus; - #endif // defined(OS_MACOSX) +@@ -81,7 +81,7 @@ extern const base::Feature kBrowserHangFixesExperiment + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kBundledConnectionHelpFeature; -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 922b47f40b5a..84863783b2b8 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,8 +1,8 @@ ---- chrome/common/chrome_paths.cc.orig 2017-06-15 21:03:02.000000000 +0200 -+++ chrome/common/chrome_paths.cc 2017-06-18 01:09:20.663411000 +0200 -@@ -51,14 +51,14 @@ - const base::FilePath::CharType kInternalNaClPluginFileName[] = - FILE_PATH_LITERAL("internal-nacl-plugin"); +--- chrome/common/chrome_paths.cc.orig 2019-03-21 01:36:35.000000000 +0100 ++++ chrome/common/chrome_paths.cc 2019-03-24 18:44:09.907854000 +0100 +@@ -52,21 +52,21 @@ + FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -17,7 +17,15 @@ #endif // defined(GOOGLE_CHROME_BUILD) // The path to the hint file that tells the pepper plugin loader -@@ -190,7 +190,7 @@ + // where it can find the latest component updated flash. + const base::FilePath::CharType kComponentUpdatedFlashHint[] = + FILE_PATH_LITERAL("latest-component-updated-flash"); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL( +@@ -197,7 +197,7 @@ return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -26,16 +34,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -426,7 +426,7 @@ - break; - #endif - #if BUILDFLAG(ENABLE_SUPERVISED_USERS) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS: - if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur)) - return false; -@@ -474,10 +474,12 @@ +@@ -459,10 +459,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -49,16 +48,16 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -485,7 +487,7 @@ +@@ -470,7 +472,7 @@ } #endif #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ - defined(OS_MACOSX) + defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { - if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -493,7 +495,7 @@ +@@ -478,7 +480,7 @@ break; } #endif @@ -67,7 +66,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -528,7 +530,7 @@ +@@ -513,7 +515,7 @@ #endif break; @@ -76,7 +75,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -542,6 +544,9 @@ +@@ -527,6 +529,9 @@ #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -86,7 +85,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -554,7 +559,7 @@ +@@ -539,7 +544,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -94,4 +93,22 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: - if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) +@@ -547,7 +552,7 @@ + cur = cur.Append(kGCMStoreDirname); + break; + #endif // !defined(OS_ANDROID) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + case chrome::FILE_COMPONENT_FLASH_HINT: + if (!base::PathService::Get( + chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { +@@ -555,7 +560,7 @@ + } + cur = cur.Append(kComponentUpdatedFlashHint); + break; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) + case chrome::FILE_CHROME_OS_COMPONENT_FLASH: + cur = base::FilePath(kChromeOSComponentFlash); diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 7da5bb54b903..ef3d07e87411 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2017-04-19 19:06:30 UTC -+++ chrome/common/chrome_paths.h -@@ -51,7 +51,7 @@ enum { +--- chrome/common/chrome_paths.h.orig 2019-03-21 01:36:35.000000000 +0100 ++++ chrome/common/chrome_paths.h 2019-03-24 18:44:50.266637000 +0100 +@@ -51,7 +51,7 @@ // to set policies for chrome. This directory // contains subdirectories. #endif @@ -9,7 +9,7 @@ defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. -@@ -60,7 +60,7 @@ enum { +@@ -60,7 +60,7 @@ // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -113,7 +113,7 @@ enum { +@@ -107,7 +107,7 @@ DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. @@ -27,3 +27,16 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts +@@ -122,10 +122,10 @@ + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) + FILE_CHROME_OS_COMPONENT_FLASH, // The location of component updated Flash on + // Chrome OS. diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index dc9e1f064244..3fb733cf24c3 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths_internal.h.orig 2017-06-05 19:03:03 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC +++ chrome/common/chrome_paths_internal.h @@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 7b88305058a8..a96bc4f817cf 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2019-01-30 02:17:48.000000000 +0100 -+++ chrome/common/chrome_switches.cc 2019-01-31 23:25:33.468702000 +0100 -@@ -940,12 +940,12 @@ +--- chrome/common/chrome_switches.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/chrome_switches.cc +@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 961a639ccdeb..fcf6113a2957 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,7 +1,7 @@ ---- chrome/common/chrome_switches.h.orig 2017-12-24 03:11:35.192869000 +0100 -+++ chrome/common/chrome_switches.h 2017-12-24 03:12:02.641567000 +0100 -@@ -313,12 +313,12 @@ - extern const char kEnableWaylandServer[]; +--- chrome/common/chrome_switches.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/chrome_switches.h +@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[]; + extern const char kAllowNaClSocketAPI[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni index eaed2b5deee7..3d9c9f081c82 100644 --- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni +++ b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni @@ -1,6 +1,6 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2018-12-05 16:27:03.671155000 +0100 -+++ chrome/common/extensions/api/api_sources.gni 2018-12-05 16:27:49.125255000 +0100 -@@ -113,7 +113,7 @@ +--- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/extensions/api/api_sources.gni +@@ -109,7 +109,7 @@ if (is_chromeos) { "wallpaper.json", "wallpaper_private.json", ] diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index c9917cc7722e..f5cea90a6889 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/command.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/common/extensions/command.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/common/extensions/command.cc -@@ -303,7 +303,7 @@ std::string Command::CommandPlatform() { +@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index 14c5fa50230a..d6696dfe5af4 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,6 +1,6 @@ ---- chrome/common/features.gni.orig 2019-01-30 02:17:49.000000000 +0100 -+++ chrome/common/features.gni 2019-01-31 23:22:21.293971000 +0100 -@@ -41,9 +41,9 @@ +--- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/features.gni +@@ -41,9 +41,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos enable_one_click_signin = diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index e27126942772..9a7e44a3fff7 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2017-06-05 19:03:03 UTC +--- chrome/common/pref_names.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/common/pref_names.cc -@@ -1009,7 +1009,7 @@ const char kForceSessionSync[] = "settings.history_rec +@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1096,7 +1096,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1038,7 +1038,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1475,7 +1475,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1419,7 +1419,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 41399039b875..4de35f813a85 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2017-06-05 19:03:03 UTC +--- chrome/common/pref_names.h.orig 2019-03-11 22:00:54 UTC +++ chrome/common/pref_names.h -@@ -337,7 +337,7 @@ extern const char kForceGoogleSafeSearch[]; +@@ -300,7 +300,7 @@ extern const char kMdHistoryMenuPromoShown[]; + extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; - extern const char kForceSessionSync[]; extern const char kAllowedDomainsForApps[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -370,7 +370,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -333,7 +333,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -17,8 +17,8 @@ +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUseCustomChromeFrame[]; #endif - extern const char kBackShortcutBubbleShownCount[]; -@@ -529,7 +529,7 @@ extern const char kAppWindowPlacement[]; + #if BUILDFLAG(ENABLE_PLUGINS) +@@ -487,7 +487,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; @@ -26,4 +26,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif - + #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_common_webui_url_constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 505c4d7f922b..f212e20609c5 100644 --- a/www/chromium/files/patch-chrome_common_webui_url_constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,15 +1,15 @@ ---- chrome/common/webui_url_constants.cc.orig 2018-02-24 16:25:11.000000000 +0100 -+++ chrome/common/webui_url_constants.cc 2018-03-03 22:39:51.818055000 +0100 -@@ -226,7 +226,7 @@ - const char kChromeUICastURL[] = "chrome://cast/"; +--- chrome/common/webui_url_constants.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/webui_url_constants.cc +@@ -246,7 +246,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me + const char kChromeUICastHost[] = "cast"; #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; - #endif -@@ -235,11 +235,11 @@ + const char kChromeUIHatsHost[] = "hats"; +@@ -257,11 +257,11 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -23,9 +23,9 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -380,13 +380,13 @@ - kChromeUIInternetConfigDialogHost, +@@ -415,13 +415,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, + kChromeUIAssistantOptInHost, #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_webui_url_constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index e53b479f7301..2fd054c9aa0e 100644 --- a/www/chromium/files/patch-chrome_common_webui_url_constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,15 +1,15 @@ ---- chrome/common/webui_url_constants.h.orig 2018-02-24 16:25:11.000000000 +0100 -+++ chrome/common/webui_url_constants.h 2018-03-03 22:40:56.113062000 +0100 -@@ -223,7 +223,7 @@ - extern const char kChromeUICastURL[]; +--- chrome/common/webui_url_constants.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/common/webui_url_constants.h +@@ -241,7 +241,7 @@ extern const char kChromeUIMetroFlowURL[]; + extern const char kChromeUICastHost[]; #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; - #endif -@@ -232,11 +232,11 @@ + extern const char kChromeUIHatsHost[]; +@@ -253,11 +253,11 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc new file mode 100644 index 000000000000..ccb3ec50ca26 --- /dev/null +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -0,0 +1,11 @@ +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-03-17 20:22:37 UTC ++++ chrome/renderer/chrome_content_renderer_client.cc +@@ -1012,7 +1012,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( + } + + case chrome::mojom::PluginStatus::kRestartRequired: { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + placeholder = create_blocked_plugin( + IDR_BLOCKED_PLUGIN_HTML, + l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED, diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index 3e76316b0018..d77103710996 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,5 +1,5 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2018-12-03 21:16:44.000000000 +0100 -+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2018-12-13 18:20:56.573572000 +0100 +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -15,7 +15,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { @@ -18,7 +18,7 @@ // The global SkFontConfigInterface is configured and initialized with a // SkFontconfigInterface compatible font_service::FontLoader in // RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup -@@ -74,7 +74,7 @@ +@@ -74,7 +74,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab void* buffer, size_t* length) { bool result = false; diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index 1007670f896b..6acbcf8fc2d9 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -1,5 +1,5 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2018-12-13 18:23:18.267950000 +0100 -+++ chrome/renderer/pepper/pepper_flash_font_file_host.h 2018-12-13 18:24:04.656797000 +0100 +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2019-03-11 22:00:54 UTC ++++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/host/resource_host.h" @@ -9,7 +9,7 @@ #include "base/files/file.h" #elif defined(OS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); diff --git a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc index 36fa0854ce05..8624cc6a5068 100644 --- a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc +++ b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc @@ -1,6 +1,6 @@ ---- chrome/service/cloud_print/print_system.cc.orig 2018-03-24 13:33:28.414570000 +0100 -+++ chrome/service/cloud_print/print_system.cc 2018-03-24 13:31:35.144592000 +0100 -@@ -36,7 +36,7 @@ +--- chrome/service/cloud_print/print_system.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/service/cloud_print/print_system.cc +@@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() { return base::GenerateGUID(); } diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn new file mode 100644 index 000000000000..727c3aca7018 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/test/BUILD.gn.orig 2019-03-24 18:46:05.402110000 +0100 ++++ chrome/test/BUILD.gn 2019-03-24 18:46:25.234572000 +0100 +@@ -5232,7 +5232,7 @@ + "//components/crash/core/common", + "//components/flags_ui:switches", + ] +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + deps += [ "//third_party/breakpad:client" ] + } diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index b66c5b5d2969..46364dec4660 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2018-08-08 21:10:43.000000000 +0200 -+++ chrome/test/base/in_process_browser_test.cc 2018-08-21 00:58:24.257483000 +0200 -@@ -69,6 +69,10 @@ +--- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC ++++ chrome/test/base/in_process_browser_test.cc +@@ -74,6 +74,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,8 +11,8 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -88,7 +92,7 @@ - #include "chrome/test/base/default_ash_event_generator_delegate.h" +@@ -102,7 +106,7 @@ + #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) -#if !defined(OS_CHROMEOS) && defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index 2e6fb6456520..c60b12af1029 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2017-06-05 19:03:04 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC +++ chrome/test/base/testing_browser_process.h -@@ -108,8 +108,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadStatusUpdater* download_status_updater() override; DownloadRequestLimiter* download_request_limiter() override; diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index 2024e02bc187..abae565184f1 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,15 +1,15 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-06-05 19:03:04 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2019-03-11 22:00:54 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -48,7 +48,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) void GetApplicationDirs(std::vector<base::FilePath>* locations) { - locations->push_back(base::FilePath("/opt/google/chrome")); - locations->push_back(base::FilePath("/usr/local/bin")); -@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_exe) { + // TODO: Respect users' PATH variables. + // Until then, we use an approximation of the most common defaults. +@@ -135,7 +135,7 @@ bool FindChrome(base::FilePath* browser_exe) { #elif defined(OS_MACOSX) base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), base::FilePath("Chromium.app/Contents/MacOS/Chromium") diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 2dd826ec3cc0..a665fc7ccd3b 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-01-10 01:22:24.493908000 +0100 -+++ chromecast/browser/cast_browser_main_parts.cc 2019-01-10 01:23:14.020775000 +0100 -@@ -73,7 +73,7 @@ +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-03-11 22:00:56 UTC ++++ chromecast/browser/cast_browser_main_parts.cc +@@ -66,7 +66,7 @@ #include "ui/compositor/compositor_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -246,7 +246,7 @@ +@@ -244,7 +244,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -18,7 +18,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -393,7 +393,7 @@ +@@ -393,7 +393,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() } void CastBrowserMainParts::ToolkitInitialized() { diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 84de5e3e12af..16182b516e4f 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2018-06-13 00:10:12.000000000 +0200 -+++ chromecast/browser/cast_content_browser_client.cc 2018-07-18 23:13:48.741141000 +0200 -@@ -416,7 +416,7 @@ +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-03-11 22:00:56 UTC ++++ chromecast/browser/cast_content_browser_client.cc +@@ -524,7 +524,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc b/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc index b629aa7fce3e..2c4456163b65 100644 --- a/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc +++ b/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/tts/tts_controller_impl.cc.orig 2019-01-31 23:07:11.992155000 +0100 -+++ chromecast/browser/tts/tts_controller_impl.cc 2019-01-31 23:08:40.991798000 +0100 -@@ -390,7 +390,11 @@ +--- chromecast/browser/tts/tts_controller_impl.cc.orig 2019-03-11 22:00:56 UTC ++++ chromecast/browser/tts/tts_controller_impl.cc +@@ -390,7 +390,11 @@ int TtsControllerImpl::QueueSize() { } TtsPlatformImpl* TtsControllerImpl::GetPlatformImpl() { diff --git a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc new file mode 100644 index 000000000000..ae7b2dfdab4a --- /dev/null +++ b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc @@ -0,0 +1,23 @@ +--- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-03-17 18:44:55 UTC ++++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc +@@ -14,9 +14,9 @@ + #include "chromecast/media/cma/backend/av_sync.h" + #include "chromecast/media/cma/backend/video_decoder_for_mixer.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chromecast/media/cma/backend/audio_buildflags.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + #include <zircon/syscalls.h> +@@ -226,7 +226,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const { + return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const { + timespec now = {0, 0}; + #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/chromium/files/patch-components_autofill_strings.grdp b/www/chromium/files/patch-components_autofill__strings.grdp index fa67b3b21bde..44b96476a5a2 100644 --- a/www/chromium/files/patch-components_autofill_strings.grdp +++ b/www/chromium/files/patch-components_autofill__strings.grdp @@ -1,8 +1,8 @@ ---- components/autofill_strings.grdp.orig 2018-12-03 21:16:48.000000000 +0100 -+++ components/autofill_strings.grdp 2018-12-13 18:27:15.969729000 +0100 -@@ -198,7 +198,7 @@ - <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL" desc="Title text for the Autofill save card prompt when the card is to be saved locally. The prompt can be either a bubble or an infobar."> - Save card? +--- components/autofill_strings.grdp.orig 2019-03-11 22:00:56 UTC ++++ components/autofill_strings.grdp +@@ -217,7 +217,7 @@ + <message name="IDS_AUTOFILL_NAME_FIX_FLOW_PROMPT_SAVE_CARD" desc="Text to show for the Autofill save credit card prompt card holder name fix flow button." formatter_data="android_java"> + Save card </message> - <if expr="is_linux and not chromeos"> + <if expr="is_posix and not chromeos"> diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index fe6b89e803bc..4ea93ce1bac1 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2018-08-01 00:08:37.000000000 +0200 -+++ components/autofill/content/renderer/password_form_conversion_utils.cc 2018-08-04 17:44:14.098469000 +0200 -@@ -38,7 +38,11 @@ +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC ++++ components/autofill/content/renderer/password_form_conversion_utils.cc +@@ -37,7 +37,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc index 22ffa2be465a..63f7feda9982 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,76 +1,42 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2018-12-12 22:56:05.000000000 +0100 -+++ components/autofill/core/browser/autofill_experiments.cc 2018-12-28 16:48:40.407244000 +0100 -@@ -27,7 +27,7 @@ +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-03-11 22:00:56 UTC ++++ components/autofill/core/browser/autofill_experiments.cc +@@ -28,7 +28,7 @@ namespace autofill { -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - namespace { - // Returns the font weight corresponding to the value of param - // kAutofillForcedFontWeightParameterName, or kDefault if the param is not -@@ -45,9 +45,9 @@ - return ForcedFontWeight::kDefault; - } - } // namespace --#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_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const base::Feature kAutofillDropdownLayoutExperiment{ "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT}; const char kAutofillDropdownLayoutParameterName[] = "variant"; -@@ -55,15 +55,15 @@ +@@ -36,7 +36,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon"; const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] = "two-lines-leading-icon"; -#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_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const base::Feature kAutofillPrimaryInfoStyleExperiment{ - "AutofillPrimaryInfoStyleExperiment", base::FEATURE_DISABLED_BY_DEFAULT}; - const char kAutofillForcedFontWeightParameterName[] = "font_weight"; - const char kAutofillForcedFontWeightParameterMedium[] = "medium"; - const char kAutofillForcedFontWeightParameterBold[] = "bold"; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - bool IsCreditCardUploadEnabled(const PrefService* pref_service, const syncer::SyncService* sync_service, -@@ -152,7 +152,7 @@ +@@ -143,7 +143,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna } - bool OfferStoreUnmaskedCards() { + bool OfferStoreUnmaskedCards(bool is_off_the_record) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // The checkbox can be forced on with a flag, but by default we don't store // on Linux due to lack of system keychain integration. See crbug.com/162735 return base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -185,7 +185,7 @@ +@@ -181,7 +181,7 @@ bool ShouldUseActiveSignedInAccount() { features::kAutofillGetPaymentsIdentityFromSync); } -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - ForcedFontWeight GetForcedFontWeight() { - if (!base::FeatureList::IsEnabled(kAutofillPrimaryInfoStyleExperiment)) - return ForcedFontWeight::kDefault; -@@ -194,9 +194,9 @@ - static ForcedFontWeight font_weight_from_param = GetFontWeightFromParam(); - return font_weight_from_param; - } --#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_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) ForcedPopupLayoutState GetForcedPopupLayoutState() { if (!base::FeatureList::IsEnabled( autofill::kAutofillDropdownLayoutExperiment)) -@@ -220,6 +220,6 @@ +@@ -205,6 +205,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() { NOTREACHED(); return ForcedPopupLayoutState::kDefault; } diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h index e35e43ab520f..b7727fba91a8 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.h.orig 2018-12-28 16:46:01.899706000 +0100 -+++ components/autofill/core/browser/autofill_experiments.h 2018-12-28 16:46:45.873415000 +0100 -@@ -23,20 +23,20 @@ +--- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC ++++ components/autofill/core/browser/autofill_experiments.h +@@ -23,13 +23,13 @@ class SyncService; namespace autofill { // Parameterized Features (grouped with parameter name and options) @@ -14,39 +14,18 @@ -#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_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - extern const base::Feature kAutofillPrimaryInfoStyleExperiment; - extern const char kAutofillForcedFontWeightParameterName[]; - extern const char kAutofillForcedFontWeightParameterMedium[]; - extern const char kAutofillForcedFontWeightParameterBold[]; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - // Returns true if uploading credit cards to Wallet servers is enabled. This // requires the appropriate flags and user settings to be true and the user to -@@ -66,7 +66,7 @@ +@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record); // Returns whether the account of the active signed-in user should be used. bool ShouldUseActiveSignedInAccount(); -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - enum class ForcedFontWeight { - kDefault, // No change to the font weight. - kMedium, -@@ -78,9 +78,9 @@ - // kAutofillPrimaryInfoStyleExperiment is disabled or if the corresponding - // feature param is invalid. - ForcedFontWeight GetForcedFontWeight(); --#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_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) enum class ForcedPopupLayoutState { kDefault, // No popup layout forced by experiment. kLeadingIcon, // Experiment forces leading (left in LTR) icon layout. -@@ -94,7 +94,7 @@ +@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState { // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon // or kAutofillDropdownLayoutParameterTrailingIcon, respectively. ForcedPopupLayoutState GetForcedPopupLayoutState(); diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill_util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index 99f48c0bb150..2b810cc6850d 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill_util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-01-09 12:24:12.925267000 +0100 -+++ components/autofill/core/common/autofill_util.cc 2019-01-09 12:24:28.939308000 +0100 -@@ -202,7 +202,7 @@ +--- components/autofill/core/common/autofill_util.cc.orig 2019-03-11 22:00:56 UTC ++++ components/autofill/core/common/autofill_util.cc +@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index 15ee00c3da11..3c85edbf2e08 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,6 +1,6 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-09-05 21:05:17.000000000 +0200 -+++ components/content_settings/core/browser/website_settings_registry.cc 2017-09-10 01:16:20.683275000 +0200 -@@ -70,7 +70,7 @@ +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2019-03-11 22:00:56 UTC ++++ components/content_settings/core/browser/website_settings_registry.cc +@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re #if defined(OS_WIN) if (!(platform & PLATFORM_WINDOWS)) return nullptr; diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index b27a8e2d3590..871d1f936cc4 100644 --- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,4 +1,4 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2017-06-05 19:03:05 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2019-03-11 22:00:56 UTC +++ components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn index f289a62c9280..84201e8fd7e3 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,20 +1,29 @@ ---- components/crash/content/app/BUILD.gn.orig 2018-12-03 21:16:48.000000000 +0100 -+++ components/crash/content/app/BUILD.gn 2018-12-13 18:52:20.920947000 +0100 -@@ -36,7 +36,7 @@ +--- components/crash/content/app/BUILD.gn.orig 2019-03-11 22:00:56 UTC ++++ components/crash/content/app/BUILD.gn +@@ -36,12 +36,12 @@ static_library("app") { sources += [ "crashpad.cc" ] } -- if (is_android || is_linux) { -+ if (is_android || is_linux && !is_bsd) { - # Want these files on both Linux and Android. +- if (is_android || (is_linux && !is_chromeos)) { ++ if (is_android || (is_linux && !is_chromeos && !is_bsd)) { set_sources_assignment_filter([]) + sources += [ "crashpad_linux.cc" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { sources += [ -@@ -73,8 +73,6 @@ - "//content/public/common:content_descriptors", - "//content/public/common:result_codes", - "//sandbox", -- "//third_party/breakpad:client", -- "//third_party/crashpad/crashpad/snapshot", + "breakpad_linux.cc", + "breakpad_linux.h", +@@ -79,7 +79,10 @@ static_library("app") { + "//third_party/crashpad/crashpad/snapshot", ] - } +- if (is_linux) { ++ if (is_bsd) { ++ deps -= [ "//third_party/crashpad/crashpad/snapshot" ] ++ } ++ if (is_linux && !is_bsd) { + deps += [ "//third_party/breakpad:client" ] + } + } diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad.cc b/www/chromium/files/patch-components_crash_content_app_crashpad.cc index e308120bc123..d0641d172733 100644 --- a/www/chromium/files/patch-components_crash_content_app_crashpad.cc +++ b/www/chromium/files/patch-components_crash_content_app_crashpad.cc @@ -1,6 +1,6 @@ ---- components/crash/content/app/crashpad.cc.orig 2019-01-30 02:17:53.000000000 +0100 -+++ components/crash/content/app/crashpad.cc 2019-01-31 23:31:14.742328000 +0100 -@@ -102,6 +102,12 @@ +--- components/crash/content/app/crashpad.cc.orig 2019-03-11 22:00:56 UTC ++++ components/crash/content/app/crashpad.cc +@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client, const base::FilePath& exe_path, const std::vector<std::string>& initial_arguments, bool embedded_handler) { @@ -13,7 +13,7 @@ static bool initialized = false; DCHECK(!initialized); initialized = true; -@@ -121,7 +127,7 @@ +@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client, DCHECK(browser_process || process_type == "Chrome Installer" || process_type == "notification-helper" || process_type == "GCPW Installer" || process_type == "GCPW DLL"); @@ -22,7 +22,7 @@ DCHECK(browser_process); #else #error Port. -@@ -186,7 +192,7 @@ +@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client, // other "main, first process" to initialize things. There is no "relauncher" // on Windows, so this is synonymous with initial_client. const bool should_initialize_database_and_set_upload_policy = initial_client; @@ -31,13 +31,13 @@ const bool should_initialize_database_and_set_upload_policy = browser_process; #endif if (should_initialize_database_and_set_upload_policy) { -@@ -265,7 +271,9 @@ - } +@@ -267,7 +273,9 @@ bool GetUploadsEnabled() { + #if !defined(OS_ANDROID) void DumpWithoutCrashing() { +#if !defined(OS_BSD) CRASHPAD_SIMULATE_CRASH(); +#endif } + #endif - void GetReports(std::vector<Report>* reports) { diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index 99ff4da3a8fe..6c5e78455e0f 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,10 +1,7 @@ ---- components/crash/content/browser/BUILD.gn.orig 2018-06-13 00:10:13.000000000 +0200 -+++ components/crash/content/browser/BUILD.gn 2018-07-18 23:37:00.046473000 +0200 -@@ -24,10 +24,9 @@ - "//components/crash/content/app", - "//content/public/browser", +--- components/crash/content/browser/BUILD.gn.orig 2019-03-11 22:00:56 UTC ++++ components/crash/content/browser/BUILD.gn +@@ -28,7 +28,7 @@ source_set("browser") { "//content/public/common", -- "//third_party/breakpad:client", ] - if (is_linux || is_android) { @@ -12,7 +9,14 @@ set_sources_assignment_filter([]) # Want this file on both Linux and Android. -@@ -43,7 +42,7 @@ +@@ -42,13 +42,13 @@ source_set("browser") { + deps += [ "//third_party/crashpad/crashpad/client" ] + } + +- if (!is_android) { ++ if (!is_android && !is_bsd) { + deps += [ "//third_party/breakpad:client" ] + } # This is not in the GYP build but this target includes breakpad client # headers, so add the dependency here. diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn index 76e8026f1942..39279777640b 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/common/BUILD.gn.orig 2018-08-01 00:08:38.000000000 +0200 -+++ components/crash/core/common/BUILD.gn 2018-08-05 12:52:29.173813000 +0200 -@@ -6,7 +6,7 @@ +--- components/crash/core/common/BUILD.gn.orig 2019-03-11 22:00:56 UTC ++++ components/crash/core/common/BUILD.gn +@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") declare_args() { # If set to true, this will stub out and disable the entire crash key system. @@ -9,7 +9,7 @@ } group("common") { -@@ -88,7 +88,6 @@ +@@ -89,7 +89,6 @@ target(crash_key_target_type, "crash_key") { ] } @@ -17,12 +17,12 @@ } } -@@ -143,7 +142,7 @@ +@@ -144,7 +143,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } -- if (!is_mac && !is_win && !is_fuchsia) { -+ if (!is_mac && !is_win && !is_fuchsia && !is_bsd) { +- if (!is_mac && !is_win && !is_fuchsia && !is_android) { ++ if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } diff --git a/www/chromium/files/patch-components_download_internal_common_base_file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc index ba807f1f3cd3..c1b465c08211 100644 --- a/www/chromium/files/patch-components_download_internal_common_base_file.cc +++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc @@ -1,6 +1,6 @@ ---- components/download/internal/common/base_file.cc.orig 2019-01-09 12:22:40.588572000 +0100 -+++ components/download/internal/common/base_file.cc 2019-01-09 12:23:00.218681000 +0100 -@@ -446,7 +446,7 @@ +--- components/download/internal/common/base_file.cc.orig 2019-03-11 22:00:56 UTC ++++ components/download/internal/common/base_file.cc +@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason( return reason; } diff --git a/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc b/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc index e84e7720e986..01a891ce5421 100644 --- a/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc +++ b/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc @@ -1,5 +1,5 @@ ---- components/download/quarantine/quarantine_linux.cc.orig 2019-01-30 02:17:53.000000000 +0100 -+++ components/download/quarantine/quarantine_linux.cc 2019-01-31 23:40:46.073321000 +0100 +--- components/download/quarantine/quarantine_linux.cc.orig 2019-03-11 22:00:56 UTC ++++ components/download/quarantine/quarantine_linux.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,7 +16,7 @@ #include "base/files/file_path.h" #include "base/logging.h" -@@ -25,7 +29,7 @@ +@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path, int flags) { // On Chrome OS, there is no component that can validate these extended // attributes so there is no need to set them. @@ -25,7 +25,7 @@ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); int result = setxattr(path, name, value, value_size, flags); if (result) { -@@ -33,7 +37,7 @@ +@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path, << path; return false; } diff --git a/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc b/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc index 776c045b12c3..e49bc39198d3 100644 --- a/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc +++ b/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc @@ -1,6 +1,6 @@ ---- components/download/quarantine/test_support_linux.cc.orig 2019-01-30 02:17:53.000000000 +0100 -+++ components/download/quarantine/test_support_linux.cc 2019-01-31 23:56:27.334442000 +0100 -@@ -21,6 +21,7 @@ +--- components/download/quarantine/test_support_linux.cc.orig 2019-03-11 22:00:56 UTC ++++ components/download/quarantine/test_support_linux.cc +@@ -21,6 +21,7 @@ namespace download { namespace { std::string GetExtendedFileAttribute(const char* path, const char* name) { @@ -8,7 +8,7 @@ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); ssize_t len = getxattr(path, name, nullptr, 0); if (len <= 0) -@@ -31,6 +32,9 @@ +@@ -31,6 +32,9 @@ std::string GetExtendedFileAttribute(const char* path, if (len < static_cast<ssize_t>(buffer.size())) return std::string(); return std::string(buffer.begin(), buffer.end()); diff --git a/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index 7128d32a0722..e8252eefd572 100644 --- a/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2017-12-24 11:50:13.400967000 +0100 -+++ components/feature_engagement/public/event_constants.cc 2017-12-24 11:50:56.302146000 +0100 -@@ -24,9 +24,9 @@ - +--- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC ++++ components/feature_engagement/public/event_constants.cc +@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con + const char kTabReopened[] = "tab_reopened"; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) diff --git a/www/chromium/files/patch-components_feature_engagement_public_event_constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index d39d1a593ae8..6fea1eadd62f 100644 --- a/www/chromium/files/patch-components_feature_engagement_public_event_constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.h.orig 2017-12-24 11:50:25.527960000 +0100 -+++ components/feature_engagement/public/event_constants.h 2017-12-24 11:51:24.453190000 +0100 -@@ -42,7 +42,7 @@ - extern const char kIncognitoWindowSessionTimeMet[]; +--- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC ++++ components/feature_engagement/public/event_constants.h +@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[]; + extern const char kTabReopened[]; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) @@ -9,7 +9,7 @@ // This event is included in the deferred onboarding events for the New Tab // described above, but it is also used on iOS, so it must be compiled // separately. -@@ -50,7 +50,7 @@ +@@ -57,7 +57,7 @@ extern const char kTabReopened[]; // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 59a7c5ffad92..56186203822c 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,9 +1,9 @@ ---- components/feedback/anonymizer_tool.cc.orig 2018-03-20 23:05:22.000000000 +0100 -+++ components/feedback/anonymizer_tool.cc 2018-03-24 13:39:35.199314000 +0100 -@@ -11,7 +11,11 @@ - #include "base/strings/string_util.h" +--- components/feedback/anonymizer_tool.cc.orig 2019-03-11 22:00:56 UTC ++++ components/feedback/anonymizer_tool.cc +@@ -13,7 +13,11 @@ #include "base/strings/stringprintf.h" #include "content/public/browser/browser_thread.h" + #include "net/base/ip_address.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index ad57ac48b3b6..a2dbc0a29a13 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2017-06-05 19:03:05 UTC +--- components/flags_ui/flags_state.cc.orig 2019-03-11 22:00:56 UTC +++ components/flags_ui/flags_state.cc -@@ -567,7 +567,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -618,7 +618,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h index 776b370d5cb0..25e9740ff93f 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client.h.orig 2018-06-13 00:10:13.000000000 +0200 -+++ components/gcm_driver/gcm_client.h 2018-07-18 23:49:52.697459000 +0200 -@@ -82,6 +82,7 @@ +--- components/gcm_driver/gcm_client.h.orig 2019-03-11 22:00:56 UTC ++++ components/gcm_driver/gcm_client.h +@@ -85,6 +85,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index 14405d76b15a..b74cc52fc72f 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2018-06-13 00:10:13.000000000 +0200 -+++ components/gcm_driver/gcm_client_impl.cc 2018-07-18 23:56:44.202609000 +0200 -@@ -152,6 +152,9 @@ +--- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC ++++ components/gcm_driver/gcm_client_impl.cc +@@ -150,6 +150,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc index 8f8989ede564..bbf7cb18c4a1 100644 --- a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc +++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc @@ -1,4 +1,4 @@ ---- components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-04-19 19:06:32 UTC +--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2019-03-11 22:00:56 UTC +++ components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index e15d4f2f9a23..48f72989095e 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2017-12-15 02:04:14.000000000 +0100 -+++ components/metrics/BUILD.gn 2017-12-30 02:31:51.554746000 +0100 -@@ -137,6 +137,11 @@ +--- components/metrics/BUILD.gn.orig 2019-03-11 22:00:56 UTC ++++ components/metrics/BUILD.gn +@@ -143,6 +143,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc index 45928cd0e41b..7e51eab82bdb 100644 --- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2017-04-19 19:06:32 UTC +--- components/metrics/drive_metrics_provider_linux.cc.orig 2019-03-11 22:00:56 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc new file mode 100644 index 000000000000..2c387d6b45ee --- /dev/null +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -0,0 +1,11 @@ +--- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC ++++ components/metrics/metrics_log.cc +@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic + // OperatingSystemVersion refers to the ChromeOS release version. + #if defined(OS_CHROMEOS) + os->set_kernel_version(base::SysInfo::KernelVersion()); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Linux operating system version is copied over into kernel version to be + // consistent. + os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc index db5d92f1d6f8..e7fb3cdd8939 100644 --- a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-06-05 19:03:05 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-03-11 22:00:56 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 74a71cf2e786..7a5d6317acba 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2017-06-05 19:03:06 UTC +--- components/neterror/resources/neterror.js.orig 2019-03-11 22:00:56 UTC +++ components/neterror/resources/neterror.js -@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings) { +@@ -166,7 +166,7 @@ function setUpCachedButton(buttonStrings) { } var primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index d59b65ddc883..03b0cb2986a0 100644 --- a/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2017-12-24 12:05:09.663658000 +0100 -+++ components/network_session_configurator/browser/network_session_configurator.cc 2017-12-24 12:05:50.949666000 +0100 -@@ -460,7 +460,7 @@ +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-03-11 22:00:56 UTC ++++ components/network_session_configurator/browser/network_session_configurator.cc +@@ -662,7 +662,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp index 9568626c9cb4..d017cf36031e 100644 --- a/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp +++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,6 +1,6 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2017-12-15 02:04:14.000000000 +0100 -+++ components/new_or_sad_tab_strings.grdp 2017-12-24 11:49:23.903168000 +0100 -@@ -48,7 +48,7 @@ +--- components/new_or_sad_tab_strings.grdp.orig 2019-03-11 22:00:56 UTC ++++ components/new_or_sad_tab_strings.grdp +@@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode."> Open page in a new Incognito window (Ctrl-Shift-N) </message> -@@ -63,7 +63,7 @@ +@@ -69,7 +69,7 @@ Close other tabs or apps </message> </if> @@ -18,7 +18,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> Close other tabs or programs </message> -@@ -73,7 +73,7 @@ +@@ -79,7 +79,7 @@ Close other apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> Close other programs </message> -@@ -88,7 +88,7 @@ +@@ -94,7 +94,7 @@ Restart Chromium </message> </if> diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index a6f21221f7fe..6b62d0377822 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,5 +1,5 @@ ---- components/os_crypt/os_crypt.h.orig 2018-12-03 21:16:50.000000000 +0100 -+++ components/os_crypt/os_crypt.h 2018-12-13 20:06:45.446679000 +0100 +--- components/os_crypt/os_crypt.h.orig 2019-03-11 22:00:56 UTC ++++ components/os_crypt/os_crypt.h @@ -15,9 +15,9 @@ #include "base/strings/string16.h" #include "build/build_config.h" @@ -12,7 +12,7 @@ #if defined(OS_MACOSX) && !defined(OS_IOS) class PrefRegistrySimple; -@@ -34,13 +34,13 @@ +@@ -34,13 +34,13 @@ struct Config; // true for Linux, if a password management tool is available. class OSCrypt { public: @@ -29,7 +29,7 @@ // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ class OSCrypt { DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); }; @@ -38,7 +38,7 @@ // For unit testing purposes, inject methods to be used. // |get_key_storage_mock| provides the desired |KeyStorage| implementation. // If the provider returns |nullptr|, a hardcoded password will be used. -@@ -127,6 +127,6 @@ +@@ -127,6 +127,6 @@ void UseMockKeyStorageForTesting( // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting(); diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc index 398385b87bac..d8cbdaad386c 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc +++ b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc @@ -1,5 +1,5 @@ ---- components/os_crypt/os_crypt_unittest.cc.orig 2017-12-15 02:04:15.000000000 +0100 -+++ components/os_crypt/os_crypt_unittest.cc 2017-12-24 11:56:52.206820000 +0100 +--- components/os_crypt/os_crypt_unittest.cc.orig 2019-03-11 22:00:56 UTC ++++ components/os_crypt/os_crypt_unittest.cc @@ -18,7 +18,7 @@ #include "components/os_crypt/os_crypt_mocker.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc deleted file mode 100644 index 5aed2235790f..000000000000 --- a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/password_manager/core/browser/import/csv_reader.cc.orig 2017-04-19 19:06:32 UTC -+++ components/password_manager/core/browser/import/csv_reader.cc -@@ -9,7 +9,11 @@ - #include "base/logging.h" - #include "base/macros.h" - #include "base/strings/string_util.h" -+#if defined(OS_BSD) -+#include <re2/re2.h> -+#else - #include "third_party/re2/src/re2/re2.h" -+#endif - - namespace { - diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc index b8b0babc15ec..0f704d529edf 100644 --- a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc +++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc @@ -1,5 +1,5 @@ ---- components/plugins/renderer/plugin_placeholder.cc.orig 2019-01-30 02:17:54.000000000 +0100 -+++ components/plugins/renderer/plugin_placeholder.cc 2019-02-01 00:04:53.895073000 +0100 +--- components/plugins/renderer/plugin_placeholder.cc.orig 2019-03-11 22:00:56 UTC ++++ components/plugins/renderer/plugin_placeholder.cc @@ -17,7 +17,11 @@ #include "third_party/blink/public/web/web_plugin_container.h" #include "third_party/blink/public/web/web_script_source.h" diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 53bd6bd31185..8e2191d4bc74 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,5 +1,5 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-02-06 22:50:06.437715000 +0100 -+++ components/policy/core/common/cloud/cloud_policy_util.cc 2019-02-07 01:42:29.673954000 +0100 +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-03-11 22:00:56 UTC ++++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.h> #endif @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -51,7 +51,7 @@ +@@ -52,7 +52,7 @@ #include "base/system/sys_info.h" #endif @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -60,11 +60,24 @@ +@@ -61,11 +61,24 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -53,7 +53,7 @@ #elif defined(OS_MACOSX) // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570 SCDynamicStoreContext context = {0, NULL, NULL, NULL}; -@@ -110,7 +123,7 @@ +@@ -111,7 +124,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { @@ -62,7 +62,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -133,7 +146,7 @@ +@@ -134,7 +147,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index ab668c47da6e..084085fb3d9f 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,8 +1,8 @@ ---- components/policy/core/common/schema.cc.orig 2017-04-19 19:06:33 UTC +--- components/policy/core/common/schema.cc.orig 2019-03-11 22:00:56 UTC +++ components/policy/core/common/schema.cc -@@ -21,7 +21,11 @@ - #include "components/json_schema/json_schema_constants.h" - #include "components/json_schema/json_schema_validator.h" +@@ -23,7 +23,11 @@ + #include "base/strings/stringprintf.h" + #include "components/policy/core/common/json_schema_constants.h" #include "components/policy/core/common/schema_internal.h" +#if defined(OS_FREEBSD) +#include <re2/re2.h> diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 0f7d9a7f4926..354bf7e0992c 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2019-02-06 23:06:41.000000000 +0100 -+++ components/policy/resources/policy_templates.json 2019-02-08 20:46:39.627324000 +0100 -@@ -723,7 +723,7 @@ +--- components/policy/resources/policy_templates.json.orig 2019-03-11 22:00:56 UTC ++++ components/policy/resources/policy_templates.json +@@ -956,7 +956,7 @@ 'name': 'HomepageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -751,7 +751,7 @@ +@@ -983,7 +983,7 @@ 'name': 'HomepageIsNewTabPage', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -778,7 +778,7 @@ +@@ -1009,7 +1009,7 @@ 'name': 'NewTabPageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1471,7 +1471,7 @@ +@@ -1702,7 +1702,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -2946,7 +2946,7 @@ +@@ -3192,7 +3192,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -2998,7 +2998,7 @@ +@@ -3244,7 +3244,7 @@ 'name': 'NtlmV2Enabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5989,7 +5989,7 @@ +@@ -6303,7 +6303,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7058,7 +7058,7 @@ +@@ -7433,7 +7433,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -7573,7 +7573,7 @@ +@@ -7948,7 +7948,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index e2338585ebf0..33c7fd91658e 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2019-02-06 23:06:41.000000000 +0100 -+++ components/policy/tools/generate_policy_source.py 2019-02-08 20:44:33.267121000 +0100 -@@ -85,7 +85,7 @@ +--- components/policy/tools/generate_policy_source.py.orig 2019-03-11 22:00:57 UTC ++++ components/policy/tools/generate_policy_source.py +@@ -86,7 +86,7 @@ class PolicyDetails: if platform not in [ 'chrome_frame', 'chrome_os', 'android', 'webview_android', 'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.fuchsia', @@ -9,7 +9,7 @@ ]: raise RuntimeError('Platform "%s" is not supported' % platform) -@@ -104,7 +104,7 @@ +@@ -105,7 +105,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': diff --git a/www/chromium/files/patch-components_previews_core_previews__features.cc b/www/chromium/files/patch-components_previews_core_previews__features.cc new file mode 100644 index 000000000000..fabf0b3025ea --- /dev/null +++ b/www/chromium/files/patch-components_previews_core_previews__features.cc @@ -0,0 +1,18 @@ +--- components/previews/core/previews_features.cc.orig 2019-03-11 22:00:57 UTC ++++ components/previews/core/previews_features.cc +@@ -14,12 +14,12 @@ namespace features { + // are enabled are controlled by other features. + const base::Feature kPreviews { + "Previews", +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // Previews allowed for Android (but also allow on Linux for dev/debug). + base::FEATURE_ENABLED_BY_DEFAULT +-#else // !defined(OS_ANDROID) || defined(OS_LINUX) ++#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + }; + + // Enables the Offline previews on android slow connections. diff --git a/www/chromium/files/patch-components_previews_core_previews_features.cc b/www/chromium/files/patch-components_previews_core_previews_features.cc deleted file mode 100644 index 4c2bc8ae79f4..000000000000 --- a/www/chromium/files/patch-components_previews_core_previews_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/previews/core/previews_features.cc.orig 2019-01-09 12:58:28.080581000 +0100 -+++ components/previews/core/previews_features.cc 2019-01-09 12:58:43.775518000 +0100 -@@ -14,7 +14,7 @@ - // are enabled are controlled by other features. - const base::Feature kPreviews { - "Previews", --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - // Previews allowed for Android (but also allow on Linux for dev/debug). - base::FEATURE_ENABLED_BY_DEFAULT - #else // !defined(OS_ANDROID) || defined(OS_LINUX) diff --git a/www/chromium/files/patch-components_services_filesystem_file_system_app.cc b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc index a199112a5bd5..0f048efa703b 100644 --- a/www/chromium/files/patch-components_services_filesystem_file_system_app.cc +++ b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc @@ -1,6 +1,6 @@ ---- components/services/filesystem/file_system_app.cc.orig 2018-08-01 00:08:40.000000000 +0200 -+++ components/services/filesystem/file_system_app.cc 2018-08-04 18:24:22.212419000 +0200 -@@ -20,7 +20,7 @@ +--- components/services/filesystem/file_system_app.cc.orig 2019-03-11 22:00:57 UTC ++++ components/services/filesystem/file_system_app.cc +@@ -19,7 +19,7 @@ #elif defined(OS_ANDROID) #include "base/base_paths_android.h" #include "base/path_service.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) -@@ -75,7 +75,7 @@ +@@ -73,7 +73,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { CHECK(base::PathService::Get(base::DIR_APP_DATA, &path)); #elif defined(OS_ANDROID) CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); diff --git a/www/chromium/files/patch-components_services_font_font_service_app.cc b/www/chromium/files/patch-components_services_font_font__service__app.cc index 8074cc7d600d..4e23e0f9389d 100644 --- a/www/chromium/files/patch-components_services_font_font_service_app.cc +++ b/www/chromium/files/patch-components_services_font_font__service__app.cc @@ -1,6 +1,6 @@ ---- components/services/font/font_service_app.cc.orig 2019-01-09 12:18:51.659675000 +0100 -+++ components/services/font/font_service_app.cc 2019-01-09 12:19:08.146474000 +0100 -@@ -21,7 +21,7 @@ +--- components/services/font/font_service_app.cc.orig 2019-03-11 22:00:57 UTC ++++ components/services/font/font_service_app.cc +@@ -20,7 +20,7 @@ #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck #endif diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc new file mode 100644 index 000000000000..cb195fd2fce6 --- /dev/null +++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -0,0 +1,20 @@ +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2019-03-17 18:33:50 UTC ++++ components/startup_metric_utils/browser/startup_metric_utils.cc +@@ -456,7 +456,7 @@ void AddStartupEventsForTelemetry() + // RecordBrowserMainMessageLoopStart, the time since last startup is also logged + // to a histogram suffixed with the startup temperature. + void RecordTimeSinceLastStartup(PrefService* pref_service) { +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + DCHECK(pref_service); + + // Get the timestamp of the current startup. +@@ -485,7 +485,7 @@ void RecordTimeSinceLastStartup(PrefService* pref_serv + // Write the timestamp of the current startup in |pref_service|. + pref_service->SetInt64(prefs::kLastStartupTimestamp, + process_start_time.ToInternalValue()); +-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + } + + // Logs the Startup.SameVersionStartupCount histogram. Relies on |pref_service| diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index d9c7fdf1829f..cb4df570df73 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2017-12-15 02:04:15.000000000 +0100 -+++ components/storage_monitor/BUILD.gn 2017-12-30 01:29:29.688538000 +0100 -@@ -65,6 +65,17 @@ +--- components/storage_monitor/BUILD.gn.orig 2019-03-11 22:00:57 UTC ++++ components/storage_monitor/BUILD.gn +@@ -65,6 +65,17 @@ static_library("storage_monitor") { ] } diff --git a/www/chromium/files/patch-components_storage__monitor_removable_device_constants.cc b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc index a9b14084f313..055ef8ce5281 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable_device_constants.cc +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc @@ -1,6 +1,6 @@ ---- components/storage_monitor/removable_device_constants.cc.orig 2019-01-10 00:46:08.199066000 +0100 -+++ components/storage_monitor/removable_device_constants.cc 2019-01-10 00:46:30.302527000 +0100 -@@ -10,7 +10,7 @@ +--- components/storage_monitor/removable_device_constants.cc.orig 2019-03-11 22:00:57 UTC ++++ components/storage_monitor/removable_device_constants.cc +@@ -10,7 +10,7 @@ namespace storage_monitor { const char kFSUniqueIdPrefix[] = "UUID:"; const char kVendorModelSerialPrefix[] = "VendorModelSerial:"; diff --git a/www/chromium/files/patch-components_storage__monitor_removable_device_constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index add0aea20c4b..6417016c4b7e 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable_device_constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,6 +1,6 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2019-01-10 00:46:17.663204000 +0100 -+++ components/storage_monitor/removable_device_constants.h 2019-01-10 00:46:47.654124000 +0100 -@@ -15,7 +15,7 @@ +--- components/storage_monitor/removable_device_constants.h.orig 2019-03-11 22:00:57 UTC ++++ components/storage_monitor/removable_device_constants.h +@@ -15,7 +15,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc index 8542281e52cd..5565618b98b3 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-06-11 01:51:38 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2019-03-17 01:47:13 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,54 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h index cb2113e9435e..258c90fede4d 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-04-22 13:58:19 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2019-03-17 01:47:13 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc index c857b222d2e4..d59c6a39959e 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name.cc @@ -1,15 +1,15 @@ ---- components/sync/base/get_session_name.cc.orig 2017-06-05 19:03:06 UTC +--- components/sync/base/get_session_name.cc.orig 2019-03-11 22:00:57 UTC +++ components/sync/base/get_session_name.cc -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_CHROMEOS) - #include "chromeos/system/devicetype.h" + #include "chromeos/constants/devicetype.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "components/sync/base/get_session_name_linux.h" #elif defined(OS_IOS) #include "components/sync/base/get_session_name_ios.h" -@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() { +@@ -52,7 +52,7 @@ std::string GetSessionNameBlocking() { session_name = "Chromebook"; break; } diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc index 4fcf01524501..f82fe5e19719 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc @@ -1,4 +1,4 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2017-04-19 19:06:33 UTC +--- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC +++ components/sync/base/get_session_name_linux.cc @@ -13,8 +13,9 @@ namespace syncer { namespace internal { diff --git a/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc b/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc new file mode 100644 index 000000000000..6d0f62b2804d --- /dev/null +++ b/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc @@ -0,0 +1,11 @@ +--- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC ++++ components/sync/device_info/local_device_info_provider_impl.cc +@@ -15,7 +15,7 @@ namespace { + sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) { + #if defined(OS_CHROMEOS) + return sync_pb::SyncEnums_DeviceType_TYPE_CROS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; + #elif defined(OS_ANDROID) || defined(OS_IOS) + return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index e2c9a5a76e5a..a7fac7d5c9ef 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,7 +1,7 @@ ---- components/update_client/update_query_params.cc.orig 2017-06-05 19:03:06 UTC +--- components/update_client/update_query_params.cc.orig 2019-03-11 22:00:57 UTC +++ components/update_client/update_query_params.cc -@@ -35,6 +35,8 @@ const char kOs[] = - "linux"; +@@ -38,6 +38,8 @@ const char kOs[] = + "fuchsia"; #elif defined(OS_OPENBSD) "openbsd"; +#elif defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc index beccba33cb0a..33f3999ba526 100644 --- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc +++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc @@ -1,7 +1,7 @@ ---- components/url_matcher/regex_set_matcher.cc.orig 2017-04-19 19:06:33 UTC +--- components/url_matcher/regex_set_matcher.cc.orig 2019-03-11 22:00:57 UTC +++ components/url_matcher/regex_set_matcher.cc -@@ -10,8 +10,13 @@ - #include "base/memory/ptr_util.h" +@@ -11,8 +11,13 @@ + #include "base/logging.h" #include "base/strings/string_util.h" #include "components/url_matcher/substring_set_matcher.h" +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc index 3ead93f86a2a..533e9439604e 100644 --- a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc +++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc @@ -1,4 +1,4 @@ ---- components/url_matcher/url_matcher_factory.cc.orig 2017-04-19 19:06:33 UTC +--- components/url_matcher/url_matcher_factory.cc.orig 2019-03-11 22:00:57 UTC +++ components/url_matcher/url_matcher_factory.cc @@ -16,7 +16,11 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc index 9a74c3a7fd29..cc741c7d273f 100644 --- a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc +++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc @@ -1,5 +1,5 @@ ---- components/webcrypto/algorithms/test_helpers.cc.orig 2018-06-13 00:10:16.000000000 +0200 -+++ components/webcrypto/algorithms/test_helpers.cc 2018-07-19 00:07:52.270703000 +0200 +--- components/webcrypto/algorithms/test_helpers.cc.orig 2019-03-11 22:00:57 UTC ++++ components/webcrypto/algorithms/test_helpers.cc @@ -25,7 +25,11 @@ #include "components/webcrypto/status.h" #include "third_party/blink/public/platform/web_crypto_algorithm_params.h" diff --git a/www/chromium/files/patch-content_app_content_main_runner_impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index d68928a7b50f..323eabff6bbf 100644 --- a/www/chromium/files/patch-content_app_content_main_runner_impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2019-01-30 02:17:57.000000000 +0100 -+++ content/app/content_main_runner_impl.cc 2019-02-06 23:01:02.842834000 +0100 -@@ -91,17 +91,17 @@ +--- content/app/content_main_runner_impl.cc.orig 2019-03-11 22:00:57 UTC ++++ content/app/content_main_runner_impl.cc +@@ -93,17 +93,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,7 +21,16 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -307,7 +307,7 @@ +@@ -124,7 +124,7 @@ + #include "content/public/common/content_client.h" + #endif + +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + #if !defined(CHROME_MULTIPLE_DLL_BROWSER) + #include "content/child/field_trial.h" +@@ -309,7 +309,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -30,7 +39,25 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -635,11 +635,11 @@ +@@ -406,7 +406,7 @@ void PreSandboxInit() { + } + #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) + +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + } // namespace + +@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) { + delegate->ZygoteStarting(&zygote_fork_delegates); + media::InitializeMediaLibrary(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + PreSandboxInit(); + #endif + +@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index ec12325d5faf..58c52636ecb3 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2018-12-13 20:37:36.820277000 +0100 -+++ content/browser/BUILD.gn 2018-12-13 20:38:05.546755000 +0100 -@@ -1889,11 +1889,6 @@ +--- content/browser/BUILD.gn.orig 2019-03-11 22:00:57 UTC ++++ content/browser/BUILD.gn +@@ -1939,11 +1939,6 @@ jumbo_source_set("browser") { "tracing/cros_tracing_agent.h", ] deps += [ "//chromeos/resources" ] diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index c5d9dd0876e0..7fa5cc6e1e36 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,7 +1,7 @@ ---- content/browser/browser_main_loop.cc.orig 2018-08-01 00:08:43.000000000 +0200 -+++ content/browser/browser_main_loop.cc 2018-08-05 15:40:45.172441000 +0200 -@@ -234,6 +234,13 @@ - #include "services/ui/common/image_cursors_set.h" +--- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC ++++ content/browser/browser_main_loop.cc +@@ -250,6 +250,13 @@ + #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif +#if defined(OS_BSD) @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -546,6 +553,11 @@ +@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,3 +26,21 @@ #endif #if defined(USE_X11) +@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { + #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) + + #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + // We use quite a few file descriptors for our IPC as well as disk the disk + // cache,and the default limit on the Mac is low (256), so bump it up. + +@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() { + // an arbitrarily high number. See https://crbug.com/539567 + base::IncreaseFdLimitTo(8192); + #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +- // defined(OS_ANDROID) ++ // defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_WIN) + net::EnsureWinsockInit(); diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index d9ff1d90c71e..88c85393e63a 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,7 +1,7 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2018-08-01 00:08:43.000000000 +0200 -+++ content/browser/child_process_launcher_helper_linux.cc 2018-08-04 18:57:46.407465000 +0200 -@@ -18,7 +18,9 @@ - #include "gpu/config/gpu_switches.h" +--- content/browser/child_process_launcher_helper_linux.cc.orig 2019-03-11 22:00:57 UTC ++++ content/browser/child_process_launcher_helper_linux.cc +@@ -17,7 +17,9 @@ + #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" +#if !defined(OS_BSD) @@ -10,7 +10,7 @@ #include "services/service_manager/zygote/host/zygote_communication_linux.h" #include "services/service_manager/zygote/host/zygote_host_impl_linux.h" -@@ -72,6 +74,7 @@ +@@ -69,6 +71,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; @@ -18,7 +18,7 @@ service_manager::ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -85,7 +88,6 @@ +@@ -82,7 +85,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,7 +26,7 @@ if (handle) { // This is just a starting score for a renderer or extension (the // only types of processes that will be started this way). It will -@@ -96,13 +98,13 @@ +@@ -93,13 +95,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore( handle, kLowestRendererOomScore); } @@ -41,7 +41,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -120,10 +122,14 @@ +@@ -117,10 +119,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -56,7 +56,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -147,13 +153,17 @@ +@@ -144,13 +150,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc index be90730d1c07..b4f44f36bf1a 100644 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -1,8 +1,8 @@ ---- content/browser/media/media_internals.cc.orig 2017-06-05 19:03:07 UTC +--- content/browser/media/media_internals.cc.orig 2019-03-11 22:00:57 UTC +++ content/browser/media/media_internals.cc -@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -763,7 +763,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit device_dict->SetString("name", descriptor.GetNameAndModel()); - device_dict->Set("formats", format_list); + device_dict->Set("formats", std::move(format_list)); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ - defined(OS_ANDROID) + defined(OS_ANDROID) || defined(OS_BSD) diff --git a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc index d97fb80334a0..816260ba1561 100644 --- a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc +++ b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc @@ -1,6 +1,6 @@ ---- content/browser/memory/memory_monitor.cc.orig 2018-01-04 21:05:50.000000000 +0100 -+++ content/browser/memory/memory_monitor.cc 2018-01-27 19:06:05.251190000 +0100 -@@ -22,7 +22,7 @@ +--- content/browser/memory/memory_monitor.cc.orig 2019-03-11 22:00:57 UTC ++++ content/browser/memory/memory_monitor.cc +@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo( base::GetSystemMemoryInfo(mem_info); } diff --git a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc new file mode 100644 index 000000000000..ff345048baf2 --- /dev/null +++ b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc @@ -0,0 +1,27 @@ +--- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2019-03-11 22:00:57 UTC ++++ content/browser/memory/swap_metrics_driver_impl_linux.cc +@@ -43,6 +43,7 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinu + + SwapMetricsDriver::SwapMetricsUpdateResult + SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) { ++#if !defined(OS_BSD) + base::VmStatInfo vmstat; + if (!base::GetVmStatInfo(&vmstat)) { + return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; +@@ -55,12 +56,15 @@ SwapMetricsDriverImplLinux::UpdateMetricsInternal(base + + if (interval.is_zero()) + return SwapMetricsDriver::SwapMetricsUpdateResult:: +- kSwapMetricsUpdateSuccess; ++ kSwapMetricsUpdateSuccess; + + delegate_->OnSwapInCount(in_counts, interval); + delegate_->OnSwapOutCount(out_counts, interval); + + return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateSuccess; ++#else ++ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; ++#endif + } + + } // namespace content diff --git a/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc b/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc deleted file mode 100644 index 6d5736168798..000000000000 --- a/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2018-06-13 00:10:16.000000000 +0200 -+++ content/browser/memory/swap_metrics_driver_impl_linux.cc 2018-07-21 00:28:47.747286000 +0200 -@@ -44,9 +44,13 @@ - SwapMetricsDriver::SwapMetricsUpdateResult - SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) { - base::VmStatInfo vmstat; -+#if !defined(OS_BSD) - if (!base::GetVmStatInfo(&vmstat)) { - return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; - } -+#else -+ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; -+#endif - - uint64_t in_counts = vmstat.pswpin - last_pswpin_; - uint64_t out_counts = vmstat.pswpout - last_pswpout_; diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.cc b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc index 7a0a9a66a3e0..4dbe486d9251 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-01-09 11:52:33.084857000 +0100 -+++ content/browser/renderer_host/input/input_device_change_observer.cc 2019-01-09 11:53:04.895039000 +0100 -@@ -9,7 +9,7 @@ +--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-03-11 22:00:58 UTC ++++ content/browser/renderer_host/input/input_device_change_observer.cc +@@ -10,7 +10,7 @@ #if defined(OS_WIN) #include "ui/events/devices/input_device_observer_win.h" @@ -9,8 +9,8 @@ #include "ui/events/devices/input_device_manager.h" #elif defined(OS_ANDROID) #include "ui/events/devices/input_device_observer_android.h" -@@ -21,7 +21,7 @@ - render_view_host_ = rvh; +@@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R + render_view_host_impl_ = rvhi; #if defined(OS_WIN) ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); -#elif defined(OS_LINUX) @@ -18,7 +18,7 @@ ui::InputDeviceManager::GetInstance()->AddObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R InputDeviceChangeObserver::~InputDeviceChangeObserver() { #if defined(OS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index b83deb938730..b2144f7f4b7a 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2018-06-13 00:10:17.000000000 +0200 -+++ content/browser/renderer_host/render_message_filter.cc 2018-07-19 11:46:53.426069000 +0200 -@@ -76,7 +76,7 @@ +--- content/browser/renderer_host/render_message_filter.cc.orig 2019-03-11 22:00:58 UTC ++++ content/browser/renderer_host/render_message_filter.cc +@@ -71,7 +71,7 @@ #if defined(OS_MACOSX) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -194,7 +194,7 @@ +@@ -151,7 +151,7 @@ void RenderMessageFilter::CreateFullscreenWidget( std::move(callback).Run(route_id); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -215,7 +215,7 @@ +@@ -172,7 +172,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea } #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index c0edfd2507bf..fd3e611cc264 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,8 +1,8 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2018-06-13 00:10:17.000000000 +0200 -+++ content/browser/renderer_host/render_message_filter.h 2018-07-20 17:25:54.254096000 +0200 -@@ -114,14 +114,14 @@ - const url::Origin& cache_storage_origin, - const std::string& cache_storage_cache_name) override; +--- content/browser/renderer_host/render_message_filter.h.orig 2019-03-11 22:00:58 UTC ++++ content/browser/renderer_host/render_message_filter.h +@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter + mojom::WidgetPtr widget, + CreateFullscreenWidgetCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 1979cf623514..4d41e5f1077e 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2017-08-02 01:07:45.102330000 +0200 -+++ content/browser/renderer_host/render_process_host_impl.h 2017-08-02 01:09:10.056596000 +0200 -@@ -290,10 +290,10 @@ +--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-03-11 22:00:58 UTC ++++ content/browser/renderer_host/render_process_host_impl.h +@@ -407,10 +407,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } @@ -11,5 +11,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - void RecomputeAndUpdateWebKitPreferences(); - + RendererAudioOutputStreamFactoryContext* + GetRendererAudioOutputStreamFactoryContext() override; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 4cb3b1d5ed56..ea644916e3f7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-06-05 19:03:07 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-03-11 22:00:58 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -142,7 +142,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre +@@ -161,7 +161,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 9b17803027c7..50efe3a52519 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-06-05 19:03:07 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-03-11 22:00:58 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -114,7 +114,7 @@ +@@ -121,7 +121,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2040,7 +2040,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2192,7 +2192,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2241,7 +2241,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent( +@@ -2390,7 +2390,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 8c5d9bc91d40..0317c81068ea 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-06-05 19:03:07 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -548,7 +548,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc index 1a5c389a8f8c..906761601b4b 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc @@ -1,5 +1,5 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2019-01-30 02:17:59.000000000 +0100 -+++ content/browser/scheduler/responsiveness/native_event_observer.cc 2019-02-01 00:19:02.237926000 +0100 +--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2019-03-11 22:00:58 UTC ++++ content/browser/scheduler/responsiveness/native_event_observer.cc @@ -15,7 +15,7 @@ #include "ui/events/platform/platform_event_source.h" @@ -9,7 +9,7 @@ #include "ui/aura/env.h" #include "ui/events/event.h" #endif -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ NativeEventObserver::~NativeEventObserver() { DeregisterObserver(); } @@ -18,7 +18,7 @@ void NativeEventObserver::RegisterObserver() { aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this); } -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ void NativeEventObserver::OnWindowEventDispatcherFinis did_run_event_callback_.Run(info.unique_id); events_being_processed_.pop_back(); } diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h index 02993aea0da5..03b31b8d904e 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,5 +1,5 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2019-01-30 02:17:59.000000000 +0100 -+++ content/browser/scheduler/responsiveness/native_event_observer.h 2019-02-01 00:24:39.349687000 +0100 +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2019-03-11 22:00:58 UTC ++++ content/browser/scheduler/responsiveness/native_event_observer.h @@ -14,7 +14,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/window_event_dispatcher_observer.h" #endif -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver #if defined(OS_MACOSX) : public NativeEventProcessorObserver @@ -18,7 +18,7 @@ : public aura::WindowEventDispatcherObserver #elif defined(OS_WIN) : public base::MessagePumpForUI::Observer -@@ -56,7 +56,7 @@ +@@ -56,7 +56,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); @@ -27,7 +27,7 @@ ~NativeEventObserver() override; #else virtual ~NativeEventObserver(); -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ class CONTENT_EXPORT NativeEventObserver // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; @@ -36,7 +36,7 @@ // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ class CONTENT_EXPORT NativeEventObserver void RegisterObserver(); void DeregisterObserver(); diff --git a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc index fec40e1a7351..dbb845ce1377 100644 --- a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc +++ b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc @@ -1,7 +1,7 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-02-06 19:17:17.245963000 +0100 -+++ content/browser/service_manager/service_manager_context.cc 2019-02-06 19:18:30.535127000 +0100 -@@ -100,7 +100,7 @@ - #include "ui/aura/env.h" +--- content/browser/service_manager/service_manager_context.cc.orig 2019-03-11 22:00:58 UTC ++++ content/browser/service_manager/service_manager_context.cc +@@ -99,7 +99,7 @@ + #include "jni/ContentNfcDelegate_jni.h" #endif -#if defined(OS_LINUX) @@ -9,21 +9,27 @@ #include "components/services/font/font_service_app.h" #include "components/services/font/public/interfaces/constants.mojom.h" #endif -@@ -436,7 +436,7 @@ +@@ -378,12 +378,12 @@ void CreateInProcessAudioService( BrowserMainLoop::GetAudioManager(), std::move(request))); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - void CreateFontService(service_manager::mojom::ServiceRequest request) { - // The font service owns itself here, deleting on self-termination. - auto service = -@@ -700,7 +700,7 @@ - out_of_process_services[data_decoder::mojom::kServiceName] = - base::BindRepeating(&base::ASCIIToUTF16, "Data Decoder Service"); + std::unique_ptr<service_manager::Service> CreateFontService( + service_manager::mojom::ServiceRequest request) { + return std::make_unique<font_service::FontServiceApp>(std::move(request)); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService( + service_manager::mojom::ServiceRequest request) { +@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext( + base::BindRepeating(&CreateVideoCaptureService)); + } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - packaged_services_connection_->AddServiceRequestHandler( - font_service::mojom::kServiceName, - base::BindRepeating([](service_manager::mojom::ServiceRequest request) { + RegisterInProcessService( + packaged_services_connection_.get(), font_service::mojom::kServiceName, + base::CreateSequencedTaskRunnerWithTraits( diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl.cc b/www/chromium/files/patch-content_browser_storage__partition__impl.cc new file mode 100644 index 000000000000..a086392dfa90 --- /dev/null +++ b/www/chromium/files/patch-content_browser_storage__partition__impl.cc @@ -0,0 +1,11 @@ +--- content/browser/storage_partition_impl.cc.orig 2019-03-17 17:48:03 UTC ++++ content/browser/storage_partition_impl.cc +@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge + // TODO(jam): enable for all, still used on WebView. + // See copy of this ifdef in: + // StoragePartitionImplMap::Get +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) + NOTREACHED(); + #endif diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc b/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc new file mode 100644 index 000000000000..977fdd529673 --- /dev/null +++ b/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc @@ -0,0 +1,11 @@ +--- content/browser/storage_partition_impl_map.cc.orig 2019-03-17 17:40:34 UTC ++++ content/browser/storage_partition_impl_map.cc +@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get( + bool create_request_context = true; + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { + // These ifdefs should match StoragePartitionImpl::GetURLRequestContext. +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + create_request_context = false; + #elif defined(OS_ANDROID) + create_request_context = diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index 5c64d2d2a978..6ba8db73abcd 100644 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,6 +1,6 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-02-06 23:05:16.881256000 +0100 -+++ content/browser/webui/shared_resources_data_source.cc 2019-02-06 23:05:49.834217000 +0100 -@@ -73,9 +73,9 @@ +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-03-11 22:00:58 UTC ++++ content/browser/webui/shared_resources_data_source.cc +@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT return std::map<int, std::string> { {IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"}, {IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_lite.js"}, diff --git a/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc b/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc deleted file mode 100644 index 3c761fe60107..000000000000 --- a/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc +++ /dev/null @@ -1,69 +0,0 @@ ---- content/browser/webui/web_ui_data_source_impl.cc.orig 2019-01-09 19:45:36.420732000 +0100 -+++ content/browser/webui/web_ui_data_source_impl.cc 2019-01-09 19:53:12.218574000 +0100 -@@ -123,24 +123,24 @@ - WebUIDataSourceImpl::~WebUIDataSourceImpl() { - } - --void WebUIDataSourceImpl::AddString(base::StringPiece name, -+void WebUIDataSourceImpl::AddString(const std::string& name, - const base::string16& value) { - // TODO(dschuyler): Share only one copy of these strings. - localized_strings_.SetKey(name, base::Value(value)); -- replacements_[name.as_string()] = base::UTF16ToUTF8(value); -+ replacements_[name] = base::UTF16ToUTF8(value); - } - --void WebUIDataSourceImpl::AddString(base::StringPiece name, -+void WebUIDataSourceImpl::AddString(const std::string& name, - const std::string& value) { - localized_strings_.SetKey(name, base::Value(value)); -- replacements_[name.as_string()] = value; -+ replacements_[name] = value; - } - --void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) { -+void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) { - std::string utf8_str = - base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids)); - localized_strings_.SetKey(name, base::Value(utf8_str)); -- replacements_[name.as_string()] = utf8_str; -+ replacements_[name] = utf8_str; - } - - void WebUIDataSourceImpl::AddLocalizedStrings( -@@ -150,7 +150,7 @@ - &replacements_); - } - --void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) { -+void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) { - localized_strings_.SetBoolean(name, value); - // TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_| - // or similar. These values haven't been found as strings for -@@ -159,21 +159,21 @@ - // replacements. - } - --void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) { -+void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) { - localized_strings_.SetInteger(name, value); - } - --void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) { -+void WebUIDataSourceImpl::SetJsonPath(const std::string& path) { - DCHECK(json_path_.empty()); - DCHECK(!path.empty()); - -- json_path_ = path.as_string(); -+ json_path_ = path; - excluded_paths_.insert(json_path_); - } - --void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path, -+void WebUIDataSourceImpl::AddResourcePath(const std::string& path, - int resource_id) { -- path_to_idr_map_[path.as_string()] = resource_id; -+ path_to_idr_map_[path] = resource_id; - } - - void WebUIDataSourceImpl::SetDefaultResource(int resource_id) { diff --git a/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h b/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h deleted file mode 100644 index 097d493816aa..000000000000 --- a/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h +++ /dev/null @@ -1,25 +0,0 @@ ---- content/browser/webui/web_ui_data_source_impl.h.orig 2019-01-09 19:45:44.740357000 +0100 -+++ content/browser/webui/web_ui_data_source_impl.h 2019-01-09 19:48:21.066890000 +0100 -@@ -31,15 +31,15 @@ - public WebUIDataSource { - public: - // WebUIDataSource implementation: -- void AddString(base::StringPiece name, const base::string16& value) override; -- void AddString(base::StringPiece name, const std::string& value) override; -- void AddLocalizedString(base::StringPiece name, int ids) override; -+ void AddString(const std::string& name, const base::string16& value) override; -+ void AddString(const std::string& name, const std::string& value) override; -+ void AddLocalizedString(const std::string& name, int ids) override; - void AddLocalizedStrings( - const base::DictionaryValue& localized_strings) override; -- void AddBoolean(base::StringPiece name, bool value) override; -- void AddInteger(base::StringPiece name, int32_t value) override; -- void SetJsonPath(base::StringPiece path) override; -- void AddResourcePath(base::StringPiece path, int resource_id) override; -+ void AddBoolean(const std::string& name, bool value) override; -+ void AddInteger(const std::string& name, int32_t value) override; -+ void SetJsonPath(const std::string& path) override; -+ void AddResourcePath(const std::string& path, int resource_id) override; - void SetDefaultResource(int resource_id) override; - void SetRequestFilter( - const WebUIDataSource::HandleRequestCallback& callback) override; diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 6ebd6237de44..030ecf86ce76 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2018-06-13 00:10:17.000000000 +0200 -+++ content/common/BUILD.gn 2018-07-20 00:38:14.267181000 +0200 -@@ -430,6 +430,12 @@ +--- content/common/BUILD.gn.orig 2019-03-11 22:00:58 UTC ++++ content/common/BUILD.gn +@@ -382,6 +382,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc new file mode 100644 index 000000000000..95e576060511 --- /dev/null +++ b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc @@ -0,0 +1,10 @@ +--- content/common/common_sandbox_support_linux.cc.orig 2019-03-11 22:00:58 UTC ++++ content/common/common_sandbox_support_linux.cc +@@ -5,6 +5,7 @@ + #include "content/public/common/common_sandbox_support_linux.h" + + #include <sys/stat.h> ++#include <unistd.h> + + #include <limits> + #include <memory> diff --git a/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc b/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc deleted file mode 100644 index 3ecc98082147..000000000000 --- a/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/common/common_sandbox_support_linux.cc.orig 2018-08-04 19:46:27.654459000 +0200 -+++ content/common/common_sandbox_support_linux.cc 2018-08-04 19:46:40.138833000 +0200 -@@ -5,6 +5,7 @@ - #include "content/public/common/common_sandbox_support_linux.h" - - #include <sys/stat.h> -+#include <unistd.h> - - #include <limits> - #include <memory> - diff --git a/www/chromium/files/patch-content_common_user_agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 834a1691682f..002892b99d10 100644 --- a/www/chromium/files/patch-content_common_user_agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2017-12-23 22:30:16.333353000 +0100 -+++ content/common/user_agent.cc 2017-12-23 22:32:27.429827000 +0100 -@@ -131,6 +131,14 @@ +--- content/common/user_agent.cc.orig 2019-03-11 22:00:58 UTC ++++ content/common/user_agent.cc +@@ -131,6 +131,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ #endif ); // NOLINT diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index 07e763b7ad0a..ec8cd90795ce 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2019-01-04 22:49:40.191544000 +0100 -+++ content/gpu/BUILD.gn 2019-01-04 22:50:06.857572000 +0100 -@@ -131,7 +131,7 @@ +--- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC ++++ content/gpu/BUILD.gn +@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 6785369f664a..aba058e673bb 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2018-12-03 21:16:56.000000000 +0100 -+++ content/gpu/gpu_main.cc 2018-12-13 21:10:56.227630000 +0100 -@@ -77,7 +77,7 @@ +--- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC ++++ content/gpu/gpu_main.cc +@@ -78,7 +78,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -110,7 +110,7 @@ +@@ -111,7 +111,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -171,7 +171,7 @@ +@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -361,7 +361,7 @@ +@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +36,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -396,7 +396,7 @@ +@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 1cf9663e1e6f..108731c88ab0 100644 --- a/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,51 +1,51 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2018-12-12 22:56:07.000000000 +0100 -+++ content/gpu/gpu_sandbox_hook_linux.cc 2019-01-11 16:30:27.925996000 +0100 -@@ -95,8 +95,9 @@ +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC ++++ content/gpu/gpu_sandbox_hook_linux.cc +@@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif - + -constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; +constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL; - + +#if !defined(OS_BSD) void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -265,8 +266,10 @@ +@@ -277,8 +278,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } +#endif - + void LoadArmGpuLibraries() { +#if !defined(OS_BSD) // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -281,6 +284,7 @@ +@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } +#endif } - + bool LoadAmdGpuLibraries() { -@@ -336,6 +340,7 @@ +@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu( return true; } - + +#if !defined(OS_BSD) sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -356,13 +361,17 @@ +@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } +#endif - + } // namespace - + bool GpuProcessPreSandboxHook(service_manager::SandboxLinux::Options options) { + NOTIMPLEMENTED(); +#if !defined(OS_BSD) @@ -53,6 +53,6 @@ CommandSetForGPU(options), FilePermissionsForGpu(options), base::BindOnce(BrokerProcessPreSandboxHook), options); +#endif - + if (!LoadLibrariesForGpu(options)) return false; diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index 4544face56c0..0860cc595a92 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,24 +1,24 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-01-30 02:17:59.000000000 +0100 -+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc 2019-02-01 00:41:49.296005000 +0100 -@@ -36,7 +36,7 @@ +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC ++++ content/ppapi_plugin/ppapi_blink_platform_impl.cc +@@ -20,7 +20,7 @@ - namespace content { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport { - public: -@@ -118,7 +118,7 @@ + #if defined(OS_MACOSX) + #include "content/child/child_process_sandbox_support_impl_mac.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "content/child/child_process_sandbox_support_impl_linux.h" #endif +@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef; + namespace content { + PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) font_loader_ = sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector()); SkFontConfigInterface::SetGlobal(font_loader_); -@@ -134,7 +134,7 @@ +@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { } void PpapiBlinkPlatformImpl::Shutdown() { @@ -27,7 +27,7 @@ // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -144,7 +144,7 @@ +@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { } blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index ba5605a56402..c2bd54f54ced 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,5 +1,5 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-01-30 02:17:59.000000000 +0100 -+++ content/ppapi_plugin/ppapi_blink_platform_impl.h 2019-02-01 00:52:30.911304000 +0100 +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC ++++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "content/child/blink_platform_impl.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -42,11 +42,11 @@ +@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp bool sync_dir) override; private: @@ -20,6 +20,6 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - class SandboxSupport; sk_sp<font_service::FontLoader> font_loader_; #endif + diff --git a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc new file mode 100644 index 000000000000..0a187e7f641b --- /dev/null +++ b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc @@ -0,0 +1,20 @@ +--- content/public/app/content_packaged_services_manifest.cc.orig 2019-03-11 22:00:58 UTC ++++ content/public/app/content_packaged_services_manifest.cc +@@ -23,7 +23,7 @@ + #include "services/video_capture/manifest.h" + #include "services/viz/manifest.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/manifest.h" + #endif + +@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer + .PackageService(tracing::GetManifest()) + .PackageService(video_capture::GetManifest()) + .PackageService(viz::GetManifest()) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + .PackageService(font_service::GetManifest()) + #endif + #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc b/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc new file mode 100644 index 000000000000..28f94888055e --- /dev/null +++ b/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc @@ -0,0 +1,11 @@ +--- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-03-24 18:50:53.929211000 +0100 ++++ content/public/app/v8_snapshot_overlay_manifest.cc 2019-03-24 18:51:09.015465000 +0100 +@@ -15,7 +15,7 @@ + const service_manager::Manifest& GetV8SnapshotOverlayManifest() { + static base::NoDestructor<service_manager::Manifest> manifest { + service_manager::ManifestBuilder() +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + .PreloadFile(kV8NativesDataDescriptor, + base::FilePath(FILE_PATH_LITERAL("natives_blob.bin"))) + #if defined(USE_V8_CONTEXT_SNAPSHOT) diff --git a/www/chromium/files/patch-content_public_browser_web_ui_data_source.h b/www/chromium/files/patch-content_public_browser_web_ui_data_source.h deleted file mode 100644 index 0f3eb01bf131..000000000000 --- a/www/chromium/files/patch-content_public_browser_web_ui_data_source.h +++ /dev/null @@ -1,51 +0,0 @@ ---- content/public/browser/web_ui_data_source.h.orig 2019-01-09 12:09:09.754984000 +0100 -+++ content/public/browser/web_ui_data_source.h 2019-01-09 12:14:15.249680000 +0100 -@@ -13,7 +13,6 @@ - - #include "base/callback.h" - #include "base/strings/string16.h" --#include "base/strings/string_piece.h" - #include "content/common/content_export.h" - - namespace base { -@@ -45,33 +44,33 @@ - std::unique_ptr<base::DictionaryValue> update); - - // Adds a string keyed to its name to our dictionary. -- virtual void AddString(base::StringPiece name, -+ virtual void AddString(const std::string& name, - const base::string16& value) = 0; - - // Adds a string keyed to its name to our dictionary. -- virtual void AddString(base::StringPiece name, const std::string& value) = 0; -+ virtual void AddString(const std::string& name, const std::string& value) = 0; - - // Adds a localized string with resource |ids| keyed to its name to our - // dictionary. -- virtual void AddLocalizedString(base::StringPiece name, int ids) = 0; -+ virtual void AddLocalizedString(const std::string& name, int ids) = 0; - - // Add strings from |localized_strings| to our dictionary. - virtual void AddLocalizedStrings( - const base::DictionaryValue& localized_strings) = 0; - - // Adds a boolean keyed to its name to our dictionary. -- virtual void AddBoolean(base::StringPiece name, bool value) = 0; -+ virtual void AddBoolean(const std::string& name, bool value) = 0; - - // Adds a signed 32-bit integer keyed to its name to our dictionary. Larger - // integers may not be exactly representable in JavaScript. See - // MAX_SAFE_INTEGER in /v8/src/globals.h. -- virtual void AddInteger(base::StringPiece name, int32_t value) = 0; -+ virtual void AddInteger(const std::string& name, int32_t value) = 0; - - // Sets the path which will return the JSON strings. -- virtual void SetJsonPath(base::StringPiece path) = 0; -+ virtual void SetJsonPath(const std::string& path) = 0; - - // Adds a mapping between a path name and a resource to return. -- virtual void AddResourcePath(base::StringPiece path, int resource_id) = 0; -+ virtual void AddResourcePath(const std::string& path, int resource_id) = 0; - - // Sets the resource to returned when no other paths match. - virtual void SetDefaultResource(int resource_id) = 0; diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index 0ec797f1c8d6..be119b0b033f 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- content/public/common/child_process_host.h.orig 2017-06-05 19:03:07 UTC +--- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC +++ content/public/common/child_process_host.h -@@ -46,7 +46,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -47,7 +47,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, @@ -9,7 +9,7 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -55,7 +55,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -56,7 +56,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // gdb). In this case, you'd use GetChildPath to get the real executable // file name, and then prepend the GDB command to the command line. CHILD_ALLOW_SELF = 1 << 0, diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 605c82522197..190748e6447c 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2018-12-13 21:04:53.822520000 +0100 -+++ content/public/common/common_param_traits_macros.h 2018-12-13 21:05:25.292903000 +0100 -@@ -321,7 +321,7 @@ +--- content/public/common/common_param_traits_macros.h.orig 2019-03-11 22:00:58 UTC ++++ content/public/common/common_param_traits_macros.h +@@ -325,7 +325,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc new file mode 100644 index 000000000000..228177dc69a0 --- /dev/null +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -0,0 +1,11 @@ +--- content/public/common/content_features.cc.orig 2019-03-24 18:52:00.447438000 +0100 ++++ content/public/common/content_features.cc 2019-03-24 18:52:16.870073000 +0100 +@@ -493,7 +493,7 @@ + base::FEATURE_DISABLED_BY_DEFAULT}; + + // Enable WebAssembly trap handler. +-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_64) + const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", + base::FEATURE_ENABLED_BY_DEFAULT}; + #else diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 914b3fea0b04..48cac09ce79d 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,7 +1,7 @@ ---- content/public/common/content_switches.cc.orig 2017-06-05 19:03:07 UTC +--- content/public/common/content_switches.cc.orig 2019-03-11 22:00:58 UTC +++ content/public/common/content_switches.cc -@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = - "disable-vaapi-accelerated-video-encode"; +@@ -968,7 +968,7 @@ const char kDisableAudioSupportForDesktopShare[] = + const char kDisablePanelFitting[] = "disable-panel-fitting"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index e52d1be3dd8c..4ef3b25a854a 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,7 +1,7 @@ ---- content/public/common/content_switches.h.orig 2017-06-05 19:03:07 UTC +--- content/public/common/content_switches.h.orig 2019-03-11 22:00:58 UTC +++ content/public/common/content_switches.h -@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ - CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; +@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ + CONTENT_EXPORT extern const char kDisablePanelFitting[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-content_public_common_renderer__preferences.h b/www/chromium/files/patch-content_public_common_renderer__preferences.h index 971d50f4904a..06c9495f2b6d 100644 --- a/www/chromium/files/patch-content_public_common_renderer__preferences.h +++ b/www/chromium/files/patch-content_public_common_renderer__preferences.h @@ -1,6 +1,6 @@ ---- content/public/common/renderer_preferences.h.orig 2017-06-05 19:03:07 UTC +--- content/public/common/renderer_preferences.h.orig 2019-03-11 22:00:58 UTC +++ content/public/common/renderer_preferences.h -@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreferences { +@@ -120,7 +120,7 @@ struct CONTENT_EXPORT RendererPreferences { // Country iso of the mobile network for content detection purpose. std::string network_contry_iso; diff --git a/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.cc b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc index b9e2948e9404..b448c3f07db5 100644 --- a/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.cc +++ b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc @@ -1,6 +1,6 @@ ---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2019-01-09 12:03:15.666391000 +0100 -+++ content/public/common/use_zoom_for_dsf_policy.cc 2019-01-09 12:03:35.744606000 +0100 -@@ -25,7 +25,7 @@ +--- content/public/common/use_zoom_for_dsf_policy.cc.orig 2019-03-11 22:00:58 UTC ++++ content/public/common/use_zoom_for_dsf_policy.cc +@@ -25,7 +25,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{ #endif bool IsUseZoomForDSFEnabledByDefault() { diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 6c747929dc9c..1c04e6682c14 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,8 +1,8 @@ ---- content/public/test/browser_test_base.cc.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/public/test/browser_test_base.cc 2018-03-04 01:33:57.278528000 +0100 -@@ -49,6 +49,10 @@ - #include "ui/gl/gl_implementation.h" - #include "ui/gl/gl_switches.h" +--- content/public/test/browser_test_base.cc.orig 2019-03-11 22:00:58 UTC ++++ content/public/test/browser_test_base.cc +@@ -62,6 +62,10 @@ + #include "ui/views/test/event_generator_delegate_mac.h" + #endif +#if defined(OS_FREEBSD) +#include <sys/signal.h> diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc new file mode 100644 index 000000000000..3837fbd79ecf --- /dev/null +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -0,0 +1,11 @@ +--- content/public/test/mock_render_thread.cc.orig 2019-03-17 17:24:56 UTC ++++ content/public/test/mock_render_thread.cc +@@ -69,7 +69,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend + std::move(callback).Run(false); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void SetThreadPriority(int32_t platform_thread_id, + base::ThreadPriority thread_priority) override {} + #endif diff --git a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc index b07f06e41d0f..42d0c2ee4eee 100644 --- a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc +++ b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-02-06 23:09:19.538251000 +0100 -+++ content/renderer/media/audio/audio_device_factory.cc 2019-02-06 23:09:35.343662000 +0100 -@@ -33,7 +33,7 @@ +--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-03-11 22:00:58 UTC ++++ content/renderer/media/audio/audio_device_factory.cc +@@ -33,7 +33,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul namespace { diff --git a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc index 543ee9de416e..e8c4b3a167b7 100644 --- a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc @@ -1,15 +1,15 @@ ---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2018-12-12 22:56:07.000000000 +0100 -+++ content/renderer/media/stream/processed_local_audio_source.cc 2019-01-09 12:08:00.136944000 +0100 -@@ -35,7 +35,7 @@ +--- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-03-11 22:00:58 UTC ++++ content/renderer/media/stream/processed_local_audio_source.cc +@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier = const_cast<void**>(&kProcessedLocalAudioSourceIdentifier); - + bool ApmInAudioServiceEnabled() { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService); #else return false; -@@ -341,7 +341,7 @@ +@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc new file mode 100644 index 000000000000..179ab20533ae --- /dev/null +++ b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc @@ -0,0 +1,11 @@ +--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-03-17 17:29:28 UTC ++++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc +@@ -203,7 +203,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) { + TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) { + SetupRenderer(kDefaultOutputDeviceId); + renderer_proxy_->Start(); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) + static const int kExpectedBufferSize = kHardwareSampleRate / 100; + #elif defined(OS_ANDROID) + static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100; diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index ca77db2f8590..950c2e011d7a 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2018-12-03 21:16:57.000000000 +0100 -+++ content/renderer/render_thread_impl.cc 2018-12-13 21:23:23.111245000 +0100 -@@ -192,12 +192,21 @@ +--- content/renderer/render_thread_impl.cc.orig 2019-03-11 22:00:58 UTC ++++ content/renderer/render_thread_impl.cc +@@ -191,12 +191,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -932,7 +941,7 @@ +@@ -926,7 +935,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,7 +31,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -973,7 +982,7 @@ +@@ -967,7 +976,7 @@ void RenderThreadImpl::Init() { GetConnector()->BindInterface(mojom::kBrowserServiceName, mojo::MakeRequest(&storage_partition_service_)); @@ -40,7 +40,7 @@ render_message_filter()->SetThreadPriority( ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); #endif -@@ -1331,11 +1340,11 @@ +@@ -1337,11 +1346,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_gpu_memory_buffers = !is_gpu_compositing_disabled_ && diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 96c0e1edcf42..ebd1a58d9253 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,24 +1,15 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-01-30 02:18:00.000000000 +0100 -+++ content/renderer/renderer_blink_platform_impl.cc 2019-02-07 00:24:24.998896000 +0100 -@@ -193,7 +193,7 @@ +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC ++++ content/renderer/renderer_blink_platform_impl.cc +@@ -109,7 +109,7 @@ - //------------------------------------------------------------------------------ - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - class RendererBlinkPlatformImpl::SandboxSupport - : public blink::WebSandboxSupport { - public: -@@ -223,7 +223,7 @@ - std::map<int32_t, blink::OutOfProcessFont> unicode_font_families_; - sk_sp<font_service::FontLoader> font_loader_; - }; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - //------------------------------------------------------------------------------ + #if defined(OS_MACOSX) + #include "content/child/child_process_sandbox_support_impl_mac.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "content/child/child_process_sandbox_support_impl_linux.h" + #endif -@@ -247,7 +247,7 @@ +@@ -202,7 +202,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( ->Clone(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); @@ -27,7 +18,7 @@ font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get()); SkFontConfigInterface::SetGlobal(font_loader_); #endif -@@ -256,7 +256,7 @@ +@@ -211,7 +211,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( connector_ = service_manager::Connector::Create(&request); } @@ -36,7 +27,7 @@ if (g_sandbox_enabled && sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -285,7 +285,7 @@ +@@ -239,7 +239,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( } void RendererBlinkPlatformImpl::Shutdown() { @@ -45,7 +36,7 @@ // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -366,7 +366,7 @@ +@@ -320,7 +320,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -54,7 +45,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -379,7 +379,7 @@ +@@ -333,7 +333,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { @@ -63,12 +54,3 @@ return sandbox_support_.get(); #else // These platforms do not require sandbox support. -@@ -560,7 +560,7 @@ - - //------------------------------------------------------------------------------ - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - void RendererBlinkPlatformImpl::SandboxSupport::GetFallbackFontForCharacter( - blink::WebUChar32 character, diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 7f62afb0dbdb..7c4e00966793 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,7 +1,7 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-01-30 02:18:00.000000000 +0100 -+++ content/renderer/renderer_blink_platform_impl.h 2019-02-06 23:14:36.979983000 +0100 +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC ++++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ - #include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom.h" + #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h" -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -264,7 +264,7 @@ +@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr<service_manager::Connector> connector_; scoped_refptr<base::SingleThreadTaskRunner> io_runner_; @@ -18,12 +18,12 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -299,7 +299,7 @@ +@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_; scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - class SandboxSupport; sk_sp<font_service::FontLoader> font_loader_; #endif + diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 56a8db8d3799..6ed0afba21b3 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-06-05 19:03:07 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2019-03-11 22:00:58 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc -@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ +@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } bool RendererMainPlatformDelegate::EnableSandbox() { @@ -8,7 +8,7 @@ // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md // -@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn new file mode 100644 index 000000000000..98908a3bb40c --- /dev/null +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -0,0 +1,11 @@ +--- content/shell/BUILD.gn.orig 2019-03-24 18:54:11.955928000 +0100 ++++ content/shell/BUILD.gn 2019-03-24 18:54:21.602776000 +0100 +@@ -942,7 +942,7 @@ + if (is_win) { + data_deps += [ "//build/win:copy_cdb_to_output" ] + } +- if (is_posix && !is_android) { ++ if (is_posix && !is_android && !is_bsd) { + data_deps += [ + "//third_party/breakpad:dump_syms($host_toolchain)", + "//third_party/breakpad:minidump_stackwalk($host_toolchain)", diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index f8a4b60779d4..2be54e0a8040 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2017-06-05 19:03:07 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -25,7 +25,7 @@ +@@ -28,7 +28,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,9 +9,9 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -101,7 +101,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) - CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); + CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 365f1b1f6dcc..5176c7191552 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2017-12-15 02:04:18.000000000 +0100 -+++ content/shell/browser/shell_browser_main_parts.cc 2017-12-24 15:15:04.473424000 +0100 -@@ -49,7 +49,7 @@ +--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC ++++ content/shell/browser/shell_browser_main_parts.cc +@@ -48,7 +48,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -133,7 +133,7 @@ +@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc new file mode 100644 index 000000000000..ee4c1426d550 --- /dev/null +++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc @@ -0,0 +1,29 @@ +--- content/shell/test_runner/test_runner.cc.orig 2019-03-17 17:19:52 UTC ++++ content/shell/test_runner/test_runner.cc +@@ -64,7 +64,7 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/skia_util.h" + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + #include "third_party/blink/public/platform/web_font_render_style.h" + #endif + +@@ -1542,7 +1542,7 @@ void TestRunner::Reset() { + drag_image_.reset(); + + blink::WebSecurityPolicy::ClearOriginAccessList(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + blink::WebFontRenderStyle::SetSubpixelPositioning(false); + #endif + +@@ -2091,7 +2091,7 @@ void TestRunner::AddOriginAccessAllowListEntry( + } + + void TestRunner::SetTextSubpixelPositioning(bool value) { +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + // Since FontConfig doesn't provide a variable to control subpixel + // positioning, we'll fall back to setting it globally for all fonts. + blink::WebFontRenderStyle::SetSubpixelPositioning(value); diff --git a/www/chromium/files/patch-content_test_content_test_suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc index 479bdc199172..230f8ca92226 100644 --- a/www/chromium/files/patch-content_test_content_test_suite.cc +++ b/www/chromium/files/patch-content_test_content__test__suite.cc @@ -1,15 +1,15 @@ ---- content/test/content_test_suite.cc.orig 2017-12-15 02:04:18.000000000 +0100 -+++ content/test/content_test_suite.cc 2017-12-24 15:49:56.061177000 +0100 -@@ -87,6 +87,7 @@ +--- content/test/content_test_suite.cc.orig 2019-03-11 22:00:58 UTC ++++ content/test/content_test_suite.cc +@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess); +#if !defined(OS_BSD) if (!is_child_process) { - gpu::GPUInfo gpu_info; - gpu::CollectBasicGraphicsInfo(&gpu_info); -@@ -99,6 +100,7 @@ - gpu_feature_info.disabled_extensions); + gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff(); + auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo(); +@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() { + gpu_feature_info->disabled_extensions); gl::init::InitializeExtensionSettingsOneOffPlatform(); } +#endif diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 6ad97cc12616..8463a3b71752 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,30 +1,15 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-02-06 23:15:41.158565000 +0100 -+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc 2019-02-06 23:16:32.076308000 +0100 -@@ -9,7 +9,7 @@ +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-03-11 22:00:58 UTC ++++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc +@@ -8,7 +8,7 @@ + #if defined(OS_MACOSX) - #include "base/mac/foundation_util.h" #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/synchronization/lock.h" #include "content/child/child_process_sandbox_support_impl_linux.h" - #include "content/child/child_thread_impl.h" -@@ -26,7 +26,7 @@ - - namespace content { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - class UtilityBlinkPlatformWithSandboxSupportImpl::SandboxSupport - : public blink::WebSandboxSupport { -@@ -59,12 +59,12 @@ - sk_sp<font_service::FontLoader> font_loader_; - }; - --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) + #endif +@@ -17,7 +17,7 @@ namespace content { UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl( service_manager::Connector* connector) { @@ -32,8 +17,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) font_loader_ = sk_make_sp<font_service::FontLoader>(connector); SkFontConfigInterface::SetGlobal(font_loader_); - sandbox_support_ = std::make_unique<SandboxSupport>(font_loader_); -@@ -78,14 +78,14 @@ + sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_); +@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { @@ -42,11 +27,3 @@ return sandbox_support_.get(); #else return nullptr; - #endif - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - void UtilityBlinkPlatformWithSandboxSupportImpl::SandboxSupport:: - GetFallbackFontForCharacter(blink::WebUChar32 character, diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index d8811a1de25f..d82659424108 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,5 +1,5 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-02-06 23:17:20.242437000 +0100 -+++ content/utility/utility_blink_platform_with_sandbox_support_impl.h 2019-02-06 23:17:37.808893000 +0100 +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-03-11 22:00:58 UTC ++++ content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "third_party/blink/public/platform/platform.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -39,10 +39,10 @@ +@@ -39,10 +39,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub blink::WebSandboxSupport* GetSandboxSupport() override; private: @@ -19,6 +19,6 @@ #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - class SandboxSupport; sk_sp<font_service::FontLoader> font_loader_; #endif + diff --git a/www/chromium/files/patch-content_utility_utility_main.cc b/www/chromium/files/patch-content_utility_utility_main.cc deleted file mode 100644 index 674dacd2a4f1..000000000000 --- a/www/chromium/files/patch-content_utility_utility_main.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/utility/utility_main.cc.orig 2018-01-20 16:08:49.686959000 +0100 -+++ content/utility/utility_main.cc 2018-01-20 16:09:13.242607000 +0100 -@@ -45,7 +45,7 @@ - if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog)) - WaitForDebugger("Utility"); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - // Initializes the sandbox before any threads are created. - // TODO(jorgelo): move this after GTK initialization when we enable a strict - // Seccomp-BPF policy. diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index 2f442e9cdf33..4db9a662777c 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2017-06-05 19:03:07 UTC +--- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC +++ device/bluetooth/BUILD.gn -@@ -202,7 +202,7 @@ component("bluetooth") { +@@ -277,7 +277,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index e53aab806c9f..336b1eec540d 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2017-06-05 19:03:07 UTC +--- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC +++ device/gamepad/gamepad_provider.cc -@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep monitor->AddDevicesChangedObserver(this); polling_thread_.reset(new base::Thread("Gamepad polling thread")); diff --git a/www/chromium/files/patch-device_serial_BUILD.gn b/www/chromium/files/patch-device_serial_BUILD.gn deleted file mode 100644 index 95bf26832ae0..000000000000 --- a/www/chromium/files/patch-device_serial_BUILD.gn +++ /dev/null @@ -1,25 +0,0 @@ ---- device/serial/BUILD.gn.orig 2017-12-15 02:04:18.000000000 +0100 -+++ device/serial/BUILD.gn 2017-12-25 06:34:10.834395000 +0100 -@@ -6,7 +6,7 @@ - import("//mojo/public/tools/bindings/mojom.gni") - - # Library works only on desktop platforms. --if (is_win || is_linux || is_mac) { -+if (is_win || is_linux || is_mac || is_bsd) { - config("platform_support") { - visibility = [ ":serial" ] - if (is_win) { -@@ -57,6 +57,13 @@ - "//net", - "//third_party/re2", - ] -+ -+ if (is_bsd) { -+ sources -= [ -+ "serial_device_enumerator_linux.cc", -+ "serial_device_enumerator_linux.h", -+ ] -+ } - - if (use_udev) { - deps += [ "//device/udev_linux" ] diff --git a/www/chromium/files/patch-device_usb_BUILD.gn b/www/chromium/files/patch-device_usb_BUILD.gn index b48d215b1fe4..2d5a3b0a8dcc 100644 --- a/www/chromium/files/patch-device_usb_BUILD.gn +++ b/www/chromium/files/patch-device_usb_BUILD.gn @@ -1,7 +1,7 @@ ---- device/usb/BUILD.gn.orig 2017-06-16 17:45:56.630063000 +0200 -+++ device/usb/BUILD.gn 2017-06-16 17:59:22.070474000 +0200 -@@ -97,10 +97,17 @@ - libs = [ "setupapi.lib" ] +--- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC ++++ device/usb/BUILD.gn +@@ -112,10 +112,17 @@ static_library("usb") { + ] } - if (is_android || is_chromeos || is_linux) { diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc index 1e07396fa3a4..dd97946fb79e 100644 --- a/www/chromium/files/patch-device_usb_usb__context.cc +++ b/www/chromium/files/patch-device_usb_usb__context.cc @@ -1,6 +1,6 @@ ---- device/usb/usb_context.cc.orig 2018-06-13 00:10:18.000000000 +0200 -+++ device/usb/usb_context.cc 2018-07-20 12:52:29.240720000 +0200 -@@ -58,7 +58,9 @@ +--- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC ++++ device/usb/usb_context.cc +@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() { void UsbContext::UsbEventHandler::Stop() { base::subtle::Release_Store(&running_, 0); diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc index 56ead98022de..a23797cfef2c 100644 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ b/www/chromium/files/patch-device_usb_usb__error.cc @@ -1,5 +1,5 @@ ---- device/usb/usb_error.cc.orig 2018-06-13 00:10:18.000000000 +0200 -+++ device/usb/usb_error.cc 2018-07-20 12:55:34.901660000 +0200 +--- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC ++++ device/usb/usb_error.cc @@ -9,7 +9,7 @@ namespace device { diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc index 9b37f5c8bd92..33d177ba9e2b 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,6 +1,6 @@ ---- device/usb/usb_service_impl.cc.orig 2018-06-13 00:10:18.000000000 +0200 -+++ device/usb/usb_service_impl.cc 2018-07-20 12:49:59.699912000 +0200 -@@ -239,8 +239,10 @@ +--- device/usb/usb_service_impl.cc.orig 2019-03-11 22:00:58 UTC ++++ device/usb/usb_service_impl.cc +@@ -231,8 +231,10 @@ UsbServiceImpl::UsbServiceImpl() } UsbServiceImpl::~UsbServiceImpl() { @@ -11,7 +11,7 @@ } void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -295,6 +297,7 @@ +@@ -287,6 +289,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon context_ = std::move(context); @@ -19,7 +19,7 @@ int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -307,6 +310,7 @@ +@@ -299,6 +302,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon // This will call any enumeration callbacks queued while initializing. RefreshDevices(); @@ -27,7 +27,7 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -503,6 +507,7 @@ +@@ -495,6 +499,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev device->OnDisconnect(); } @@ -35,7 +35,7 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, libusb_device* device_raw, -@@ -537,6 +542,7 @@ +@@ -528,6 +533,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb return 0; } diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h index a59648c035d4..b9bdde03159d 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ b/www/chromium/files/patch-device_usb_usb__service__impl.h @@ -1,6 +1,6 @@ ---- device/usb/usb_service_impl.h.orig 2018-06-13 00:10:18.000000000 +0200 -+++ device/usb/usb_service_impl.h 2018-07-20 12:47:42.413625000 +0200 -@@ -73,11 +73,13 @@ +--- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC ++++ device/usb/usb_service_impl.h +@@ -73,11 +73,13 @@ class UsbServiceImpl : scoped_refptr<UsbDeviceImpl> device); void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); @@ -14,7 +14,7 @@ // These functions release a reference to the provided platform device. void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); -@@ -95,7 +97,9 @@ +@@ -97,7 +99,9 @@ class UsbServiceImpl : // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 4866eea42910..3f13f43d7e15 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,5 +1,5 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2018-03-20 23:05:25.000000000 +0100 -+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2018-03-24 17:41:04.749250000 +0100 +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc @@ -28,7 +28,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" @@ -11,4 +11,4 @@ +#endif using content::ResourceRequestInfo; - + using extension_web_request_api_helpers::EventResponseDelta; diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc new file mode 100644 index 000000000000..4bba15cb75e5 --- /dev/null +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -0,0 +1,35 @@ +--- extensions/browser/api/messaging/message_service.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/browser/api/messaging/message_service.cc +@@ -58,7 +58,7 @@ namespace { + + const char kReceivingEndDoesntExistError[] = + "Could not establish connection. Receiving end does not exist."; +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const char kMissingPermissionError[] = + "Access to native messaging requires nativeMessaging permission."; + const char kProhibitedByPoliciesError[] = +@@ -318,7 +318,7 @@ void MessageService::OpenChannelToNativeApp( + if (!source) + return; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = +@@ -378,12 +378,12 @@ void MessageService::OpenChannelToNativeApp( + channel->opener->IncrementLazyKeepaliveCount(); + + AddChannel(std::move(channel), receiver_port_id); +-#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + const char kNativeMessagingNotSupportedError[] = + "Native Messaging is not supported on this platform."; + DispatchOnDisconnect( + source, receiver_port_id, kNativeMessagingNotSupportedError); +-#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + } + + void MessageService::OpenChannelToTab(int source_process_id, diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc deleted file mode 100644 index 3f7cf8b54963..000000000000 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2017-12-24 16:01:52.241792000 +0100 -+++ extensions/browser/api/messaging/message_service.cc 2017-12-24 16:02:30.296242000 +0100 -@@ -59,7 +59,7 @@ - - const char kReceivingEndDoesntExistError[] = - "Could not establish connection. Receiving end does not exist."; --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - const char kMissingPermissionError[] = - "Access to native messaging requires nativeMessaging permission."; - const char kProhibitedByPoliciesError[] = -@@ -330,7 +330,7 @@ - if (!source) - return; - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - content::WebContents* web_contents = - content::WebContents::FromRenderFrameHost(source); - ExtensionWebContentsObserver* extension_web_contents_observer = diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 6e4e78c45718..aa2f5369b993 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,5 +1,5 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2018-01-21 13:32:48.139964000 +0100 -+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc 2018-01-21 13:33:33.051307000 +0100 +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -11,7 +11,7 @@ #if defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif defined(OS_WIN) || defined(OS_MACOSX) #include "components/wifi/wifi_service.h" -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS NetworkingPrivateDelegate* delegate; #if defined(OS_CHROMEOS) delegate = new NetworkingPrivateChromeOS(browser_context); diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc index 86bde7e99dd7..aebaba727ff9 100644 --- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc +++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc @@ -1,5 +1,5 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2018-06-13 00:10:18.000000000 +0200 -+++ extensions/browser/api/web_request/form_data_parser.cc 2018-07-19 13:36:19.375722000 +0200 +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/browser/api/web_request/form_data_parser.cc @@ -15,7 +15,11 @@ #include "base/values.h" #include "net/base/escape.h" diff --git a/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index f3290774b5e0..402789d2414e 100644 --- a/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-01-11 19:03:59.864185000 +0100 -+++ extensions/browser/browser_context_keyed_service_factories.cc 2019-01-11 19:04:22.204588000 +0100 -@@ -85,7 +85,7 @@ +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/browser/browser_context_keyed_service_factories.cc +@@ -85,7 +85,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) NetworkingConfigServiceFactory::GetInstance(); #endif diff --git a/www/chromium/files/patch-extensions_common_api__permission_features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 4c2d0b7ec004..fd4fc87e9fbf 100644 --- a/www/chromium/files/patch-extensions_common_api__permission_features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,5 +1,5 @@ ---- extensions/common/api/_permission_features.json.orig 2019-01-30 02:18:01.000000000 +0100 -+++ extensions/common/api/_permission_features.json 2019-02-06 23:58:00.090523000 +0100 +--- extensions/common/api/_permission_features.json.orig 2019-03-11 22:00:58 UTC ++++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { "channel": "stable", @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -475,7 +475,7 @@ +@@ -470,7 +470,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -506,7 +506,7 @@ +@@ -501,7 +501,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index cee4a938d244..89dbadf1bc55 100644 --- a/www/chromium/files/patch-extensions_common_api_runtime.json +++ b/www/chromium/files/patch-extensions_common_api_runtime.json @@ -1,4 +1,4 @@ ---- extensions/common/api/runtime.json.orig 2017-05-09 19:02:47 UTC +--- extensions/common/api/runtime.json.orig 2019-03-11 22:00:58 UTC +++ extensions/common/api/runtime.json @@ -66,7 +66,7 @@ "id": "PlatformOs", diff --git a/www/chromium/files/patch-extensions_common_feature_switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc index cba8db1323dc..c59bf0a971d5 100644 --- a/www/chromium/files/patch-extensions_common_feature_switch.cc +++ b/www/chromium/files/patch-extensions_common_feature__switch.cc @@ -1,6 +1,6 @@ ---- extensions/common/feature_switch.cc.orig 2018-03-20 23:05:25.000000000 +0100 -+++ extensions/common/feature_switch.cc 2018-03-24 17:46:50.886191000 +0100 -@@ -46,11 +46,7 @@ +--- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/common/feature_switch.cc +@@ -44,11 +44,7 @@ class CommonSwitches { FeatureSwitch::DEFAULT_ENABLED), load_media_router_component_extension( kLoadMediaRouterComponentExtensionFlag, diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index f8decc7f2947..a2cd4e35c041 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,6 +1,6 @@ ---- extensions/common/features/feature.cc.orig 2018-01-21 13:38:52.998785000 +0100 -+++ extensions/common/features/feature.cc 2018-01-21 13:39:29.946264000 +0100 -@@ -26,6 +26,8 @@ +--- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/common/features/feature.cc +@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return MACOSX_PLATFORM; #elif defined(OS_WIN) return WIN_PLATFORM; diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index 9e0721278e10..246421809d22 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,5 +1,5 @@ ---- extensions/common/image_util.cc.orig 2019-01-30 02:18:01.000000000 +0100 -+++ extensions/common/image_util.cc 2019-02-01 09:15:02.563494000 +0100 +--- extensions/common/image_util.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/common/image_util.cc @@ -18,7 +18,11 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index 918a20a85797..cb1f991f448f 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,4 +1,4 @@ ---- extensions/common/stack_frame.cc.orig 2017-04-19 19:06:34 UTC +--- extensions/common/stack_frame.cc.orig 2019-03-11 22:00:58 UTC +++ extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include <string> diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index 4668b644548d..e5e060248182 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2018-12-12 22:56:08.000000000 +0100 -+++ extensions/renderer/bindings/api_binding_util.cc 2018-12-30 03:38:04.191665000 +0100 -@@ -129,6 +129,8 @@ +--- extensions/renderer/bindings/api_binding_util.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/renderer/bindings/api_binding_util.cc +@@ -129,6 +129,8 @@ std::string GetPlatformString() { return "mac"; #elif defined(OS_WIN) return "win"; diff --git a/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index 0243ddff4160..8d14f11a8934 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,5 +1,5 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2019-01-11 19:10:53.125547000 +0100 -+++ extensions/shell/app/shell_main_delegate.cc 2019-01-11 19:11:57.764029000 +0100 +--- extensions/shell/app/shell_main_delegate.cc.orig 2019-03-11 22:00:58 UTC ++++ extensions/shell/app/shell_main_delegate.cc @@ -38,7 +38,7 @@ #if defined(OS_WIN) @@ -18,7 +18,7 @@ extensions::ShellCrashReporterClient* GetCrashReporterClient() { static base::NoDestructor<extensions::ShellCrashReporterClient> instance; return instance.get(); -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; diff --git a/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 76b6b1de6965..a79056f2f9cf 100644 --- a/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-01-30 02:18:02.000000000 +0100 -+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc 2019-02-01 09:18:35.535261000 +0100 -@@ -89,7 +89,7 @@ +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/command_buffer/common/gpu_memory_buffer_support.cc +@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MACOSX) return GL_TEXTURE_RECTANGLE_ARB; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc index aa81909679fd..9309b4a0c7ce 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc @@ -1,5 +1,5 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2018-12-03 21:16:59.000000000 +0100 -+++ gpu/command_buffer/service/program_manager.cc 2018-12-13 23:16:40.689817000 +0100 +--- gpu/command_buffer/service/program_manager.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/command_buffer/service/program_manager.cc @@ -30,7 +30,11 @@ #include "gpu/command_buffer/service/program_cache.h" #include "gpu/command_buffer/service/shader_manager.h" diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc new file mode 100644 index 000000000000..c3f6ef47ef25 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-03-17 17:07:44 UTC ++++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc +@@ -562,7 +562,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText + + bool ShouldSkipNorm16() const { + DCHECK(!ShouldSkipTest()); +-#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)) && \ ++#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && \ + (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)) + // Make sure it's tested; it is safe to assume that the flag is always true + // on desktop. diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc new file mode 100644 index 000000000000..3b7af1803ca1 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC ++++ gpu/command_buffer/tests/gl_test_utils.cc +@@ -22,7 +22,7 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gl/init/gl_factory.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/gl/gl_image_native_pixmap.h" + #endif + +@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { + window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + scoped_refptr<gl::GLImageNativePixmap> + GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format, + gfx::Size size, diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h new file mode 100644 index 000000000000..067b9a1fb1b8 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -0,0 +1,11 @@ +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-03-17 17:06:38 UTC ++++ gpu/command_buffer/tests/gl_test_utils.h +@@ -112,7 +112,7 @@ class GpuCommandBufferTestEGL { + return gfx::HasExtension(gl_extensions_, extension); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Create GLImageNativePixmap filled in with the given pixels. + scoped_refptr<gl::GLImageNativePixmap> CreateGLImageNativePixmap( + gfx::BufferFormat format, diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index 9904c9a55727..fbf362282dab 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,5 +1,5 @@ ---- gpu/config/gpu_control_list.cc.orig 2019-01-30 02:18:02.000000000 +0100 -+++ gpu/config/gpu_control_list.cc 2019-02-01 09:25:50.964382000 +0100 +--- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" #include "build/build_config.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -213,7 +217,7 @@ +@@ -213,7 +217,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -683,7 +687,7 @@ +@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index 304858ebfbc9..c5c6e5e16c76 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_test_config.cc.orig 2018-03-20 23:05:26.000000000 +0100 -+++ gpu/config/gpu_test_config.cc 2018-03-26 13:47:37.264475000 +0200 -@@ -24,7 +24,7 @@ +--- gpu/config/gpu_test_config.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/config/gpu_test_config.cc +@@ -25,7 +25,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index a95210edffd9..a930facd388a 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,5 +1,5 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-01-30 02:18:02.000000000 +0100 -+++ gpu/ipc/common/gpu_memory_buffer_support.cc 2019-02-01 09:37:09.520829000 +0100 +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" -@@ -37,7 +37,7 @@ +@@ -37,7 +37,7 @@ namespace gpu { GpuMemoryBufferSupport::GpuMemoryBufferSupport() { #if defined(USE_OZONE) client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); @@ -18,7 +18,7 @@ client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; @@ -27,7 +27,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -109,7 +109,7 @@ +@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo #elif defined(USE_OZONE) return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( format, usage); @@ -36,9 +36,9 @@ return false; // TODO(julian.isorce): Add linux support. #elif defined(OS_WIN) switch (usage) { -@@ -166,7 +166,7 @@ +@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( - std::move(handle), size, format, usage, callback); + std::move(handle), size, format, usage, std::move(callback)); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 9fdbfba1ebef..b65940f54b45 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,5 +1,5 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-01-30 02:18:02.000000000 +0100 -+++ gpu/ipc/common/gpu_memory_buffer_support.h 2019-02-01 09:40:47.746184000 +0100 +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" @@ -9,7 +9,7 @@ namespace gfx { class ClientNativePixmapFactory; } -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, gfx::BufferUsage usage); @@ -18,8 +18,8 @@ gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } -@@ -61,7 +61,7 @@ - const GpuMemoryBufferImpl::DestructionCallback& callback); +@@ -61,7 +61,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { + GpuMemoryBufferImpl::DestructionCallback callback); private: -#if defined(OS_LINUX) || defined(USE_OZONE) diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index a3ded293c128..a3ae793cbba2 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,24 +1,24 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2018-06-13 00:10:19.000000000 +0200 -+++ gpu/ipc/service/gpu_init.cc 2018-07-19 14:45:14.322631000 +0200 -@@ -70,7 +70,7 @@ +--- gpu/ipc/service/gpu_init.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/service/gpu_init.cc +@@ -87,7 +87,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo } - #endif // defined(OS_MACOSX) + #endif // defined(OS_WIN) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) && !defined(OS_BSD) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; - base::AssertBlockingAllowed(); -@@ -106,7 +106,7 @@ + base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK); +@@ -129,7 +129,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA - gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) + gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -172,7 +172,7 @@ +@@ -199,7 +199,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index c722afc91d64..774599403f09 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,5 +1,5 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2018-02-24 16:25:15.000000000 +0100 -+++ gpu/ipc/service/gpu_memory_buffer_factory.cc 2018-03-04 02:47:09.144034000 +0100 +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); #elif defined(OS_ANDROID) return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index 1f7077c96bd9..c030d54a8b8a 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-01-12 22:38:32.375483000 +0100 -+++ gpu/ipc/service/gpu_watchdog_thread.cc 2019-01-12 22:42:03.901161000 +0100 -@@ -46,8 +46,10 @@ +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/service/gpu_watchdog_thread.cc +@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000; #endif #if defined(USE_X11) @@ -11,7 +11,7 @@ const unsigned char text[20] = "check"; #endif -@@ -70,8 +72,10 @@ +@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread() display_(nullptr), window_(0), atom_(x11::None), @@ -22,7 +22,7 @@ weak_factory_(this) { base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); -@@ -86,7 +90,9 @@ +@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread() #endif #if defined(USE_X11) @@ -31,8 +31,8 @@ +#endif SetupXServer(); #endif - watched_message_loop_->AddTaskObserver(&task_observer_); -@@ -231,8 +237,10 @@ + base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); +@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { power_monitor->RemoveObserver(this); #if defined(USE_X11) @@ -43,7 +43,7 @@ if (display_) { DCHECK(window_); XDestroyWindow(display_, window_); -@@ -453,7 +461,7 @@ +@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover return; #endif @@ -52,7 +52,7 @@ // Don't crash if we're not on the TTY of our host X11 server. int active_tty = GetActiveTTY(); if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) { -@@ -516,7 +524,9 @@ +@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() { CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); atom_ = XInternAtom(display_, "CHECK", x11::False); } @@ -62,7 +62,7 @@ } void GpuWatchdogThread::SetupXChangeProp() { -@@ -617,7 +627,7 @@ +@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index a4a113856bbe..ea9edd7d8ce0 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-01-12 22:38:38.703173000 +0100 -+++ gpu/ipc/service/gpu_watchdog_thread.h 2019-01-12 22:39:05.661205000 +0100 -@@ -190,8 +190,10 @@ +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC ++++ gpu/ipc/service/gpu_watchdog_thread.h +@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi XDisplay* display_; gfx::AcceleratedWidget window_; XAtom atom_; diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 825887403a65..a3629cd7838e 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,7 +1,7 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2017-06-05 19:03:08 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-03-11 22:00:59 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -172,7 +172,7 @@ void HeadlessContentBrowserClient::GetQuotaSettings( - callback); +@@ -187,7 +187,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet + return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -9,8 +9,8 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -183,7 +183,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped - mappings->Share(kCrashDumpSignal, crash_signal_fd); +@@ -198,7 +198,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped + mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index 6782845f3633..6cd14cc0bb2b 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-01-30 02:18:02.000000000 +0100 -+++ headless/lib/browser/headless_content_browser_client.h 2019-02-01 09:56:18.585343000 +0100 -@@ -34,7 +34,7 @@ +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC ++++ headless/lib/browser/headless_content_browser_client.h +@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C ::storage::OptionalQuotaSettingsCallback callback) override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 34696f7e2ae3..3756e7a3a33b 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,20 +1,38 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2019-01-30 02:18:02.000000000 +0100 -+++ headless/lib/browser/headless_request_context_manager.cc 2019-02-01 10:01:59.179234000 +0100 -@@ -35,7 +35,7 @@ +--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-03-11 22:00:59 UTC ++++ headless/lib/browser/headless_request_context_manager.cc +@@ -35,7 +35,7 @@ namespace headless { namespace { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) static char kProductName[] = "HeadlessChrome"; #endif -@@ -367,7 +367,7 @@ - return; - if (user_data_path_.empty()) - return; +@@ -81,7 +81,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic + return traffic_annotation; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( + const base::FilePath& user_data_path) { + static bool done_once = false; +@@ -290,7 +290,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM + proxy_config_monitor_ = + std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner); + } +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + crypt_config_ = BuildCryptConfigOnce(user_data_path_); + if (network_service_enabled_ && crypt_config_) + content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_)); +@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() { + std::move(protocol_handler.second)); + } + protocol_handlers_.clear(); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - ::network::mojom::CryptConfigPtr config = - ::network::mojom::CryptConfig::New(); - config->store = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + if (crypt_config_) { + content::GetNetworkServiceImpl()->SetCryptConfig( + std::move(crypt_config_)); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h new file mode 100644 index 000000000000..7780cfd2173f --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_request_context_manager.h.orig 2019-03-17 18:56:16 UTC ++++ headless/lib/browser/headless_request_context_manager.h +@@ -69,7 +69,7 @@ class HeadlessRequestContextManager { + std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_; + bool is_system_context_; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + ::network::mojom::CryptConfigPtr crypt_config_; + #endif + diff --git a/www/chromium/files/patch-headless_lib_headless__macros.h b/www/chromium/files/patch-headless_lib_headless__macros.h index d585fe4707f6..0e99c3066d6d 100644 --- a/www/chromium/files/patch-headless_lib_headless__macros.h +++ b/www/chromium/files/patch-headless_lib_headless__macros.h @@ -1,5 +1,5 @@ ---- headless/lib/headless_macros.h.orig 2018-12-03 21:16:59.000000000 +0100 -+++ headless/lib/headless_macros.h 2018-12-13 23:26:22.473345000 +0100 +--- headless/lib/headless_macros.h.orig 2019-03-11 22:00:59 UTC ++++ headless/lib/headless_macros.h @@ -7,8 +7,8 @@ #include "build/build_config.h" diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 4df0d7db85cb..a2b1f9794ef0 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2017-06-05 19:03:08 UTC +--- ipc/ipc_channel.h.orig 2019-03-11 22:00:59 UTC +++ ipc/ipc_channel.h -@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender { +@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__channel_common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc index a22ae20323e2..e483961a2640 100644 --- a/www/chromium/files/patch-ipc_ipc__channel_common.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc @@ -1,5 +1,5 @@ ---- ipc/ipc_channel_common.cc.orig 2017-08-10 04:18:14.155067000 +0200 -+++ ipc/ipc_channel_common.cc 2017-08-10 04:18:32.944727000 +0200 +--- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC ++++ ipc/ipc_channel_common.cc @@ -9,7 +9,7 @@ namespace IPC { diff --git a/www/chromium/files/patch-ipc_ipc__channel_mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 0e4fe69eb383..3a90d60689d4 100644 --- a/www/chromium/files/patch-ipc_ipc__channel_mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,7 +1,7 @@ ---- ipc/ipc_channel_mojo.cc.orig 2017-08-10 04:18:45.930792000 +0200 -+++ ipc/ipc_channel_mojo.cc 2017-08-10 04:19:05.792138000 +0200 -@@ -228,7 +228,7 @@ - } +--- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC ++++ ipc/ipc_channel_mojo.cc +@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory { + }; base::ProcessId GetSelfPID() { -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 640dfe236f82..ae32e31c76cd 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2017-09-05 21:05:21.000000000 +0200 -+++ ipc/ipc_message_utils.cc 2017-09-06 20:38:34.375119000 +0200 -@@ -424,7 +424,7 @@ +--- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC ++++ ipc/ipc_message_utils.cc +@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ - (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) + defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits<long>::Log(const param_type& p, std::string* l) { - l->append(base::Int64ToString(static_cast<int64_t>(p))); + l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 43f1e79e3af4..1d0395498400 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2017-09-05 21:05:21.000000000 +0200 -+++ ipc/ipc_message_utils.h 2017-09-06 20:44:35.248663000 +0200 -@@ -212,7 +212,7 @@ +--- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC ++++ ipc/ipc_message_utils.h +@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 4940a243030a..8822df0e27d8 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,7 +1,6 @@ -$OpenBSD: patch-media_BUILD_gn,v 1.2 2017/04/28 22:22:36 robert Exp $ ---- media/BUILD.gn.orig.port Wed Apr 19 21:06:35 2017 -+++ media/BUILD.gn Thu Apr 27 19:56:02 2017 -@@ -56,6 +56,9 @@ config("media_config") { +--- media/BUILD.gn.orig 2019-03-11 22:00:59 UTC ++++ media/BUILD.gn +@@ -59,6 +59,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 4e0db7c6409d..73f9891f0b9a 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,13 +1,13 @@ ---- media/audio/BUILD.gn.orig 2018-01-04 21:05:54.000000000 +0100 -+++ media/audio/BUILD.gn 2018-01-27 12:34:55.048961000 +0100 -@@ -237,9 +237,19 @@ +--- media/audio/BUILD.gn.orig 2019-03-11 22:00:59 UTC ++++ media/audio/BUILD.gn +@@ -242,8 +242,18 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux) { + if (is_linux && !use_sndio) { sources += [ "linux/audio_manager_linux.cc" ] - } ++ } + if (use_sndio) { + libs += [ "sndio" ] + sources += [ @@ -17,15 +17,6 @@ + "sndio/sndio_output.cc", + "sndio/sndio_output.h" + ] -+ } + } if (use_alsa) { - libs += [ "asound" ] -@@ -285,7 +295,6 @@ - if (link_pulseaudio) { - configs += [ ":libpulse" ] - } else { -- libs += [ "dl" ] - deps += [ ":pulse_generate_stubs" ] - sources += get_target_outputs(":pulse_generate_stubs") - } diff --git a/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 6bf61c877d95..25ea65eac8fc 100644 --- a/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc +++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,26 +1,26 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2017-12-15 02:04:21.000000000 +0100 -+++ media/audio/alsa/audio_manager_alsa.cc 2017-12-24 16:52:36.819099000 +0100 -@@ -93,7 +93,9 @@ +--- media/audio/alsa/audio_manager_alsa.cc.orig 2019-03-21 01:36:54.000000000 +0100 ++++ media/audio/alsa/audio_manager_alsa.cc 2019-03-25 22:31:49.328029000 +0100 +@@ -92,7 +92,9 @@ int card = -1; // Loop through the sound cards to get ALSA device hints. -+#ifdef OS_LINUX ++#if defined(OS_LINUX) while (!wrapper_->CardNext(&card) && card >= 0) { +#endif void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -105,7 +107,9 @@ +@@ -104,7 +106,9 @@ DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } -+#ifdef OS_LINUX ++#if defined(OS_LINUX) } +#endif } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -188,7 +192,11 @@ +@@ -187,7 +191,11 @@ // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -30,23 +30,23 @@ + static const char kDeviceTypeDesired[] = "plug"; +#endif return strncmp(kDeviceTypeDesired, device_name, - arraysize(kDeviceTypeDesired) - 1) == 0; + base::size(kDeviceTypeDesired) - 1) == 0; } -@@ -210,7 +218,9 @@ +@@ -209,7 +217,9 @@ // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is a access violation // inside this ALSA API with libasound.so.2.0.0. -+#ifdef OS_LINUX ++#if defined(OS_LINUX) while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) { +#endif int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -234,7 +244,9 @@ +@@ -233,7 +243,9 @@ DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } -+#ifdef OS_LINUX ++#if defined(OS_LINUX) } +#endif diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc new file mode 100644 index 000000000000..f96c5ac063c2 --- /dev/null +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -0,0 +1,11 @@ +--- media/audio/audio_input_device.cc.orig 2019-03-17 21:43:40 UTC ++++ media/audio/audio_input_device.cc +@@ -248,7 +248,7 @@ void AudioInputDevice::OnStreamCreated( + // also a risk of false positives if we are suspending when starting the stream + // here. See comments in AliveChecker and PowerObserverHelper for details and + // todos. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const bool stop_at_first_alive_notification = true; + const bool pause_check_during_suspend = false; + #else diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 72336749ca09..5720491adf54 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_manager.cc.orig 2019-01-30 02:18:05.000000000 +0100 -+++ media/audio/audio_manager.cc 2019-02-01 10:05:43.833445000 +0100 -@@ -48,7 +48,7 @@ +--- media/audio/audio_manager.cc.orig 2019-03-11 22:00:59 UTC ++++ media/audio/audio_manager.cc +@@ -48,7 +48,7 @@ class AudioManagerHelper { } #endif @@ -9,7 +9,7 @@ void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ class AudioManagerHelper { std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif @@ -18,7 +18,7 @@ std::string app_name_; #endif -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ std::unique_ptr<AudioManager> AudioManager::CreateForT return Create(std::move(audio_thread), GetHelper()->fake_log_factory()); } diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h index 3350653361db..817c3d812b8e 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.h +++ b/www/chromium/files/patch-media_audio_audio__manager.h @@ -1,8 +1,8 @@ ---- media/audio/audio_manager.h.orig 2017-12-15 02:04:21.000000000 +0100 -+++ media/audio/audio_manager.h 2017-12-24 17:11:05.999543000 +0100 -@@ -68,7 +68,7 @@ - static void StartHangMonitorIfNeeded( - scoped_refptr<base::SingleThreadTaskRunner> task_runner); +--- media/audio/audio_manager.h.orig 2019-03-11 22:00:59 UTC ++++ media/audio/audio_manager.h +@@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioManager { + static std::unique_ptr<AudioManager> CreateForTesting( + std::unique_ptr<AudioThread> audio_thread); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index 15e0292a9068..d2289293450b 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2017-12-15 02:04:21.000000000 +0100 -+++ media/base/audio_latency.cc 2017-12-24 17:08:13.779303000 +0100 -@@ -106,7 +106,7 @@ +--- media/base/audio_latency.cc.orig 2019-03-11 22:00:59 UTC ++++ media/base/audio_latency.cc +@@ -106,7 +106,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in return frames_per_buffer; } diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h index 1eb615153dfb..0652698c4d51 100644 --- a/www/chromium/files/patch-media_base_scopedfd__helper.h +++ b/www/chromium/files/patch-media_base_scopedfd__helper.h @@ -1,6 +1,6 @@ ---- media/base/scopedfd_helper.h.orig 2018-12-12 22:56:08.000000000 +0100 -+++ media/base/scopedfd_helper.h 2018-12-16 13:21:03.268137000 +0100 -@@ -14,14 +14,14 @@ +--- media/base/scopedfd_helper.h.orig 2019-03-11 22:00:59 UTC ++++ media/base/scopedfd_helper.h +@@ -14,14 +14,14 @@ namespace media { // since the only current user is V4L2 we are limiting the scope to OS_LINUX so // the binary size does not inflate on non-using systems. Feel free to adapt // this and BUILD.gn as our needs evolve. diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index bb97df4e5e46..82b6712e42b1 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2018-12-03 21:17:03.000000000 +0100 -+++ media/base/video_frame.cc 2018-12-13 23:34:19.884280000 +0100 -@@ -66,7 +66,7 @@ +--- media/base/video_frame.cc.orig 2019-03-11 22:00:59 UTC ++++ media/base/video_frame.cc +@@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,16 +9,16 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -82,7 +82,7 @@ +@@ -68,7 +68,7 @@ static std::string StorageTypeToString( // static - static bool IsStorageTypeMappable(VideoFrame::StorageType storage_type) { + bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -379,7 +379,7 @@ +@@ -461,7 +461,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva return frame; } @@ -27,8 +27,8 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -502,7 +502,7 @@ - wrapping_frame->data_[i] = frame->data(i); +@@ -592,7 +592,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( + } } -#if defined(OS_LINUX) @@ -36,7 +36,7 @@ // If there are any |dmabuf_fds_| plugged in, we should duplicate them. if (frame->storage_type() == STORAGE_DMABUFS) { wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_); -@@ -839,7 +839,7 @@ +@@ -917,7 +917,7 @@ size_t VideoFrame::shared_memory_offset() const { return shared_memory_offset_; } diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 83e9b9c48720..06c90939cc4e 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2018-12-03 21:17:03.000000000 +0100 -+++ media/base/video_frame.h 2018-12-13 23:50:03.082947000 +0100 -@@ -72,7 +72,7 @@ +--- media/base/video_frame.h.orig 2019-03-11 22:00:59 UTC ++++ media/base/video_frame.h +@@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. @@ -9,7 +9,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -238,7 +238,7 @@ +@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,7 +18,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -415,7 +415,7 @@ +@@ -430,7 +430,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; @@ -27,7 +27,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -625,7 +625,7 @@ +@@ -624,7 +624,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // memory. size_t shared_memory_offset_; diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index 3011b127ee76..f5b7886df52a 100644 --- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,5 +1,5 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2018-12-12 22:56:08.000000000 +0100 -+++ media/capture/video/create_video_capture_device_factory.cc 2018-12-30 23:29:59.281943000 +0100 +--- media/capture/video/create_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/create_video_capture_device_factory.cc @@ -10,7 +10,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif defined(OS_CHROMEOS) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ namespace { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 3b9a42b60f3e..96b1e260622c 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { device_descriptors->emplace_back( base::StringPrintf("fake_device_%d", entry_index), entry.device_id, diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index bdb3be4105e6..6c18690423ac 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +++ media/capture/video/file_video_capture_device_factory.cc @@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index a7ded1ee5067..3de31922be93 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-06-05 19:03:08 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2019-03-11 22:00:59 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -23,10 +25,10 @@ +@@ -24,10 +26,10 @@ using media::mojom::MeteringMode; diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc index 86ee20273b28..a66828aad4da 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2018-12-30 23:33:57.000000000 +0100 -+++ media/capture/video/linux/video_capture_device_factory_linux.cc 2018-12-30 23:35:38.475055000 +0100 -@@ -259,6 +259,7 @@ +--- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/linux/video_capture_device_factory_linux.cc +@@ -259,6 +259,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE)) return false; @@ -8,7 +8,7 @@ const std::vector<uint32_t>& usable_fourccs = VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false); v4l2_fmtdesc fmtdesc = {}; -@@ -267,6 +268,7 @@ +@@ -267,6 +268,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat)) return true; } @@ -16,7 +16,7 @@ DVLOG(1) << "No usable formats found"; return false; -@@ -312,9 +314,13 @@ +@@ -312,9 +314,13 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; for (; DoIoctl(fd, VIDIOC_ENUM_FMT, &v4l2_format) == 0; ++v4l2_format.index) { VideoCaptureFormat supported_format; diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc index 77fd04dc3e38..8e96c973337d 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2018-12-13 23:54:05.391105000 +0100 -+++ media/capture/video/linux/video_capture_device_linux.cc 2018-12-14 00:02:46.685774000 +0100 -@@ -37,6 +37,7 @@ +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/linux/video_capture_device_linux.cc +@@ -37,6 +37,7 @@ int TranslatePowerLineFrequencyToV4L2(PowerLineFrequen } // namespace @@ -8,7 +8,7 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -50,6 +51,7 @@ +@@ -50,6 +51,7 @@ std::vector<uint32_t> VideoCaptureDeviceLinux::GetList bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } @@ -16,7 +16,7 @@ VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( scoped_refptr<V4L2CaptureDevice> v4l2, -@@ -68,6 +70,7 @@ +@@ -68,6 +70,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() { void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr<VideoCaptureDevice::Client> client) { @@ -24,7 +24,7 @@ DCHECK(!capture_impl_); if (v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -95,9 +98,11 @@ +@@ -95,9 +98,11 @@ void VideoCaptureDeviceLinux::AllocateAndStart( for (auto& request : photo_requests_queue_) v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request)); photo_requests_queue_.clear(); @@ -36,7 +36,7 @@ if (!v4l2_thread_.IsRunning()) return; // Wrong state. v4l2_thread_.task_runner()->PostTask( -@@ -107,6 +112,7 @@ +@@ -107,6 +112,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() { v4l2_thread_.Stop(); capture_impl_ = nullptr; @@ -44,7 +44,7 @@ } void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) { -@@ -149,11 +155,13 @@ +@@ -149,11 +155,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions( } void VideoCaptureDeviceLinux::SetRotation(int rotation) { diff --git a/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.cc b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc index a68a0ec104c4..993aa99c09a6 100644 --- a/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.cc +++ b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc @@ -1,6 +1,6 @@ ---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-01-09 13:03:04.440957000 +0100 -+++ media/capture/video/mock_gpu_memory_buffer_manager.cc 2019-01-09 13:03:18.319442000 +0100 -@@ -103,7 +103,7 @@ +--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/mock_gpu_memory_buffer_manager.cc +@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; diff --git a/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc index afc246bc9d19..68c6b71bdaa2 100644 --- a/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc +++ b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc @@ -1,6 +1,6 @@ ---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-01-12 22:31:08.999805000 +0100 -+++ media/capture/video/shared_memory_handle_provider.cc 2019-01-12 22:31:53.741578000 +0100 -@@ -63,7 +63,7 @@ +--- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/shared_memory_handle_provider.cc +@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle( return true; } diff --git a/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h index 0ee1ec6b60a3..81bc00c85a6e 100644 --- a/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h +++ b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h @@ -1,6 +1,6 @@ ---- media/capture/video/shared_memory_handle_provider.h.orig 2019-01-12 22:31:28.927630000 +0100 -+++ media/capture/video/shared_memory_handle_provider.h 2019-01-12 22:32:13.374251000 +0100 -@@ -38,7 +38,7 @@ +--- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC ++++ media/capture/video/shared_memory_handle_provider.h +@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 68743d128b59..3a8ed1872e71 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2017-06-05 19:03:08 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-03-11 22:00:59 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -242,7 +242,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -236,7 +236,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h index 8cb60f959e2e..5e1f90d692b3 100644 --- a/www/chromium/files/patch-media_filters_vp9__parser.h +++ b/www/chromium/files/patch-media_filters_vp9__parser.h @@ -1,4 +1,4 @@ ---- media/filters/vp9_parser.h.orig 2017-04-19 19:06:35 UTC +--- media/filters/vp9_parser.h.orig 2019-03-11 22:00:59 UTC +++ media/filters/vp9_parser.h @@ -14,6 +14,7 @@ @@ -7,4 +7,4 @@ +#include <unistd.h> #include <sys/types.h> - #include <deque> + #include <memory> diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc index 6e26e25a24fe..38994431f986 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2017-06-05 19:03:09 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2019-03-11 22:00:59 UTC +++ media/formats/common/offset_byte_queue.cc @@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin *size = tail() - offset; diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h index 807a0865e84b..659dd9dfe9b3 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.h.orig 2017-04-19 19:06:35 UTC +--- media/formats/common/offset_byte_queue.h.orig 2019-03-11 22:00:59 UTC +++ media/formats/common/offset_byte_queue.h @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue { // a null |buf| and a |size| of zero. diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc index 49c230e40500..32a7c440128e 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc @@ -1,6 +1,6 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2017-06-05 19:03:09 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2019-03-11 22:00:59 UTC +++ media/formats/mp2t/es_parser_adts.cc -@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr +@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (!isAdtsSyncWord(cur_buf)) continue; -@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr +@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr return true; } diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc index 1dfb3b156c74..cd5710c554b0 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,6 +1,6 @@ ---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-06-05 19:03:09 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2019-03-11 22:00:59 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc -@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( +@@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (cur_buf[0] != 0xff) continue; -@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( +@@ -153,7 +153,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( return true; } diff --git a/www/chromium/files/patch-media_media_options.gni b/www/chromium/files/patch-media_media__options.gni index 882c7016b00d..0b0ff559b760 100644 --- a/www/chromium/files/patch-media_media_options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,7 +1,6 @@ -$OpenBSD: patch-media_media_options_gni,v 1.3 2017/04/28 22:22:36 robert Exp $ ---- media/media_options.gni.orig 2017-04-19 21:06:35.000000000 +0200 -+++ media/media_options.gni 2017-05-06 22:11:03.288488000 +0200 -@@ -73,6 +73,9 @@ +--- media/media_options.gni.orig 2019-03-11 22:00:59 UTC ++++ media/media_options.gni +@@ -100,6 +100,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc new file mode 100644 index 000000000000..79fa04f6ecd2 --- /dev/null +++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -0,0 +1,20 @@ +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-03-17 21:51:56 UTC ++++ media/mojo/services/gpu_mojo_media_client.cc +@@ -55,7 +55,7 @@ namespace media { + namespace { + + #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ +- defined(OS_WIN) || defined(OS_LINUX) ++ defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + gpu::CommandBufferStub* GetCommandBufferStub( + base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, + base::UnguessableToken channel_token, +@@ -172,7 +172,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea + std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_, + std::move(get_stub_cb))); + #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<VideoDecoder> vda_video_decoder = VdaVideoDecoder::Create( + task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, + gpu_preferences_, gpu_workarounds_, diff --git a/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 820406c92c0c..3bf2559efd07 100644 --- a/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-01-09 13:04:56.177184000 +0100 -+++ media/video/gpu_memory_buffer_video_frame_pool.cc 2019-01-09 13:05:16.072782000 +0100 -@@ -633,7 +633,7 @@ +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-03-11 22:01:00 UTC ++++ media/video/gpu_memory_buffer_video_frame_pool.cc +@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index 7b80d534819e..826608045fde 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,5 +1,5 @@ ---- mojo/public/c/system/thunks.cc.orig 2019-01-08 19:19:50.188491000 +0100 -+++ mojo/public/c/system/thunks.cc 2019-01-08 19:21:20.891924000 +0100 +--- mojo/public/c/system/thunks.cc.orig 2019-03-11 22:01:00 UTC ++++ mojo/public/c/system/thunks.cc @@ -16,7 +16,7 @@ #include "build/build_config.h" #include "mojo/public/c/system/core.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/optional.h" -@@ -28,7 +28,7 @@ +@@ -28,7 +28,7 @@ namespace { typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks); @@ -18,7 +18,7 @@ PROTECTED_MEMORY_SECTION base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks; #endif -@@ -63,7 +63,7 @@ +@@ -65,7 +65,7 @@ namespace mojo { class CoreLibraryInitializer { public: CoreLibraryInitializer(const MojoInitializeOptions* options) { @@ -27,7 +27,7 @@ bool application_provided_path = false; base::Optional<base::FilePath> library_path; if (options && options->struct_size >= sizeof(*options) && -@@ -82,7 +82,7 @@ +@@ -84,7 +84,7 @@ class CoreLibraryInitializer { if (!library_path) { // Default to looking for the library in the current working directory. @@ -36,7 +36,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif defined(OS_WIN) -@@ -132,7 +132,7 @@ +@@ -147,7 +147,7 @@ class CoreLibraryInitializer { ~CoreLibraryInitializer() = default; private: diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 83d95900b043..57f963ace1bb 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,5 +1,5 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-02-06 23:25:43.571727000 +0100 -+++ mojo/public/js/mojo_bindings_resources.grd 2019-02-06 23:25:53.104828000 +0100 +--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-03-11 22:01:00 UTC ++++ mojo/public/js/mojo_bindings_resources.grd @@ -23,7 +23,7 @@ use_base_dir="false" type="BINDATA" diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index b83e93ba8d9c..9df4ab0f017b 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2019-02-06 23:06:45.000000000 +0100 -+++ net/BUILD.gn 2019-02-08 22:09:39.080475000 +0100 -@@ -97,7 +97,7 @@ +--- net/BUILD.gn.orig 2019-03-11 22:01:00 UTC ++++ net/BUILD.gn +@@ -97,7 +97,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1854,7 +1854,7 @@ +@@ -1900,7 +1900,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -18,7 +18,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -1947,6 +1947,16 @@ +@@ -1993,6 +1993,16 @@ component("net") { ] sources -= [ "disk_cache/blockfile/file_posix.cc" ] diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 86ae3a56c25d..c15cb0bfe598 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,6 +1,6 @@ ---- net/base/address_tracker_linux.cc.orig 2018-12-03 21:17:06.000000000 +0100 -+++ net/base/address_tracker_linux.cc 2018-12-14 00:19:15.361979000 +0100 -@@ -22,96 +22,10 @@ +--- net/base/address_tracker_linux.cc.orig 2019-03-11 22:01:00 UTC ++++ net/base/address_tracker_linux.cc +@@ -21,96 +21,10 @@ namespace net { namespace internal { @@ -99,7 +99,7 @@ } AddressTrackerLinux::AddressTrackerLinux() -@@ -154,93 +68,8 @@ +@@ -153,93 +67,8 @@ AddressTrackerLinux::~AddressTrackerLinux() { } void AddressTrackerLinux::Init() { @@ -195,7 +195,7 @@ } void AddressTrackerLinux::AbortAndForceOnline() { -@@ -251,25 +80,6 @@ +@@ -250,25 +79,6 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -221,7 +221,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { // http://crbug.com/125097 -@@ -328,102 +138,7 @@ +@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer, bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -325,7 +325,7 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -460,31 +175,7 @@ +@@ -458,31 +173,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index 982272f67744..50b6ecbc20fb 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,5 +1,5 @@ ---- net/base/address_tracker_linux.h.orig 2018-01-04 21:05:55.000000000 +0100 -+++ net/base/address_tracker_linux.h 2018-01-21 13:43:10.477307000 +0100 +--- net/base/address_tracker_linux.h.orig 2019-03-11 22:01:00 UTC ++++ net/base/address_tracker_linux.h @@ -7,9 +7,6 @@ #include <sys/socket.h> // Needed to include netlink. diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc index fe4b502fd1f0..58a442e0f159 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2017-04-19 19:06:36 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2019-03-11 22:01:00 UTC +++ net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index aec8a8f0c524..9080a42d1d0e 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,8 +1,8 @@ ---- net/base/network_change_notifier.cc.orig 2017-06-05 19:03:09 UTC +--- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC +++ net/base/network_change_notifier.cc -@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() - #elif defined(OS_MACOSX) - return new NetworkChangeNotifierMac(); +@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() + #elif defined(OS_FUCHSIA) + return new NetworkChangeNotifierFuchsia(0 /* required_features */); #else - NOTIMPLEMENTED(); return NULL; diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.h b/www/chromium/files/patch-net_base_network__interfaces__posix.h index a291e43d39a1..44b17ad3eafa 100644 --- a/www/chromium/files/patch-net_base_network__interfaces__posix.h +++ b/www/chromium/files/patch-net_base_network__interfaces__posix.h @@ -1,8 +1,8 @@ ---- net/base/network_interfaces_posix.h.orig 2017-07-04 22:49:41.402276000 +0200 -+++ net/base/network_interfaces_posix.h 2017-07-04 22:49:59.456467000 +0200 +--- net/base/network_interfaces_posix.h.orig 2019-03-11 22:01:00 UTC ++++ net/base/network_interfaces_posix.h @@ -8,6 +8,8 @@ - // This file is only used to expose some of the internals of - // network_interfaces_posix.cc to network_interfaces_linux.cc and network_interfaces_mac.cc. + // This file provides some basic functionality shared between + // network_interfaces_linux.cc and network_interfaces_getifaddrs.cc. +#include <sys/socket.h> + diff --git a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h index 03ee840f2fdd..655e5cca978c 100644 --- a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h +++ b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h @@ -1,4 +1,4 @@ ---- net/disk_cache/blockfile/disk_format.h.orig 2017-04-19 19:06:36 UTC +--- net/disk_cache/blockfile/disk_format.h.orig 2019-03-11 22:01:01 UTC +++ net/disk_cache/blockfile/disk_format.h @@ -149,7 +149,9 @@ struct RankingsNode { }; diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index e979cd2e1a89..f462de801f4a 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,5 +1,5 @@ ---- net/dns/address_sorter_posix.cc.orig 2017-07-25 21:04:58.000000000 +0200 -+++ net/dns/address_sorter_posix.cc 2017-08-02 21:07:01.353407000 +0200 +--- net/dns/address_sorter_posix.cc.orig 2019-03-11 22:01:01 UTC ++++ net/dns/address_sorter_posix.cc @@ -13,7 +13,9 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc index 55f51146ef6a..51b150d18143 100644 --- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc +++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2017-04-19 19:06:36 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-03-11 22:01:01 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,3 +9,39 @@ #include <memory> #include "base/cancelable_callback.h" +@@ -46,7 +44,7 @@ const char* const kNameserversIPv4[] = { + "1.0.0.1", + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const char* const kNameserversIPv6[] = { + NULL, + "2001:DB8:0::42", +@@ -82,7 +80,7 @@ void InitializeResState(res_state res) { + ++res->nscount; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Install IPv6 addresses, replacing the corresponding IPv4 addresses. + unsigned nscount6 = 0; + for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { +@@ -103,7 +101,7 @@ void InitializeResState(res_state res) { + } + + void CloseResState(res_state res) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + for (int i = 0; i < res->nscount; ++i) { + if (res->_u._ext.nsaddrs[i] != NULL) + free(res->_u._ext.nsaddrs[i]); +@@ -128,7 +126,7 @@ void InitializeExpectedConfig(DnsConfig* config) { + config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i)); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { + if (!kNameserversIPv6[i]) + continue; diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc index 8ca6af244783..34eb7a2e01ca 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.cc +++ b/www/chromium/files/patch-net_dns_dns__reloader.cc @@ -1,8 +1,8 @@ ---- net/dns/dns_reloader.cc.orig 2017-04-19 19:06:36 UTC +--- net/dns/dns_reloader.cc.orig 2019-03-11 22:01:01 UTC +++ net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ - !defined(OS_ANDROID) + !defined(OS_ANDROID) && !defined(OS_FUCHSIA) +#if defined(OS_FREEBSD) +#include <netinet/in.h> diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index ada516cf2d7a..9e63c0c29904 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_util.cc.orig 2017-06-05 19:03:10 UTC +--- net/dns/dns_util.cc.orig 2019-03-11 22:01:01 UTC +++ net/dns/dns_util.cc -@@ -26,6 +26,8 @@ const int kMaxLabelLength = 63; +@@ -36,6 +36,8 @@ const uint16_t kFlagNamePointer = 0xc000; } // namespace diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index 9f4df90bd0ca..3c0b7ee87598 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,8 +1,8 @@ ---- net/dns/host_resolver_proc.cc.orig 2017-09-05 21:05:22.000000000 +0200 -+++ net/dns/host_resolver_proc.cc 2017-09-06 20:49:21.939725000 +0200 -@@ -190,7 +190,7 @@ - // Restrict result set to only this socket type to avoid duplicates. - hints.ai_socktype = SOCK_STREAM; +--- net/dns/host_resolver_proc.cc.orig 2019-03-11 22:01:01 UTC ++++ net/dns/host_resolver_proc.cc +@@ -195,7 +195,7 @@ int SystemHostResolverCall(const std::string& host, + // current process during that time. + base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ diff --git a/www/chromium/files/patch-net_features.gni b/www/chromium/files/patch-net_features.gni index aa4c00eedef3..949a31c49681 100644 --- a/www/chromium/files/patch-net_features.gni +++ b/www/chromium/files/patch-net_features.gni @@ -1,6 +1,6 @@ ---- net/features.gni.orig 2019-01-30 02:18:08.000000000 +0100 -+++ net/features.gni 2019-02-01 10:21:10.600808000 +0100 -@@ -27,7 +27,7 @@ +--- net/features.gni.orig 2019-03-11 22:01:01 UTC ++++ net/features.gni +@@ -27,7 +27,7 @@ declare_args() { disable_brotli_filter = false # Multicast DNS. diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index f919b5a72b18..a8fbaf810f5f 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2018-01-04 21:05:56.000000000 +0100 -+++ net/http/http_auth_gssapi_posix.cc 2018-01-16 20:07:40.196726000 +0100 -@@ -431,8 +431,9 @@ +--- net/http/http_auth_gssapi_posix.cc.orig 2019-03-11 22:01:01 UTC ++++ net/http/http_auth_gssapi_posix.cc +@@ -431,8 +431,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/chromium/files/patch-net_http_http__network__session.cc b/www/chromium/files/patch-net_http_http__network__session.cc index 215c47d5c3d3..9552bf40336a 100644 --- a/www/chromium/files/patch-net_http_http__network__session.cc +++ b/www/chromium/files/patch-net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- net/http/http_network_session.cc.orig 2018-06-13 00:10:22.000000000 +0200 -+++ net/http/http_network_session.cc 2018-07-19 15:24:13.890886000 +0200 -@@ -20,7 +20,9 @@ +--- net/http/http_network_session.cc.orig 2019-03-11 22:01:01 UTC ++++ net/http/http_network_session.cc +@@ -19,7 +19,9 @@ #include "base/trace_event/memory_dump_request_args.h" #include "base/trace_event/process_memory_dump.h" #include "base/values.h" @@ -8,5 +8,5 @@ #include "net/http/http_auth_handler_factory.h" +#endif #include "net/http/http_response_body_drainer.h" - #include "net/http/http_stream_factory_impl.h" + #include "net/http/http_stream_factory.h" #include "net/http/url_security_manager.h" diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc new file mode 100644 index 000000000000..1e4e2be343e0 --- /dev/null +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -0,0 +1,11 @@ +--- net/nqe/network_quality_estimator.cc.orig 2019-03-17 14:51:31 UTC ++++ net/nqe/network_quality_estimator.cc +@@ -99,7 +99,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { + case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: + break; + case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + network_id.id = GetWifiSSID(); + #endif + break; diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc new file mode 100644 index 000000000000..0aef528f8567 --- /dev/null +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -0,0 +1,11 @@ +--- net/nqe/network_quality_estimator_unittest.cc.orig 2019-03-17 14:56:02 UTC ++++ net/nqe/network_quality_estimator_unittest.cc +@@ -2058,7 +2058,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa + + // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is + // enabled only on certain platforms. +-#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT + #else + #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT diff --git a/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index edfbb560c6a8..26e797554e92 100644 --- a/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,5 +1,5 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2018-07-19 15:35:02.171066000 +0200 -+++ net/proxy_resolution/proxy_config_service_linux.cc 2018-07-19 15:37:12.958237000 +0200 +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2019-03-11 22:01:01 UTC ++++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ #include <errno.h> @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -495,6 +497,7 @@ +@@ -495,6 +497,7 @@ int StringToIntOrDefault(base::StringPiece value, int return default_value; } @@ -18,7 +18,7 @@ // This is the KDE version that reads kioslaverc and simulates gsettings. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -984,6 +987,7 @@ +@@ -986,6 +989,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1199,8 +1203,10 @@ +@@ -1197,8 +1201,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc index 39bbcca43e2e..2d17877f7d8e 100644 --- a/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc @@ -1,6 +1,6 @@ ---- net/proxy_resolution/proxy_resolution_service.cc.orig 2018-07-19 15:31:33.121813000 +0200 -+++ net/proxy_resolution/proxy_resolution_service.cc 2018-07-19 15:32:46.994020000 +0200 -@@ -47,7 +47,7 @@ +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-03-11 22:01:01 UTC ++++ net/proxy_resolution/proxy_resolution_service.cc +@@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ namespace net { namespace { #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1507,7 +1507,7 @@ +@@ -1577,7 +1577,7 @@ ProxyResolutionService::CreateSystemProxyConfigService << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc new file mode 100644 index 000000000000..b24dc928bdae --- /dev/null +++ b/www/chromium/files/patch-net_socket_socket__posix.cc @@ -0,0 +1,11 @@ +--- net/socket/socket_posix.cc.orig 2019-03-17 15:48:31 UTC ++++ net/socket/socket_posix.cc +@@ -568,7 +568,7 @@ void SocketPosix::ReadCompleted() { + } + + int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Disable SIGPIPE for this write. Although Chromium globally disables + // SIGPIPE, the net stack may be used in other consumers which do not do + // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc index 10a9e526cde4..69e902d418e4 100644 --- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2017-04-19 19:06:36 UTC +--- net/socket/socks5_client_socket.cc.orig 2019-03-11 22:01:01 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc new file mode 100644 index 000000000000..d2a7091eac8d --- /dev/null +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -0,0 +1,20 @@ +--- net/socket/tcp_socket_posix.cc.orig 2019-03-17 15:46:01 UTC ++++ net/socket/tcp_socket_posix.cc +@@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { + PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; + return false; + } ++#elif defined(OS_BSD) ++ // Set seconds until first TCP keep alive. ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) { ++ PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd; ++ return false; ++ } ++ // Set seconds between TCP keep alives. ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) { ++ PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd; ++ return false; ++ } + #endif + return true; + } diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 1e0920bb54a5..67f6c8a4709a 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2019-01-30 02:18:08.000000000 +0100 -+++ net/socket/udp_socket_posix.cc 2019-02-01 23:56:02.678455000 +0100 -@@ -68,7 +68,7 @@ +--- net/socket/udp_socket_posix.cc.orig 2019-03-11 22:01:01 UTC ++++ net/socket/udp_socket_posix.cc +@@ -68,7 +68,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); @@ -9,7 +9,7 @@ // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS // requires passing IPv4 address instead of interface index. This function // resolves IPv4 address by interface index. The |address| is returned in -@@ -97,7 +97,7 @@ +@@ -97,7 +97,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index return OK; } @@ -18,7 +18,7 @@ #if defined(OS_MACOSX) && !defined(OS_IOS) -@@ -641,13 +641,13 @@ +@@ -644,13 +644,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -34,7 +34,7 @@ } int UDPSocketPosix::AllowAddressReuse() { -@@ -662,17 +662,20 @@ +@@ -665,17 +665,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -57,7 +57,7 @@ rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); return rv == 0 ? OK : MapSystemError(errno); -@@ -934,19 +937,24 @@ +@@ -937,19 +940,24 @@ int UDPSocketPosix::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -85,7 +85,7 @@ if (rv) return MapSystemError(errno); break; -@@ -1008,7 +1016,7 @@ +@@ -1011,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; @@ -94,7 +94,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -1056,9 +1064,18 @@ +@@ -1059,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc b/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc index faabac97dedc..cdcc39a31db5 100644 --- a/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc +++ b/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc @@ -1,5 +1,5 @@ ---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2018-08-04 20:21:44.470242000 +0200 -+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc 2018-08-04 20:22:01.700604000 +0200 +--- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC ++++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc @@ -13,6 +13,7 @@ #include <ws2bth.h> #elif defined(OS_POSIX) || defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index ac4efdd9bdc3..d8f07ef3f0ee 100644 --- a/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2018-07-19 22:18:26.747684000 +0200 -+++ net/tools/cert_verify_tool/cert_verify_tool.cc 2018-07-19 22:18:48.374229000 +0200 -@@ -26,7 +26,7 @@ +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-03-11 22:01:01 UTC ++++ net/tools/cert_verify_tool/cert_verify_tool.cc +@@ -27,7 +27,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc new file mode 100644 index 000000000000..2cd0fb3a72b3 --- /dev/null +++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -0,0 +1,11 @@ +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-03-17 15:38:01 UTC ++++ net/tools/quic/quic_http_proxy_backend.cc +@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext + // Enable HTTP2, but disable QUIC on the backend + context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, use a fixed ProxyConfigService, since the default one + // depends on glib. + context_builder.set_proxy_config_service( diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 1420fae0e561..deed16f19611 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2018-06-13 00:10:23.000000000 +0200 -+++ net/url_request/url_request_context_builder.cc 2018-07-19 16:09:43.508974000 +0200 -@@ -506,7 +506,7 @@ +--- net/url_request/url_request_context_builder.cc.orig 2019-03-11 22:01:01 UTC ++++ net/url_request/url_request_context_builder.cc +@@ -520,7 +520,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index d46db39d722f..bb4fd053ed0d 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2018-08-01 00:08:54.000000000 +0200 -+++ pdf/pdfium/pdfium_engine.cc 2018-08-04 20:29:42.077905000 +0200 -@@ -134,7 +134,7 @@ +--- pdf/pdfium/pdfium_engine.cc.orig 2019-03-11 22:01:01 UTC ++++ pdf/pdfium/pdfium_engine.cc +@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT PDFiumEngine* g_engine_for_fontmapper = nullptr; @@ -9,7 +9,16 @@ PP_Instance g_last_instance_id; -@@ -651,7 +651,7 @@ +@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) { + fontinfo_with_metrics->default_sysfontinfo->Release( + fontinfo_with_metrics->default_sysfontinfo); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + PDFiumEngine::CreateDocumentLoaderFunction + g_create_document_loader_for_testing = nullptr; +@@ -663,7 +663,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -18,7 +27,7 @@ // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); #else -@@ -676,7 +676,7 @@ +@@ -688,7 +688,7 @@ bool InitializeSDK() { void ShutdownSDK() { FPDF_DestroyLibrary(); @@ -27,7 +36,7 @@ delete g_font_info; #endif TearDownV8(); -@@ -712,7 +712,7 @@ +@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -36,7 +45,7 @@ // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1226,7 +1226,7 @@ +@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -45,7 +54,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2924,7 +2924,7 @@ +@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); @@ -54,7 +63,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3402,7 +3402,7 @@ +@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index 7c9d6129908f..17531b7125b1 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2017-06-05 19:03:10 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2019-03-11 22:01:01 UTC +++ ppapi/proxy/file_io_resource.cc @@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset, diff --git a/www/chromium/files/patch-printing_backend_print_backend_cups.h b/www/chromium/files/patch-printing_backend_print__backend__cups.h index 7867a572fb93..816d95f5f5c7 100644 --- a/www/chromium/files/patch-printing_backend_print_backend_cups.h +++ b/www/chromium/files/patch-printing_backend_print__backend__cups.h @@ -1,5 +1,5 @@ ---- printing/backend/print_backend_cups.h.orig 2017-09-07 12:48:26.701906000 +0200 -+++ printing/backend/print_backend_cups.h 2017-09-07 12:48:48.628278000 +0200 +--- printing/backend/print_backend_cups.h.orig 2019-03-11 22:01:01 UTC ++++ printing/backend/print_backend_cups.h @@ -5,6 +5,8 @@ #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py index 8b2dbc9b4b08..0818e1bf8f0e 100644 --- a/www/chromium/files/patch-printing_cups__config__helper.py +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -1,4 +1,4 @@ ---- printing/cups_config_helper.py.orig 2017-04-19 19:06:36 UTC +--- printing/cups_config_helper.py.orig 2019-03-11 22:01:01 UTC +++ printing/cups_config_helper.py @@ -65,7 +65,7 @@ def main(): mode = sys.argv[1] diff --git a/www/chromium/files/patch-remoting_base_chromoting_event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc index f3ef11e5abf9..1e4813781028 100644 --- a/www/chromium/files/patch-remoting_base_chromoting_event.cc +++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,8 +1,8 @@ ---- remoting/base/chromoting_event.cc.orig 2017-08-10 16:16:33.217694000 +0200 -+++ remoting/base/chromoting_event.cc 2017-08-10 16:16:51.082041000 +0200 -@@ -103,7 +103,7 @@ +--- remoting/base/chromoting_event.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/base/chromoting_event.cc +@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); - SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); + SetString(kOsVersionKey, GetOperatingSystemVersionString()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-remoting_client_display_sys_opengl.h b/www/chromium/files/patch-remoting_client_display_sys__opengl.h index dc87e78e808a..cb1787f42c60 100644 --- a/www/chromium/files/patch-remoting_client_display_sys_opengl.h +++ b/www/chromium/files/patch-remoting_client_display_sys__opengl.h @@ -1,5 +1,5 @@ ---- remoting/client/display/sys_opengl.h.orig 2017-08-10 16:17:57.036915000 +0200 -+++ remoting/client/display/sys_opengl.h 2017-08-10 16:18:06.520753000 +0200 +--- remoting/client/display/sys_opengl.h.orig 2019-03-11 22:01:01 UTC ++++ remoting/client/display/sys_opengl.h @@ -9,7 +9,7 @@ #if defined(OS_IOS) diff --git a/www/chromium/files/patch-remoting_host_evaluate_capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc index c5fe6f2eb6be..565d577bd91b 100644 --- a/www/chromium/files/patch-remoting_host_evaluate_capability.cc +++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc @@ -1,6 +1,6 @@ ---- remoting/host/evaluate_capability.cc.orig 2019-01-09 13:06:32.177219000 +0100 -+++ remoting/host/evaluate_capability.cc 2019-01-09 13:06:46.855681000 +0100 -@@ -50,7 +50,7 @@ +--- remoting/host/evaluate_capability.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/evaluate_capability.cc +@@ -50,7 +50,7 @@ base::FilePath BuildHostBinaryPath() { } #endif diff --git a/www/chromium/files/patch-remoting_host_host_attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index d69178479a0e..e3ebcf149315 100644 --- a/www/chromium/files/patch-remoting_host_host_attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2019-01-09 13:07:49.513766000 +0100 -+++ remoting/host/host_attributes.cc 2019-01-09 13:08:03.536029000 +0100 -@@ -123,7 +123,7 @@ +--- remoting/host/host_attributes.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/host_attributes.cc +@@ -123,7 +123,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index 0adecc3b6e8c..c221907fcaf0 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_details.cc.orig 2017-08-03 00:05:16.000000000 +0200 -+++ remoting/host/host_details.cc 2017-08-10 16:20:00.950699000 +0200 -@@ -22,7 +22,7 @@ +--- remoting/host/host_details.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/host_details.cc +@@ -24,7 +24,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; #elif defined(OS_CHROMEOS) return "ChromeOS"; diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc new file mode 100644 index 000000000000..25b9ed454046 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -0,0 +1,35 @@ +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/it2me/it2me_native_messaging_host_main.cc +@@ -27,12 +27,12 @@ + #include "remoting/host/resources.h" + #include "remoting/host/usage_stats_consent.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <gtk/gtk.h> + + #include "base/linux_util.h" + #include "ui/gfx/x/x11.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_MACOSX) + #include "base/mac/scoped_nsautorelease_pool.h" +@@ -106,7 +106,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + + remoting::LoadResources(""); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Required in order for us to run multiple X11 threads. + XInitThreads(); + +@@ -122,7 +122,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Need to prime the host OS version value for linux to prevent IO on the + // network thread. base::GetLinuxDistro() caches the result. + base::GetLinuxDistro(); +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + base::File read_file; + base::File write_file; diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc deleted file mode 100644 index 43c73ab06080..000000000000 --- a/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2017-08-10 16:26:53.553976000 +0200 -+++ remoting/host/it2me/it2me_native_messaging_host_main.cc 2017-08-10 16:27:23.735020000 +0200 -@@ -25,7 +25,7 @@ - #include "remoting/host/resources.h" - #include "remoting/host/usage_stats_consent.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include <gtk/gtk.h> - #include <X11/Xlib.h> - -@@ -83,7 +83,7 @@ - - remoting::LoadResources(""); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Required in order for us to run multiple X11 threads. - XInitThreads(); - diff --git a/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index e23254e82c0c..b06387323b47 100644 --- a/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2017-08-10 16:28:52.379518000 +0200 -+++ remoting/host/me2me_desktop_environment.cc 2017-08-10 16:29:10.165289000 +0200 -@@ -99,7 +99,7 @@ +--- remoting/host/me2me_desktop_environment.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/me2me_desktop_environment.cc +@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 3a8f8d1df4d0..a9b177ae327a 100644 --- a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,7 +1,7 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2018-03-20 23:05:29.000000000 +0100 -+++ remoting/host/remoting_me2me_host.cc 2018-03-24 18:19:49.996963000 +0100 -@@ -115,13 +115,13 @@ - #include "base/mac/scoped_cftyperef.h" +--- remoting/host/remoting_me2me_host.cc.orig 2019-03-11 22:01:01 UTC ++++ remoting/host/remoting_me2me_host.cc +@@ -117,13 +117,13 @@ + #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) -#if defined(OS_LINUX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -156,11 +156,11 @@ +@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -30,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -351,7 +351,7 @@ +@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -39,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -565,10 +565,10 @@ +@@ -567,10 +567,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -52,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -761,7 +761,7 @@ +@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -61,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -847,7 +847,7 @@ +@@ -849,7 +849,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +70,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -856,7 +856,7 @@ +@@ -858,7 +858,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -914,7 +914,7 @@ +@@ -916,7 +916,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1546,7 +1546,7 @@ +@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1705,7 +1705,7 @@ +@@ -1719,7 +1719,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); diff --git a/www/chromium/files/patch-remoting_webapp_base_js_platform.js b/www/chromium/files/patch-remoting_webapp_base_js_platform.js index 3b0cb7b697c5..b03f6c2d525e 100644 --- a/www/chromium/files/patch-remoting_webapp_base_js_platform.js +++ b/www/chromium/files/patch-remoting_webapp_base_js_platform.js @@ -1,6 +1,6 @@ ---- remoting/webapp/base/js/platform.js.orig 2017-08-10 16:21:23.900363000 +0200 -+++ remoting/webapp/base/js/platform.js 2017-08-10 16:24:46.113671000 +0200 -@@ -107,6 +107,14 @@ +--- remoting/webapp/base/js/platform.js.orig 2019-03-11 22:01:01 UTC ++++ remoting/webapp/base/js/platform.js +@@ -107,6 +107,14 @@ remoting.getSystemInfo = function() { return result; } diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni index f3ca941032df..896bf2107142 100644 --- a/www/chromium/files/patch-sandbox_features.gni +++ b/www/chromium/files/patch-sandbox_features.gni @@ -1,6 +1,6 @@ ---- sandbox/features.gni.orig 2017-12-15 02:04:24.000000000 +0100 -+++ sandbox/features.gni 2017-12-24 17:50:45.309732000 +0100 -@@ -12,6 +12,6 @@ +--- sandbox/features.gni.orig 2019-03-11 22:01:01 UTC ++++ sandbox/features.gni +@@ -12,6 +12,6 @@ use_seccomp_bpf = (is_linux || is_android) && (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64" || current_cpu == "mipsel" || diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 94cf851acd8f..bc35eec1057d 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/linux/BUILD.gn.orig 2018-08-01 00:08:55.000000000 +0200 -+++ sandbox/linux/BUILD.gn 2018-08-04 20:49:57.663117000 +0200 -@@ -12,12 +12,12 @@ +--- sandbox/linux/BUILD.gn.orig 2019-03-11 22:01:01 UTC ++++ sandbox/linux/BUILD.gn +@@ -12,12 +12,12 @@ if (is_android) { } declare_args() { @@ -16,7 +16,7 @@ } if (is_nacl_nonsfi) { -@@ -399,7 +399,7 @@ +@@ -379,7 +379,7 @@ component("sandbox_services") { public_deps += [ ":sandbox_services_headers" ] } @@ -25,7 +25,7 @@ cflags = [ "-fgnu-inline-asm" ] sources -= [ -@@ -407,6 +407,8 @@ +@@ -387,6 +387,8 @@ component("sandbox_services") { "services/init_process_reaper.h", "services/scoped_process.cc", "services/scoped_process.h", @@ -34,7 +34,7 @@ "services/yama.cc", "services/yama.h", "syscall_broker/broker_channel.cc", -@@ -425,6 +427,10 @@ +@@ -405,6 +407,10 @@ component("sandbox_services") { "syscall_broker/broker_process.h", "syscall_broker/broker_simple_message.cc", "syscall_broker/broker_simple_message.h", diff --git a/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc index 1766c2eb71f8..ce19163df699 100644 --- a/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc +++ b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc @@ -1,5 +1,5 @@ ---- sandbox/linux/services/init_process_reaper.cc.orig 2018-08-04 19:26:41.605247000 +0200 -+++ sandbox/linux/services/init_process_reaper.cc 2018-08-04 19:27:02.769442000 +0200 +--- sandbox/linux/services/init_process_reaper.cc.orig 2019-03-11 22:01:01 UTC ++++ sandbox/linux/services/init_process_reaper.cc @@ -1,6 +1,7 @@ // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -8,7 +8,7 @@ #include "sandbox/linux/services/init_process_reaper.h" -@@ -100,3 +101,4 @@ +@@ -100,3 +101,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo } } // namespace sandbox. diff --git a/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index e35affcfb2a3..9156cfe0424e 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,5 +1,5 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2018-07-19 22:19:52.264027000 +0200 -+++ sandbox/linux/services/libc_interceptor.cc 2018-07-19 22:20:31.348730000 +0200 +--- sandbox/linux/services/libc_interceptor.cc.orig 2019-03-11 22:01:01 UTC ++++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> #include <stdint.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -94,7 +96,7 @@ +@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn index 85139ac6dc44..d3b1cdf7c7eb 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- services/audio/BUILD.gn.orig 2018-12-12 22:56:10.000000000 +0100 -+++ services/audio/BUILD.gn 2018-12-29 17:36:28.236514000 +0100 -@@ -104,7 +104,7 @@ +--- services/audio/BUILD.gn.orig 2019-03-11 22:01:01 UTC ++++ services/audio/BUILD.gn +@@ -106,7 +106,7 @@ source_set("lib") { "//services/service_manager/sandbox:sandbox", ] diff --git a/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc b/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc deleted file mode 100644 index e16314b405b1..000000000000 --- a/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- services/catalog/public/cpp/manifest_parsing_util.cc.orig 2017-09-05 21:05:23.000000000 +0200 -+++ services/catalog/public/cpp/manifest_parsing_util.cc 2017-09-06 21:09:16.599702000 +0200 -@@ -17,7 +17,8 @@ - name == Store::kRequiredFilesKey_PlatformValue_Linux || - name == Store::kRequiredFilesKey_PlatformValue_MacOSX || - name == Store::kRequiredFilesKey_PlatformValue_Android || -- name == Store::kRequiredFilesKey_PlatformValue_Fuchsia; -+ name == Store::kRequiredFilesKey_PlatformValue_Fuchsia || -+ name == Store::kRequiredFilesKey_PlatformValue_FreeBSD; - } - - bool IsCurrentPlatform(const std::string& name) { -@@ -31,6 +32,8 @@ - return name == Store::kRequiredFilesKey_PlatformValue_Android; - #elif defined(OS_FUCHSIA) - return name == Store::kRequiredFilesKey_PlatformValue_Fuchsia; -+#elif defined(OS_BSD) -+ return name == Store::kRequiredFilesKey_PlatformValue_FreeBSD; - #else - #error This architecture is not supported. - #endif diff --git a/www/chromium/files/patch-services_catalog_store.cc b/www/chromium/files/patch-services_catalog_store.cc index 7fe825d4f478..11bf71b32891 100644 --- a/www/chromium/files/patch-services_catalog_store.cc +++ b/www/chromium/files/patch-services_catalog_store.cc @@ -1,6 +1,6 @@ ---- services/catalog/store.cc.orig 2017-09-05 21:05:23.000000000 +0200 -+++ services/catalog/store.cc 2017-09-06 21:21:50.819060000 +0200 -@@ -34,5 +34,7 @@ +--- services/catalog/store.cc.orig 2019-03-11 22:01:01 UTC ++++ services/catalog/store.cc +@@ -38,5 +38,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android"; // static const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia"; diff --git a/www/chromium/files/patch-services_catalog_store.h b/www/chromium/files/patch-services_catalog_store.h index 5e5d7fe733ae..58ea5e1be58b 100644 --- a/www/chromium/files/patch-services_catalog_store.h +++ b/www/chromium/files/patch-services_catalog_store.h @@ -1,6 +1,6 @@ ---- services/catalog/store.h.orig 2017-09-05 21:05:23.000000000 +0200 -+++ services/catalog/store.h 2017-09-06 21:16:22.831744000 +0200 -@@ -34,6 +34,7 @@ +--- services/catalog/store.h.orig 2019-03-11 22:01:01 UTC ++++ services/catalog/store.h +@@ -38,6 +38,7 @@ class Store { static const char kRequiredFilesKey_PlatformValue_MacOSX[]; static const char kRequiredFilesKey_PlatformValue_Android[]; static const char kRequiredFilesKey_PlatformValue_Fuchsia[]; diff --git a/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h index 7bc9ee1c1238..899614558c19 100644 --- a/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h +++ b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h @@ -1,15 +1,15 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-01-09 13:09:39.690142000 +0100 -+++ services/content/simple_browser/simple_browser_service.h 2019-01-09 13:10:00.488808000 +0100 -@@ -14,7 +14,7 @@ - #include "services/content/public/cpp/buildflags.h" - #include "services/service_manager/public/cpp/service.h" +--- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC ++++ services/content/simple_browser/simple_browser_service.h +@@ -16,7 +16,7 @@ + #include "services/service_manager/public/cpp/service_binding.h" + #include "services/service_manager/public/mojom/service.mojom.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #endif -@@ -47,7 +47,7 @@ +@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe // service_manager::Service: void OnStart() override; diff --git a/www/chromium/files/patch-services_device_device__service.h b/www/chromium/files/patch-services_device_device__service.h new file mode 100644 index 000000000000..dfa9f67d0c8c --- /dev/null +++ b/www/chromium/files/patch-services_device_device__service.h @@ -0,0 +1,11 @@ +--- services/device/device_service.h.orig 2019-03-17 14:44:04 UTC ++++ services/device/device_service.h +@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service + #endif + + #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \ +- defined(OS_MACOSX) ++ defined(OS_MACOSX) || defined(OS_BSD) + // Requests for the SerialPortManager interface must be bound to + // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will + // be destroyed on that sequence. diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index a1935ee61989..41d470db80a2 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2018-12-13 22:21:38.804321000 +0100 -+++ services/device/geolocation/location_arbitrator.cc 2018-12-13 22:22:16.348629000 +0100 -@@ -164,7 +164,7 @@ +--- services/device/geolocation/location_arbitrator.cc.orig 2019-03-11 22:01:01 UTC ++++ services/device/geolocation/location_arbitrator.cc +@@ -164,7 +164,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn index 4e866f40a947..9f794ce68041 100644 --- a/www/chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/chromium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2018-03-04 02:07:03.748216000 +0100 -+++ services/device/hid/BUILD.gn 2018-03-04 02:10:30.278997000 +0100 -@@ -52,6 +52,19 @@ +--- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC ++++ services/device/hid/BUILD.gn +@@ -51,6 +51,19 @@ source_set("hid") { deps += [ "//device/udev_linux" ] } @@ -18,5 +18,5 @@ + } + if (is_chromeos) { - deps += [ "//chromeos" ] + deps += [ "//chromeos/dbus" ] } diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc index dca62afb4296..cadfcbe6b358 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service.cc @@ -1,5 +1,5 @@ ---- services/device/hid/hid_service.cc.orig 2018-02-24 16:25:18.000000000 +0100 -+++ services/device/hid/hid_service.cc 2018-03-04 05:38:54.425730000 +0100 +--- services/device/hid/hid_service.cc.orig 2019-03-11 22:01:01 UTC ++++ services/device/hid/hid_service.cc @@ -16,6 +16,8 @@ #if defined(OS_LINUX) && defined(USE_UDEV) @@ -9,7 +9,7 @@ #elif defined(OS_MACOSX) #include "services/device/hid/hid_service_mac.h" #elif defined(OS_WIN) -@@ -36,6 +38,8 @@ +@@ -36,6 +38,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { #if defined(OS_LINUX) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h index 0d92a4cff6bc..2c515c6ba632 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h @@ -1,5 +1,5 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2018-12-27 21:14:54.195603000 +0100 -+++ services/device/hid/hid_service_freebsd.h 2018-12-27 21:14:54.195893000 +0100 +--- services/device/hid/hid_service_freebsd.h.orig 2019-03-17 01:47:14 UTC ++++ services/device/hid/hid_service_freebsd.h @@ -0,0 +1,48 @@ +// Copyright 2014 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-services_device_serial_BUILD.gn b/www/chromium/files/patch-services_device_serial_BUILD.gn new file mode 100644 index 000000000000..81589aec985e --- /dev/null +++ b/www/chromium/files/patch-services_device_serial_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/serial/BUILD.gn.orig 2019-03-11 22:01:01 UTC ++++ services/device/serial/BUILD.gn +@@ -4,7 +4,7 @@ + + import("//build/config/features.gni") + +-if (is_win || (is_linux && use_udev) || is_mac) { ++if (is_win || (is_linux && use_udev) || is_mac || is_bsd) { + config("platform_support") { + visibility = [ ":serial" ] + if (is_win) { diff --git a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index d5f4c912ba32..f8b54bcb97a3 100644 --- a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2017-06-05 19:03:07 UTC -+++ device/serial/serial_io_handler_posix.cc -@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +--- services/device/serial/serial_io_handler_posix.cc.orig 2019-03-11 22:01:01 UTC ++++ services/device/serial/serial_io_handler_posix.cc +@@ -65,7 +65,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc index d5e38ba98835..7f039a8e8b9a 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2018-12-12 22:56:10.000000000 +0100 -+++ services/device/time_zone_monitor/time_zone_monitor.cc 2019-01-10 00:38:41.654967000 +0100 -@@ -29,7 +29,7 @@ +--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-03-11 22:01:01 UTC ++++ services/device/time_zone_monitor/time_zone_monitor.cc +@@ -29,7 +29,7 @@ void TimeZoneMonitor::Bind(device::mojom::TimeZoneMoni void TimeZoneMonitor::NotifyClients() { DCHECK(thread_checker_.CalledOnValidThread()); @@ -9,7 +9,7 @@ // On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No // need to redetect it with detectHostTimeZone(). std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault()); -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ void TimeZoneMonitor::NotifyClients() { #else std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone()); #endif diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index e3b7e3f3d438..bba3a937061a 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-01-10 00:39:59.319666000 +0100 -+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc 2019-01-10 00:40:51.718178000 +0100 -@@ -99,7 +99,11 @@ +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-03-11 22:01:01 UTC ++++ services/device/time_zone_monitor/time_zone_monitor_linux.cc +@@ -104,7 +104,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { @@ -10,5 +10,5 @@ "/etc/localtime", "/etc/timezone", "/etc/TZ", +#endif }; - - auto callback = + for (size_t index = 0; index < base::size(kFilesToWatch); ++index) { + file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>()); diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 9b859150c51e..f88e8f7016ca 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2018-08-04 19:29:41.578469000 +0200 -+++ services/network/BUILD.gn 2018-08-04 19:29:55.745503000 +0200 -@@ -138,7 +138,6 @@ +--- services/network/BUILD.gn.orig 2019-03-11 22:01:01 UTC ++++ services/network/BUILD.gn +@@ -248,7 +248,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/chromium/files/patch-services_network_network_context.cc b/www/chromium/files/patch-services_network_network__context.cc index 0ad66f16d56f..7494dd16ec70 100644 --- a/www/chromium/files/patch-services_network_network_context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2019-01-09 11:56:44.681236000 +0100 -+++ services/network/network_context.cc 2019-01-09 12:00:05.840566000 +0100 -@@ -110,7 +110,7 @@ +--- services/network/network_context.cc.orig 2019-03-11 22:01:01 UTC ++++ services/network/network_context.cc +@@ -132,7 +132,7 @@ #endif // defined(USE_NSS_CERTS) #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ @@ -9,7 +9,7 @@ #include "net/cert/cert_net_fetcher.h" #include "net/cert_net/cert_net_fetcher_impl.h" #endif -@@ -543,7 +543,7 @@ +@@ -610,7 +610,7 @@ NetworkContext::~NetworkContext() { #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ @@ -18,7 +18,7 @@ net::ShutdownGlobalCertNetFetcher(); #endif } -@@ -1367,7 +1367,7 @@ +@@ -1700,7 +1700,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { @@ -27,7 +27,7 @@ DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -@@ -1654,7 +1654,7 @@ +@@ -2015,7 +2015,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get()); #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ diff --git a/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index 8a2861bf19b9..b7b7be5079f4 100644 --- a/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2018-12-03 21:17:09.000000000 +0100 -+++ services/network/network_sandbox_hook_linux.cc 2018-12-14 00:53:22.847706000 +0100 -@@ -14,6 +14,7 @@ +--- services/network/network_sandbox_hook_linux.cc.orig 2019-03-11 22:01:01 UTC ++++ services/network/network_sandbox_hook_linux.cc +@@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet; namespace network { bool NetworkPreSandboxHook(service_manager::SandboxLinux::Options options) { @@ -8,7 +8,7 @@ auto* instance = service_manager::SandboxLinux::GetInstance(); // TODO(tsepez): remove universal permission under filesytem root. -@@ -32,6 +33,7 @@ +@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(service_manager::SandboxLin service_manager::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 30df442cbf13..8ffb810f07ce 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2018-12-28 15:43:28.594049000 +0100 -+++ services/network/network_service.cc 2018-12-28 15:46:00.776342000 +0100 -@@ -53,7 +53,7 @@ +--- services/network/network_service.cc.orig 2019-03-21 00:36:59 UTC ++++ services/network/network_service.cc +@@ -61,7 +61,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,8 +9,8 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -449,7 +449,7 @@ - crl_set_distributor_->OnNewCRLSet(crl_set); +@@ -605,7 +605,7 @@ void NetworkService::OnCertDBChanged() { + net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index d32e03e7b187..194096d9dc92 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2019-01-30 02:18:10.000000000 +0100 -+++ services/network/network_service.h 2019-02-01 10:39:31.949929000 +0100 -@@ -174,7 +174,7 @@ +--- services/network/network_service.h.orig 2019-03-11 22:01:01 UTC ++++ services/network/network_service.h +@@ -186,7 +186,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService #endif // !BUILDFLAG(IS_CT_SUPPORTED) void UpdateCRLSet(base::span<const uint8_t> crl_set) override; void OnCertDBChanged() override; diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h new file mode 100644 index 000000000000..83e6eb0eaa83 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -0,0 +1,14 @@ +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-03-11 22:01:02 UTC ++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h +@@ -26,9 +26,9 @@ class COMPONENT_EXPORT( + mojom::RawOSMemDump*); + static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + static void SetProcSmapsForTesting(FILE*); +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + private: + FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps); diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc new file mode 100644 index 000000000000..1ea42a3de872 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -0,0 +1,80 @@ +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-03-21 01:36:59.000000000 +0100 ++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc 2019-03-24 18:58:48.459358000 +0100 +@@ -17,8 +17,10 @@ + #include "build/build_config.h" + #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" + ++#if !defined(OS_BSD) + // Symbol with virtual address of the start of ELF header of the current binary. + extern char __ehdr_start; ++#endif + + namespace memory_instrumentation { + +@@ -67,6 +69,7 @@ + + ModuleData GetMainModuleData() { + ModuleData module_data; ++#if !defined(OS_BSD) + Dl_info dl_info; + if (dladdr(&__ehdr_start, &dl_info)) { + base::Optional<std::string> build_id = +@@ -76,6 +79,7 @@ + module_data.build_id = *build_id; + } + } ++#endif + return module_data; + } + +@@ -123,14 +127,14 @@ + // Build ID is needed to symbolize heap profiles, and is generated only on + // official builds. Build ID is only added for the current library (chrome) + // since it is racy to read other libraries which can be unmapped any time. +-#if defined(OFFICIAL_BUILD) ++#if defined(OFFICIAL_BUILD) && !defined(OS_BSD) + if (!region->mapped_file.empty() && + base::StartsWith(main_module_data.path, region->mapped_file, + base::CompareCase::SENSITIVE) && + !main_module_data.build_id.empty()) { + region->module_debugid = main_module_data.build_id; + } +-#endif // defined(OFFICIAL_BUILD) ++#endif // defined(OFFICIAL_BUILD) && !defined(OS_BSD) + + return res; + } +@@ -217,6 +221,9 @@ + // static + bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, + mojom::RawOSMemDump* dump) { ++#if defined(OS_BSD) ++ return false; ++#else + base::ScopedFD autoclose = OpenStatm(pid); + int statm_fd = autoclose.get(); + +@@ -242,10 +249,12 @@ + dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024; + + return true; ++#endif + } + + // static + std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { ++#if defined(OS_BSD) + std::vector<VmRegionPtr> maps; + uint32_t res = 0; + if (g_proc_smaps_for_testing) { +@@ -263,6 +272,10 @@ + return std::vector<VmRegionPtr>(); + + return maps; ++#else ++ NOTIMPLEMENTED(); ++ return std::vector<VmRegionPtr>(); ++#endif + } + + } // namespace memory_instrumentation diff --git a/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h b/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h deleted file mode 100644 index 6679543941e0..000000000000 --- a/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h +++ /dev/null @@ -1,11 +0,0 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2017-09-07 07:15:01.296724000 +0200 -+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h 2017-09-07 07:15:17.711160000 +0200 -@@ -21,7 +21,7 @@ - private: - FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps); - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - static void SetProcSmapsForTesting(FILE*); - #endif // defined(OS_LINUX) - }; diff --git a/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc b/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc deleted file mode 100644 index f577a19f7b91..000000000000 --- a/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc +++ /dev/null @@ -1,40 +0,0 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2018-08-01 00:08:55.000000000 +0200 -+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc 2018-08-04 21:00:31.567932000 +0200 -@@ -16,8 +16,10 @@ - #include "build/build_config.h" - #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" - -+#if !defined(OS_BSD) - // Symbol with virtual address of the start of ELF header of the current binary. - extern char __ehdr_start; -+#endif - - namespace memory_instrumentation { - -@@ -101,7 +103,7 @@ - // Build ID is needed to symbolize heap profiles, and is generated only on - // official builds. Build ID is only added for the current library (chrome) - // since it is racy to read other libraries which can be unmapped any time. --#if defined(OFFICIAL_BUILD) -+#if defined(OFFICIAL_BUILD) && !defined(OS_BSD) - uintptr_t addr = reinterpret_cast<uintptr_t>(&ParseSmapsHeader); - if (addr >= region->start_address && addr < end_addr) { - base::Optional<std::string> buildid = -@@ -196,6 +198,9 @@ - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ return false; -+#else - base::ScopedFD autoclose = OpenStatm(pid); - int statm_fd = autoclose.get(); - -@@ -221,6 +226,7 @@ - dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024; - - return true; -+#endif - } - - // static diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-services_service__manager_embedder_main.cc index e475d08fda72..59c9689f2a44 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_main.cc +++ b/www/chromium/files/patch-services_service__manager_embedder_main.cc @@ -1,6 +1,6 @@ ---- services/service_manager/embedder/main.cc.orig 2019-01-09 13:16:40.515216000 +0100 -+++ services/service_manager/embedder/main.cc 2019-01-09 13:17:09.817906000 +0100 -@@ -331,7 +331,7 @@ +--- services/service_manager/embedder/main.cc.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/embedder/main.cc +@@ -320,7 +320,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc index d239629196bf..56f27b3a6704 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc +++ b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc @@ -1,4 +1,4 @@ ---- services/service_manager/embedder/set_process_title_linux.cc.orig 2017-06-05 19:03:11 UTC +--- services/service_manager/embedder/set_process_title_linux.cc.orig 2019-03-11 22:01:02 UTC +++ services/service_manager/embedder/set_process_title_linux.cc @@ -49,6 +49,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h index 3c943ff284ed..0e1eb1ce1d32 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h +++ b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h @@ -1,4 +1,4 @@ ---- services/service_manager/embedder/set_process_title_linux.h.orig 2017-06-05 19:03:11 UTC +--- services/service_manager/embedder/set_process_title_linux.h.orig 2019-03-11 22:01:02 UTC +++ services/service_manager/embedder/set_process_title_linux.h @@ -5,6 +5,9 @@ #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn new file mode 100644 index 000000000000..6be6aa5fe51e --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn @@ -0,0 +1,14 @@ +--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/public/cpp/service_executable/BUILD.gn +@@ -30,6 +30,11 @@ source_set("support") { + "//sandbox/linux:seccomp_bpf", + ] + } ++ if (is_bsd) { ++ deps -= [ ++ "//sandbox/linux:seccomp_bpf" ++ ] ++ } + } + + # Service executable targets should link against this to get a boilerplate entry diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn deleted file mode 100644 index 87a8dacdd84f..000000000000 --- a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2018-12-03 21:17:09.000000000 +0100 -+++ services/service_manager/public/cpp/standalone_service/BUILD.gn 2018-12-15 14:44:25.857780000 +0100 -@@ -25,7 +25,7 @@ - "//services/service_manager/public/mojom", - ] - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ - "//sandbox/linux:sandbox", - "//sandbox/linux:sandbox_services", diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc deleted file mode 100644 index 10367534a60b..000000000000 --- a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2018-02-24 16:25:18.000000000 +0100 -+++ services/service_manager/public/cpp/standalone_service/standalone_service.cc 2018-03-04 03:53:12.449254000 +0100 -@@ -59,6 +59,8 @@ - command_line.GetSwitchValueASCII(switches::kServiceSandboxType)), - SandboxLinux::PreSandboxHook(), sandbox_options); - } -+#elif defined(OS_BSD) -+ NOTIMPLEMENTED(); - #endif - - mojo::edk::Init(); diff --git a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn index c94ba29243f6..05ce38ea9fad 100644 --- a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/runner/host/BUILD.gn.orig 2018-12-03 21:17:09.000000000 +0100 -+++ services/service_manager/runner/host/BUILD.gn 2018-12-15 14:50:24.143808000 +0100 -@@ -31,7 +31,7 @@ +--- services/service_manager/runner/host/BUILD.gn.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/runner/host/BUILD.gn +@@ -30,7 +30,7 @@ source_set("lib") { "//mojo/public/cpp/system", ] diff --git a/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn b/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn index a1c3f8334fdb..edfc14f60d03 100644 --- a/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn @@ -1,11 +1,11 @@ ---- services/service_manager/sandbox/BUILD.gn.orig 2018-03-03 20:51:40.189699000 +0100 -+++ services/service_manager/sandbox/BUILD.gn 2018-03-03 20:51:56.739150000 +0100 -@@ -23,7 +23,7 @@ - deps = [ +--- services/service_manager/sandbox/BUILD.gn.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/sandbox/BUILD.gn +@@ -28,7 +28,7 @@ component("sandbox") { "//base", + "//sandbox:common", ] - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ - "linux/bpf_base_policy_linux.cc", - "linux/bpf_base_policy_linux.h", + "linux/bpf_audio_policy_linux.cc", + "linux/bpf_audio_policy_linux.h", diff --git a/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc b/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc new file mode 100644 index 000000000000..a3ad01ccd336 --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc @@ -0,0 +1,11 @@ +--- services/service_manager/sandbox/sandbox_type.cc.orig 2019-03-17 14:36:49 UTC ++++ services/service_manager/sandbox/sandbox_type.cc +@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type + service_manager::features::kXRSandbox); + #endif + case SANDBOX_TYPE_AUDIO: +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return !base::FeatureList::IsEnabled( + service_manager::features::kAudioServiceSandbox); + #else diff --git a/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni b/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni index 76a05489c674..d6dc2aed4fb6 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni +++ b/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/common/zygote_features.gni.orig 2018-08-04 19:05:25.641485000 +0200 -+++ services/service_manager/zygote/common/zygote_features.gni 2018-08-04 19:05:36.695208000 +0200 +--- services/service_manager/zygote/common/zygote_features.gni.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/common/zygote_features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc index 0cedce989076..95e322cffb48 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc +++ b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2018-08-04 19:08:22.136631000 +0200 -+++ services/service_manager/zygote/host/zygote_host_impl_linux.cc 2018-08-04 19:11:54.463784000 +0200 -@@ -72,6 +72,7 @@ +--- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/host/zygote_host_impl_linux.cc +@@ -72,6 +72,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -8,7 +8,7 @@ if (command_line.HasSwitch(service_manager::switches::kNoSandbox)) { return; } -@@ -133,6 +134,7 @@ +@@ -122,6 +123,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << service_manager::switches::kNoSandbox << "."; } @@ -16,7 +16,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -157,6 +159,7 @@ +@@ -146,6 +148,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -24,7 +24,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -221,9 +224,12 @@ +@@ -210,9 +213,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h index a362b5c8de64..2d846ba1732e 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h +++ b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h @@ -1,6 +1,6 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-01-30 02:18:10.000000000 +0100 -+++ services/service_manager/zygote/host/zygote_host_impl_linux.h 2019-02-01 10:48:51.105096000 +0100 -@@ -44,8 +44,10 @@ +--- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/host/zygote_host_impl_linux.h +@@ -44,8 +44,10 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_ZYGOTE) ZygoteH base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h b/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h index 47e8b1e7ba94..bdf4e5ff2926 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h +++ b/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h @@ -1,6 +1,6 @@ ---- services/service_manager/zygote/zygote_host_linux.h.orig 2018-08-04 19:14:58.401790000 +0200 -+++ services/service_manager/zygote/zygote_host_linux.h 2018-08-04 19:15:49.368693000 +0200 -@@ -30,11 +30,13 @@ +--- services/service_manager/zygote/zygote_host_linux.h.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/zygote_host_linux.h +@@ -30,11 +30,13 @@ class ZygoteHost { // after the first render has been forked. virtual int GetRendererSandboxStatus() const = 0; diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc index 550c5e367bb5..61cc883b5421 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc +++ b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/zygote_linux.cc.orig 2018-08-04 19:15:10.269247000 +0200 -+++ services/service_manager/zygote/zygote_linux.cc 2018-08-04 19:16:18.712635000 +0200 +--- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -8,7 +8,7 @@ #include "services/service_manager/zygote/zygote_linux.h" -@@ -664,3 +665,4 @@ +@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick } } // namespace service_manager diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc index c7cdbc5960f8..51f86ce5be01 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc +++ b/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/zygote_main_linux.cc.orig 2018-08-04 19:15:20.665086000 +0200 -+++ services/service_manager/zygote/zygote_main_linux.cc 2018-08-04 19:17:50.032823000 +0200 +--- services/service_manager/zygote/zygote_main_linux.cc.orig 2019-03-11 22:01:02 UTC ++++ services/service_manager/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> #include <stdint.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -@@ -101,6 +103,7 @@ +@@ -101,6 +103,7 @@ static bool CreateInitProcessReaper( // created through the setuid sandbox. static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, base::OnceClosure post_fork_parent_callback) { @@ -18,7 +18,7 @@ DCHECK(setuid_sandbox); DCHECK(setuid_sandbox->IsSuidSandboxChild()); -@@ -133,6 +136,9 @@ +@@ -133,6 +136,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers()); return true; @@ -28,7 +28,7 @@ } static void DropAllCapabilities(int proc_fd) { -@@ -178,6 +184,7 @@ +@@ -178,6 +184,7 @@ static void EnterLayerOneSandbox(service_manager::Sand bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { @@ -36,7 +36,7 @@ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = service_manager::SandboxLinux::GetInstance(); -@@ -240,6 +247,9 @@ +@@ -240,6 +247,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); diff --git a/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc b/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc deleted file mode 100644 index bd19c3056464..000000000000 --- a/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/public/cpp/trace_event_agent.cc.orig 2019-01-09 13:13:48.962628000 +0100 -+++ services/tracing/public/cpp/trace_event_agent.cc 2019-01-09 13:14:04.280587000 +0100 -@@ -23,7 +23,7 @@ - #include "services/tracing/public/mojom/constants.mojom.h" - - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) - #define PERFETTO_AVAILABLE - #include "services/tracing/public/cpp/perfetto/producer_client.h" - #include "services/tracing/public/cpp/perfetto/trace_event_data_source.h" diff --git a/www/chromium/files/patch-services_tracing_tracing_service.h b/www/chromium/files/patch-services_tracing_tracing_service.h deleted file mode 100644 index 903ba35bc874..000000000000 --- a/www/chromium/files/patch-services_tracing_tracing_service.h +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/tracing_service.h.orig 2019-01-09 13:15:21.114712000 +0100 -+++ services/tracing/tracing_service.h 2019-01-09 13:15:33.753522000 +0100 -@@ -18,7 +18,7 @@ - #include "services/tracing/coordinator.h" - - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) - #define PERFETTO_SERVICE_AVAILABLE - #endif - diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index be071bc3afd3..e41e957b73ea 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,6 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2018-03-20 23:05:30.000000000 +0100 -+++ skia/ext/SkMemory_new_handler.cpp 2018-03-24 18:36:03.256042000 +0100 -@@ -69,7 +69,7 @@ +--- skia/ext/SkMemory_new_handler.cpp.orig 2019-03-11 22:01:02 UTC ++++ skia/ext/SkMemory_new_handler.cpp +@@ -77,7 +77,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; @@ -9,7 +9,7 @@ result = malloc(size); #else // It's the responsibility of the caller to check the return value. -@@ -89,7 +89,7 @@ +@@ -97,7 +97,7 @@ static void* calloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedCalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 871af4a04a32..a2aa44b3e13f 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2018-12-03 21:20:20.000000000 +0100 -+++ third_party/angle/BUILD.gn 2018-12-15 15:01:55.525312000 +0100 -@@ -283,6 +283,7 @@ +--- third_party/angle/BUILD.gn.orig 2019-03-11 22:07:58 UTC ++++ third_party/angle/BUILD.gn +@@ -276,6 +276,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,7 +8,7 @@ ] } } -@@ -822,10 +823,6 @@ +@@ -842,10 +843,6 @@ foreach(is_shared_library, libs = [] if (is_linux) { sources += util_linux_sources diff --git a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h index 98067e160205..3d393c5b6483 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h @@ -1,5 +1,5 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2018-08-08 12:13:09.000000000 -0700 -+++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h 2018-08-20 09:43:56.141492000 -0700 +--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h @@ -14,8 +14,13 @@ namespace angle { diff --git a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp index c2da942ec165..8c7b858de64b 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp @@ -1,5 +1,5 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2018-08-20 10:00:10.885543000 -0700 -+++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp 2018-08-20 09:50:32.387980000 -0700 +--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp @@ -12,6 +12,11 @@ #include <pci/pci.h> #include <unistd.h> @@ -12,7 +12,7 @@ #include "common/angleutils.h" #include "common/debug.h" -@@ -82,6 +87,75 @@ +@@ -82,6 +87,75 @@ struct LibPCI : private angle::NonCopyable }; } // anonymous namespace diff --git a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp index 4a1ba62a0723..d69b549c46b1 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2018-08-08 12:13:09.000000000 -0700 -+++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp 2018-08-20 09:50:36.331947000 -0700 -@@ -71,10 +71,18 @@ +--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp +@@ -71,10 +71,18 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo bool GetSystemInfo(SystemInfo *info) { diff --git a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp index f4fb9af45b5f..6b9bc94938ad 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp @@ -1,5 +1,5 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2018-08-08 12:13:09.000000000 -0700 -+++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp 2018-08-20 09:34:48.052352000 -0700 +--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp @@ -8,6 +8,8 @@ #include "gpu_info_util/SystemInfo_internal.h" @@ -10,7 +10,7 @@ #include "common/debug.h" @@ -18,8 +20,43 @@ - #error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11 + # error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11 #endif +#define GLX_RENDERER_VENDOR_ID_MESA 0x8183 diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 6457e5388922..0021521dfbc0 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-01-30 02:20:31.000000000 +0100 -+++ third_party/angle/src/libANGLE/Display.cpp 2019-02-01 11:09:24.980814000 +0100 -@@ -63,7 +63,7 @@ +--- third_party/angle/src/libANGLE/Display.cpp.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/libANGLE/Display.cpp +@@ -64,7 +64,7 @@ #if defined(ANGLE_ENABLE_VULKAN) # if defined(ANGLE_PLATFORM_WINDOWS) # include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h" # elif defined(ANGLE_PLATFORM_ANDROID) # include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h" -@@ -215,7 +215,7 @@ +@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib #if defined(ANGLE_ENABLE_VULKAN) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayVkWin32(state); diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h new file mode 100644 index 000000000000..99bcfb4201b5 --- /dev/null +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -0,0 +1,11 @@ +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-03-11 22:07:59 UTC ++++ third_party/angle/src/libANGLE/renderer/driver_utils.h +@@ -107,7 +107,7 @@ inline bool IsWindows() + + inline bool IsLinux() + { +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_POSIX) + return true; + #else + return false; diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp deleted file mode 100644 index e412e21a83ec..000000000000 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp.orig 2017-08-02 15:06:28.319994000 +0200 -+++ third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp 2017-08-02 15:06:50.485321000 +0200 -@@ -952,7 +952,7 @@ - workarounds->doesSRGBClearsOnLinearFramebufferAttachments = - functions->standard == STANDARD_GL_DESKTOP && (IsIntel(vendor) || IsAMD(vendor)); - --#if defined(ANGLE_PLATFORM_LINUX) -+#if defined(ANGLE_PLATFORM_POSIX) - workarounds->emulateMaxVertexAttribStride = - functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor); - workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsAMD(vendor); diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c index f332ec2c1e33..e61a4d98148f 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,6 +1,6 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2018-12-15 15:11:13.525509000 +0100 -+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c 2018-12-15 15:12:11.085519000 +0100 -@@ -215,7 +215,7 @@ +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-03-11 22:08:05 UTC ++++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c +@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h index 78317425acc3..674705f68fd5 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,5 +1,5 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2018-12-15 15:17:52.636531000 +0100 -+++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h 2018-12-15 15:18:37.634423000 +0100 +--- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2019-03-11 22:08:05 UTC ++++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h @@ -31,7 +31,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h index 1ca64159bce4..824788f6aa33 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h @@ -1,5 +1,5 @@ ---- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2018-12-12 23:03:04.000000000 +0100 -+++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h 2018-12-16 00:53:28.074127000 +0100 +--- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2019-03-11 22:08:06 UTC ++++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h @@ -31,7 +31,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" diff --git a/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index 19559ac67014..f57e563f421d 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2018-07-19 16:36:31.131399000 +0200 -+++ third_party/blink/renderer/core/editing/editing_behavior.cc 2018-07-19 16:36:56.793922000 +0200 -@@ -270,7 +270,7 @@ +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/editing/editing_behavior.cc +@@ -270,7 +270,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 5276fe30fd9a..52d3aa574519 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2018-07-19 19:17:49.426163000 +0200 -+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc 2018-07-19 19:19:17.512247000 +0200 -@@ -31,7 +31,7 @@ - 0.001; // a small slack period between deadline and current time for safety +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = + TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ -#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) diff --git a/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 00353a1198d5..d05250810ced 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2018-07-19 19:21:46.343805000 +0200 -+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc 2018-07-19 19:22:00.957461000 +0200 -@@ -126,7 +126,7 @@ +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc +@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index e20f7f095f26..8a28ae58a8c3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-01-09 13:18:19.496883000 +0100 -+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc 2019-01-09 13:18:36.729783000 +0100 -@@ -171,7 +171,7 @@ +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc +@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t std::vector<std::string> InspectorMemoryAgent::Symbolize( const std::vector<void*>& addresses) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc new file mode 100644 index 000000000000..c960ddc9f0d3 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC ++++ third_party/blink/renderer/core/layout/layout_view.cc +@@ -58,7 +58,7 @@ + #include "third_party/blink/renderer/platform/runtime_enabled_features.h" + #include "third_party/blink/renderer/platform/transforms/transform_state.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "third_party/blink/renderer/platform/fonts/font_cache.h" + #endif + +@@ -321,7 +321,7 @@ void LayoutView::UpdateLayout() { + DCHECK(!layout_state_); + LayoutState root_layout_state(*this); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // The font code in FontPlatformData does not have a direct connection to the + // document, the frame or anything from which we could retrieve the device + // scale factor. After using zoom for DSF, the GraphicsContext does only ever diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 34ea6b07c91d..74442a38fa4f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-02-06 23:36:21.401100000 +0100 -+++ third_party/blink/renderer/core/paint/paint_layer.cc 2019-02-06 23:38:08.649536000 +0100 -@@ -104,7 +104,7 @@ +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/paint/paint_layer.cc +@@ -104,7 +104,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 5f6040204a7f..3425511a45e5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-01-09 13:20:32.931933000 +0100 -+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc 2019-01-09 13:21:17.842418000 +0100 -@@ -332,7 +332,7 @@ +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-03-11 22:01:03 UTC ++++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc +@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn new file mode 100644 index 000000000000..3d62c085808a --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -0,0 +1,10 @@ +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/BUILD.gn +@@ -129,6 +129,7 @@ executable("character_data_generator") { + "//build/win:default_exe_manifest", + "//third_party/icu", + ] ++ libs = [ "cxxrt" ] + } + + # This isn't strictly necessary since we can just add the deps to "platform", diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index e1efa4c7fc22..b237065ecdae 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-01-30 02:18:16.000000000 +0100 -+++ third_party/blink/renderer/platform/fonts/font_cache.cc 2019-02-01 14:43:30.711803000 +0100 -@@ -65,7 +65,7 @@ +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/font_cache.cc +@@ -66,7 +66,7 @@ namespace blink { SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -88,7 +88,7 @@ +@@ -89,7 +89,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 7fec2c44c44e..7d9dce581b79 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-01-30 02:18:16.000000000 +0100 -+++ third_party/blink/renderer/platform/fonts/font_cache.h 2019-02-02 11:22:47.863990000 +0100 -@@ -157,7 +157,7 @@ +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/font_cache.h +@@ -157,7 +157,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -9,7 +9,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -218,7 +218,7 @@ +@@ -218,7 +218,7 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -18,7 +18,7 @@ struct PlatformFallbackFont { String name; CString filename; -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ class PLATFORM_EXPORT FontCache { static void GetFontForCharacter(UChar32, const char* preferred_locale, PlatformFallbackFont*); @@ -27,7 +27,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -291,12 +291,12 @@ +@@ -294,12 +294,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); @@ -42,7 +42,7 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&, UChar32); -@@ -327,7 +327,7 @@ +@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache { bool is_test_font_mgr_ = false; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 14414b5dd76c..bf9aea7b1d12 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-01-09 13:23:01.366176000 +0100 -+++ third_party/blink/renderer/platform/fonts/font_description.cc 2019-01-09 13:23:27.474567000 +0100 +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -38,7 +38,7 @@ #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -222,7 +222,7 @@ +@@ -223,7 +223,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index 2d14db04f675..f2ef075940b9 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2018-07-19 19:27:56.537970000 +0200 -+++ third_party/blink/renderer/platform/fonts/font_metrics.cc 2018-07-19 19:28:32.800265000 +0200 -@@ -38,7 +38,7 @@ +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/font_metrics.cc +@@ -39,7 +39,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -60,7 +60,7 @@ +@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; @@ -18,7 +18,7 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -106,7 +106,7 @@ +@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 864e1b479748..1ea3aeb653ef 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-02-04 23:35:56.748592000 +0100 -+++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc 2019-02-04 23:36:16.158548000 +0100 -@@ -8,7 +8,7 @@ - +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc +@@ -10,7 +10,7 @@ #if defined(OS_ANDROID) + #include "third_party/blink/public/platform/modules/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" - #endif - -@@ -21,7 +21,7 @@ + #elif defined(OS_WIN) + #include "third_party/blink/public/mojom/dwrite_font_proxy/dwrite_font_proxy.mojom-blink.h" +@@ -26,7 +26,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { #if defined(OS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return std::make_unique<FontUniqueNameLookupLinux>(); - #else - NOTREACHED(); + #elif defined(OS_WIN) + return std::make_unique<FontUniqueNameLookupWin>(); diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index fc9757eeb81f..60496185f038 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,15 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-01-30 02:18:16.000000000 +0100 -+++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc 2019-02-02 11:10:08.595129000 +0100 -@@ -57,7 +57,7 @@ - - namespace blink { - --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - namespace { - - static sk_sp<SkTypeface> CreateTypefaceFromUniqueName( -@@ -80,7 +80,7 @@ +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc +@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } @@ -18,7 +9,16 @@ // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -269,7 +269,7 @@ +@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( + typeface->getFamilyName(&skia_family_name); + return ToAtomicString(skia_family_name); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + + void FontCache::PlatformInit() {} + +@@ -249,7 +249,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,7 +27,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -296,7 +296,7 @@ +@@ -276,7 +276,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon CString name; sk_sp<SkTypeface> typeface; diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc index 9bb60095006b..8b4b98e988c9 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2018-07-19 19:31:59.775056000 +0200 -+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc 2018-07-19 19:32:43.812459000 +0200 +--- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc @@ -15,6 +15,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn new file mode 100644 index 000000000000..68d27a0630f4 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn @@ -0,0 +1,16 @@ +--- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/BUILD.gn +@@ -267,8 +267,12 @@ jumbo_component("wtf") { + if (is_android) { + libs = [ "log" ] + } +- if (is_linux) { ++ if (is_linux && !is_bsd) { + libs = [ "dl" ] ++ } ++ ++ if (is_bsd) { ++ libs = [ "execinfo" ] + } + + if (is_mac) { diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc index 9cbb81b475c2..71b0442cb527 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2018-07-19 20:11:56.254657000 +0200 -+++ third_party/blink/renderer/platform/wtf/assertions.cc 2018-07-19 20:13:24.142405000 +0200 +--- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/assertions.cc @@ -48,7 +48,7 @@ #include <windows.h> #endif diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h index ed293c65d607..0cee47e68086 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2018-07-19 20:16:53.004477000 +0200 -+++ third_party/blink/renderer/platform/wtf/container_annotations.h 2018-07-19 20:17:16.730907000 +0200 +--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/container_annotations.h @@ -10,7 +10,7 @@ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index fa38bae27a8e..a4f0a8b59577 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2018-07-19 20:18:16.483555000 +0200 -+++ third_party/blink/renderer/platform/wtf/stack_util.cc 2018-07-19 20:18:51.633152000 +0200 -@@ -16,6 +16,11 @@ +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/stack_util.cc +@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc index 1fdde0db90b6..7d8de2b7ae80 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/wtf/threading.cc.orig 2018-12-15 18:39:29.942481000 +0100 -+++ third_party/blink/renderer/platform/wtf/threading.cc 2018-12-15 18:41:49.286222000 +0100 +--- third_party/blink/renderer/platform/wtf/threading.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/threading.cc @@ -17,12 +17,16 @@ #error Blink does not support threading on your platform. #endif @@ -18,7 +18,7 @@ namespace WTF { // Current thread identity -@@ -38,6 +42,8 @@ +@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() { return syscall(__NR_gettid); #elif defined(OS_ANDROID) return gettid(); diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc index 61edd6a93f69..0c52ba787f29 100644 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc @@ -1,5 +1,5 @@ ---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2018-12-03 21:17:54.000000000 +0100 -+++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc 2018-12-15 18:34:37.670619000 +0100 +--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-03-11 22:01:04 UTC ++++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc @@ -52,12 +52,17 @@ #include <objc/objc-auto.h> #endif diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn index 555eb5a0998c..2e56f692737c 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.gn.orig 2017-09-05 21:05:42.000000000 +0200 -+++ third_party/boringssl/BUILD.gn 2017-09-06 22:45:41.435863000 +0200 -@@ -85,7 +85,7 @@ +--- third_party/boringssl/BUILD.gn.orig 2019-03-11 22:01:15 UTC ++++ third_party/boringssl/BUILD.gn +@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else if (current_cpu == "x64") { if (is_mac) { sources += crypto_sources_mac_x86_64 @@ -9,7 +9,7 @@ sources += crypto_sources_linux_x86_64 } else { public_configs = [ ":no_asm_config" ] -@@ -93,13 +93,13 @@ +@@ -79,13 +79,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else if (current_cpu == "x86") { if (is_mac) { sources += crypto_sources_mac_x86 @@ -25,7 +25,7 @@ sources += crypto_sources_linux_arm } else if (is_ios) { sources += crypto_sources_ios_arm -@@ -107,7 +107,7 @@ +@@ -93,7 +93,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { public_configs = [ ":no_asm_config" ] } } else if (current_cpu == "arm64") { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c index eaf4560995c0..0c7a7b945952 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c @@ -1,5 +1,5 @@ ---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-08-08 21:13:09.000000000 +0200 -+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2018-12-02 10:28:41.672362000 +0100 +--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2019-03-11 22:07:58 UTC ++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c @@ -14,49 +14,7 @@ #include <openssl/cpu.h> diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c index c1bfe5de1af6..6f2127918315 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/ex_data.c.orig 2017-06-05 19:04:14 UTC +--- third_party/boringssl/src/crypto/ex_data.c.orig 2019-03-11 22:07:58 UTC +++ third_party/boringssl/src/crypto/ex_data.c -@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, +@@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, } } diff --git a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h index f98c620acc5f..b0aaa7abccb6 100644 --- a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h +++ b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h @@ -1,5 +1,5 @@ ---- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2017-12-23 22:07:26.606040000 +0100 -+++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h 2017-12-23 22:08:01.480046000 +0100 +--- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2019-03-11 22:07:58 UTC ++++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h @@ -33,7 +33,7 @@ #include <assert.h> #include <string.h> diff --git a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h index 27d8a7166b16..0a76ed7ccadc 100644 --- a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h +++ b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h @@ -1,4 +1,4 @@ ---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2017-04-19 19:06:51 UTC +--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2019-03-11 22:01:15 UTC +++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h @@ -334,6 +334,8 @@ class Status { */ diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni b/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni index 2323e0051abc..0ba7612e9112 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2018-07-19 19:41:47.198522000 +0200 -+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni 2018-07-19 19:41:59.956618000 +0200 -@@ -38,7 +38,7 @@ +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni +@@ -38,7 +38,7 @@ crashpad_is_standalone = crashpad_dependencies == "sta if (crashpad_is_in_chromium) { crashpad_is_mac = is_mac crashpad_is_win = is_win diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index 6e19ca4a4da6..acb48dc27344 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2019-01-12 23:20:12.535371000 +0100 -+++ third_party/crashpad/crashpad/client/BUILD.gn 2019-01-12 23:21:47.786624000 +0100 -@@ -71,6 +71,12 @@ +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/client/BUILD.gn +@@ -71,6 +71,12 @@ static_library("client") { sources += [ "crashpad_client_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc index e46b58a5c9e2..9cafc79f1aff 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc @@ -1,5 +1,5 @@ ---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-01-12 23:16:55.468608000 +0100 -+++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc 2019-01-12 23:18:00.395212000 +0100 +--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-03-17 01:47:14 UTC ++++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc @@ -0,0 +1,38 @@ +// Copyright 2017 The Crashpad Authors. All rights reserved. +// diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h index 389cd4adab89..ead0b25e172c 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h @@ -1,5 +1,5 @@ ---- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2018-12-12 22:56:23.000000000 +0100 -+++ third_party/crashpad/crashpad/util/misc/address_types.h 2018-12-16 00:59:49.906370000 +0100 +--- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/misc/address_types.h @@ -25,7 +25,7 @@ #include <mach/mach_types.h> #elif defined(OS_WIN) @@ -9,7 +9,7 @@ #include "util/linux/address_types.h" #elif defined(OS_FUCHSIA) #include <zircon/types.h> -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t; using VMAddress = WinVMAddress; using VMSize = WinVMSize; diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h index d512c8562424..be1a55b8d574 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h @@ -1,5 +1,5 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2018-08-01 00:09:40.000000000 +0200 -+++ third_party/crashpad/crashpad/util/misc/capture_context.h 2018-08-04 21:08:07.783574000 +0200 +--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/misc/capture_context.h @@ -21,7 +21,7 @@ #include <mach/mach.h> #elif defined(OS_WIN) @@ -9,7 +9,7 @@ #include <ucontext.h> #elif defined(OS_FUCHSIA) #include <signal.h> -@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@ using NativeCPUContext = x86_thread_state; #endif #elif defined(OS_WIN) using NativeCPUContext = CONTEXT; diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc index 6013f8f3de67..f1804888aee1 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2018-07-19 19:45:25.874776000 +0200 -+++ third_party/crashpad/crashpad/util/misc/metrics.cc 2018-07-19 19:45:38.273062000 +0200 -@@ -24,7 +24,7 @@ +--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/misc/metrics.cc +@@ -25,7 +25,7 @@ #define METRICS_OS_NAME "Win" #elif defined(OS_ANDROID) #define METRICS_OS_NAME "Android" diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc index 64f4f20ebcd0..d7a1ca9a0fd0 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2018-07-19 19:46:52.081549000 +0200 -+++ third_party/crashpad/crashpad/util/misc/uuid.cc 2018-07-19 19:47:05.207892000 +0200 -@@ -95,7 +95,7 @@ +--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/misc/uuid.cc +@@ -95,7 +95,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc new file mode 100644 index 000000000000..e7dc2e3561db --- /dev/null +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc @@ -0,0 +1,29 @@ +--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/posix/close_multiple.cc +@@ -31,7 +31,7 @@ + #include "util/file/directory_reader.h" + #include "util/misc/implicit_cast.h" + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + #include <sys/sysctl.h> + #endif + +@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { + // This is an advantage over looping over all possible file descriptors, because + // no attempt needs to be made to close file descriptors that are not open. + bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + static constexpr char kFDDir[] = "/dev/fd"; + #elif defined(OS_LINUX) || defined(OS_ANDROID) + static constexpr char kFDDir[] = "/proc/self/fd"; +@@ -146,7 +146,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) + // while the system is running, but it’s still a better upper bound than the + // current RLIMIT_NOFILE value. + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc, + // referenced by dosetrlimit(). + int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC}; diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc index 94eb906d3339..42ba7366e3cb 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2018-07-19 19:50:51.829905000 +0200 -+++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc 2018-07-19 19:51:04.660155000 +0200 -@@ -23,7 +23,7 @@ +--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc +@@ -23,7 +23,7 @@ void DropPrivileges() { gid_t gid = getgid(); uid_t uid = getuid(); diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 9d0d6e4a1d2a..9c0f7a749462 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2018-07-19 19:52:18.124704000 +0200 -+++ third_party/crashpad/crashpad/util/posix/signals.cc 2018-07-19 19:53:53.609005000 +0200 -@@ -44,7 +44,7 @@ +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/posix/signals.cc +@@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) SIGEMT, #endif // defined(SIGEMT) @@ -8,17 +8,24 @@ +#if defined(OS_LINUX) || defined(OS_BSD) SIGXCPU, SIGXFSZ, - #endif // defined(OS_LINUX) -@@ -84,7 +84,7 @@ +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + }; + + // These are the non-core-generating but terminating signals. +@@ -85,9 +85,9 @@ constexpr int kTerminateSignals[] = { SIGXCPU, SIGXFSZ, #endif // defined(OS_MACOSX) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) SIGIO, - #endif // defined(OS_LINUX) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) }; -@@ -214,8 +214,12 @@ + + bool InstallHandlers(const std::vector<int>& signals, +@@ -216,8 +216,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index 82fd4e480440..63645eb0d883 100644 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2018-12-03 21:17:55.000000000 +0100 -+++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc 2018-12-15 18:47:11.409455000 +0100 -@@ -64,7 +64,7 @@ +--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2019-03-11 22:01:15 UTC ++++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc +@@ -64,7 +64,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", @@ -9,12 +9,12 @@ #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -135,7 +135,7 @@ +@@ -135,7 +135,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // NSIG is 64 to account for real-time signals. - static_assert(arraysize(kSignalNames) == 32, "kSignalNames length"); + static_assert(base::size(kSignalNames) == 32, "kSignalNames length"); #else diff --git a/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h index 576f7825be55..907f1b0f986c 100644 --- a/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h +++ b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h @@ -1,4 +1,4 @@ ---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h 2018-04-13 18:15:04 UTC +--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2019-03-11 22:07:59 UTC +++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h @@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type) namespace crc32c { diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn deleted file mode 100644 index ab83a96fdb39..000000000000 --- a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2017-04-19 19:07:44 UTC -+++ third_party/ffmpeg/BUILD.gn -@@ -6,8 +6,13 @@ import("ffmpeg_options.gni") - import("ffmpeg_generated.gni") - - # Path to platform configuration files. --platform_config_root = -- "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch" -+if (!is_bsd) { -+ platform_config_root = -+ "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch" -+} else { -+ platform_config_root = -+ "chromium/config/$ffmpeg_branding/linux/$ffmpeg_arch" -+} - - has_yasm_deps = - ffmpeg_yasm_sources != [] && diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index 76c8c9f92ac0..23d1e5344a09 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2017-04-19 19:07:44 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2019-03-11 22:08:00 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -32,9 +32,6 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h index ab9e646bd7c7..305296610dba 100644 --- a/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.h +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h @@ -1,7 +1,7 @@ ---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2018-08-23 02:51:47.688298000 +0200 -+++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h 2018-08-23 02:53:09.975152000 +0200 -@@ -841,7 +841,7 @@ - (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX) +--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2019-03-11 22:08:00 UTC ++++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h +@@ -623,7 +623,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE + (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2) // Determines whether test results can be streamed to a socket. -#if GTEST_OS_LINUX diff --git a/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc index 59f0ab6f460d..b3f414506f9d 100644 --- a/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2018-08-23 02:39:24.119551000 +0200 -+++ third_party/googletest/src/googletest/src/gtest-port.cc 2018-08-23 02:46:41.990204000 +0200 -@@ -52,6 +52,11 @@ +--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2019-03-11 22:08:00 UTC ++++ third_party/googletest/src/googletest/src/gtest-port.cc +@@ -55,6 +55,11 @@ # include <mach/vm_map.h> #endif // GTEST_OS_MAC @@ -12,7 +12,7 @@ #if GTEST_OS_QNX # include <devctl.h> # include <fcntl.h> -@@ -126,6 +131,28 @@ +@@ -129,6 +134,28 @@ size_t GetThreadCount() { } else { return 0; } diff --git a/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc index 4f6266182c7b..baa7c326c7b9 100644 --- a/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest.cc.orig 2018-08-23 02:47:05.784079000 +0200 -+++ third_party/googletest/src/googletest/src/gtest.cc 2018-08-23 02:47:43.415365000 +0200 -@@ -128,6 +128,7 @@ +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2019-03-11 22:08:00 UTC ++++ third_party/googletest/src/googletest/src/gtest.cc +@@ -114,6 +114,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc index 4804e2ea664c..305637d04a46 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc @@ -1,7 +1,7 @@ ---- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2018-12-15 18:52:24.209622000 +0100 -+++ third_party/googletest/src/googletest/test/googletest-port-test.cc 2018-12-15 18:53:04.599624000 +0100 -@@ -293,7 +293,7 @@ - EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); +--- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2019-03-11 22:08:00 UTC ++++ third_party/googletest/src/googletest/test/googletest-port-test.cc +@@ -286,7 +286,7 @@ TEST(FormatCompilerIndependentFileLocationTest, Format + EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1)); } -#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index 843dc3f77718..53a211aa8162 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,8 +1,8 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2017-04-19 19:06:52 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2019-03-11 22:01:15 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -25,7 +25,11 @@ - #include "base/trace_event/trace_event.h" - #include "third_party/leveldatabase/chromium_logger.h" +@@ -39,7 +39,11 @@ + #include "third_party/leveldatabase/leveldb_chrome.h" + #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" +#if defined(OS_BSD) +#include <re2/re2.h> @@ -11,4 +11,4 @@ +#endif using base::FilePath; - using leveldb::FileLock; + using base::trace_event::MemoryAllocatorDump; diff --git a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c index 2810288f5d1b..3d2353cdedae 100644 --- a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c +++ b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c @@ -1,5 +1,5 @@ ---- third_party/libXNVCtrl/NVCtrl.c.orig 2017-12-30 16:57:06.449527000 +0100 -+++ third_party/libXNVCtrl/NVCtrl.c 2017-12-30 16:57:57.055972000 +0100 +--- third_party/libXNVCtrl/NVCtrl.c.orig 2019-03-11 22:01:15 UTC ++++ third_party/libXNVCtrl/NVCtrl.c @@ -27,10 +27,6 @@ * libXNVCtrl library properly protects the Display connection. */ diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index 65aa11388ae4..0815f041a8db 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-06-05 19:04:19 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2019-03-11 22:08:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h @@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag #include "phonenumbers/base/logging.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index ff7472a6bf75..243f211e49fb 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-06-05 19:04:19 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-03-11 22:08:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h @@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock; // Dummy lock implementation on non-POSIX platforms. If you are running on a diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 3789aea60211..86849dfe63cd 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2017-04-19 19:07:47 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2019-03-11 22:08:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h @@ -23,6 +23,7 @@ // user of the library know that it can't be used in a thread-safe manner when diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h index 08828646ff9f..25761a9d90ec 100644 --- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h +++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h @@ -1,6 +1,6 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2017-04-19 19:07:47 UTC +--- third_party/libyuv/include/libyuv/row.h.orig 2019-03-11 22:08:01 UTC +++ third_party/libyuv/include/libyuv/row.h -@@ -161,10 +161,14 @@ extern "C" { +@@ -157,10 +157,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 #define HAS_ARGBSUBTRACTROW_SSE2 #define HAS_ARGBUNATTENUATEROW_SSE2 @@ -15,7 +15,7 @@ #define HAS_RGBCOLORTABLEROW_X86 #define HAS_SOBELROW_SSE2 #define HAS_SOBELTOPLANEROW_SSE2 -@@ -211,7 +215,9 @@ extern "C" { +@@ -206,7 +210,9 @@ extern "C" { #define HAS_I422TORGB565ROW_AVX2 #define HAS_I422TORGBAROW_AVX2 #define HAS_I444TOARGBROW_AVX2 @@ -25,7 +25,7 @@ #define HAS_J422TOARGBROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 -@@ -234,7 +240,9 @@ extern "C" { +@@ -231,7 +237,9 @@ extern "C" { #define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2 diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py index b411057af615..d31ac51040e3 100644 --- a/www/chromium/files/patch-third__party_node_node.py +++ b/www/chromium/files/patch-third__party_node_node.py @@ -1,4 +1,4 @@ ---- third_party/node/node.py.orig 2017-04-19 19:06:52 UTC +--- third_party/node/node.py.orig 2019-03-11 22:01:16 UTC +++ third_party/node/node.py @@ -12,6 +12,7 @@ import sys def GetBinaryPath(): diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 95914efb0cb0..291cd06be445 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2017-12-15 02:05:39.000000000 +0100 -+++ third_party/pdfium/core/fxcrt/fx_system.h 2017-12-24 18:45:42.922884000 +0100 -@@ -40,7 +40,7 @@ +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-03-11 22:08:02 UTC ++++ third_party/pdfium/core/fxcrt/fx_system.h +@@ -41,7 +41,7 @@ #elif defined(_WIN64) #define _FX_OS_ _FX_OS_WIN64_ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp index c4087e2e631d..0557f9bf57a8 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2017-09-10 01:29:26.531645000 +0200 -+++ third_party/pdfium/core/fxge/fx_ge_linux.cpp 2017-09-10 01:35:18.727698000 +0200 -@@ -149,9 +149,8 @@ +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-03-11 22:08:02 UTC ++++ third_party/pdfium/core/fxge/fx_ge_linux.cpp +@@ -146,9 +146,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa const char** pUserPaths) { auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(pUserPaths)) { diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp index 5b4f89a585a4..f689d845e408 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp @@ -1,8 +1,8 @@ ---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2018-03-04 04:22:35.417744000 +0100 -+++ third_party/pdfium/fxjs/cjs_publicmethods.cpp 2018-03-04 04:28:41.888908000 +0100 -@@ -70,6 +70,103 @@ - L"July", L"August", L"September", - L"October", L"November", L"December"}; +--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-03-11 22:08:02 UTC ++++ third_party/pdfium/fxjs/cjs_publicmethods.cpp +@@ -85,6 +85,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", + constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", + L"h:MM:ss tt"}; +#if defined(__FreeBSD__) +/* diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index a43515e700c3..ba05a132a557 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-02-01 12:43:47.112647000 +0100 -+++ third_party/pdfium/fxjs/fx_date_helpers.cpp 2019-02-01 12:49:38.012493000 +0100 -@@ -34,6 +34,11 @@ +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC ++++ third_party/pdfium/fxjs/fx_date_helpers.cpp +@@ -34,6 +34,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -42,6 +47,7 @@ +@@ -42,6 +47,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ return (double)(-(timezone * 1000)); diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp index 7a9405b493d5..d7643b27e4c2 100644 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2018-12-15 16:04:31.993078000 +0100 -+++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp 2018-12-15 16:06:14.341565000 +0100 -@@ -14,8 +14,9 @@ +--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp +@@ -14,8 +14,9 @@ constexpr char kFolderSeparator = '/'; constexpr const char* g_FontFolders[] = { #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ diff --git a/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 07f15193987f..6473fc184af1 100644 --- a/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,5 +1,5 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2018-08-04 21:12:09.930418000 +0200 -+++ third_party/perfetto/include/perfetto/base/build_config.h 2018-08-04 21:14:11.343838000 +0200 +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/include/perfetto/base/build_config.h @@ -28,6 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 @@ -7,11 +7,15 @@ +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #elif defined(__APPLE__) -@@ -36,22 +37,25 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 +@@ -35,13 +36,15 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 @@ -20,18 +24,28 @@ +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #elif defined(_WIN32) + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 +@@ -49,6 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #elif defined(__EMSCRIPTEN__) + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 +@@ -56,6 +60,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 - #else + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 +@@ -63,6 +68,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h index 0ec774154d21..bfbfb1266556 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h @@ -1,5 +1,5 @@ ---- third_party/perfetto/include/perfetto/base/event.h.orig 2018-12-16 01:39:09.000000000 +0100 -+++ third_party/perfetto/include/perfetto/base/event.h 2018-12-16 01:39:40.143826000 +0100 +--- third_party/perfetto/include/perfetto/base/event.h.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/include/perfetto/base/event.h @@ -20,8 +20,9 @@ #include "perfetto/base/build_config.h" #include "perfetto/base/scoped_file.h" diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 1961d64f4f60..670eef6f090e 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2018-12-16 01:32:46.000000000 +0100 -+++ third_party/perfetto/include/perfetto/base/time.h 2018-12-16 01:38:40.852314000 +0100 -@@ -123,6 +123,9 @@ +--- third_party/perfetto/include/perfetto/base/time.h.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/include/perfetto/base/time.h +@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -130,6 +133,7 @@ +@@ -130,6 +133,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); diff --git a/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h index 2e3d4b9571f8..e088531d87c3 100644 --- a/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2018-08-04 21:15:43.145900000 +0200 -+++ third_party/perfetto/include/perfetto/base/watchdog_posix.h 2018-08-04 21:16:02.944049000 +0200 -@@ -45,7 +45,7 @@ +--- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/include/perfetto/base/watchdog_posix.h +@@ -46,7 +46,7 @@ class Watchdog { Timer(const Timer&) = delete; Timer& operator=(const Timer&) = delete; diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index a65c8f611bee..a4c74f8695d0 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2018-12-15 19:07:57.840463000 +0100 -+++ third_party/perfetto/src/base/unix_socket.cc 2018-12-15 19:08:37.030799000 +0100 -@@ -387,7 +387,8 @@ +--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/src/base/unix_socket.cc +@@ -502,7 +502,8 @@ void UnixSocket::DoConnect(const std::string& socket_n void UnixSocket::ReadPeerCredentials() { #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ @@ -9,4 +9,4 @@ + PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) struct ucred user_cred; socklen_t len = sizeof(user_cred); - int res = getsockopt(*fd_, SOL_SOCKET, SO_PEERCRED, &user_cred, &len); + int fd = sock_raw_.fd(); diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 390606ea9427..4772343042dc 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,16 +1,16 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2018-12-12 23:03:02.000000000 +0100 -+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc 2019-01-12 23:04:39.364791000 +0100 -@@ -1180,7 +1180,8 @@ +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-03-11 22:08:02 UTC ++++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc +@@ -1494,7 +1494,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI void TracingServiceImpl::UpdateMemoryGuardrail() { - #if !PERFETTO_BUILDFLAG(PERFETTO_CHROMIUM_BUILD) && \ + #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) uint64_t total_buffer_bytes = 0; // Sum up all the shared memory buffers. -@@ -1231,7 +1232,8 @@ +@@ -1545,7 +1546,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot(); #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ diff --git a/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 71c368e2e4e0..26b4447c272b 100644 --- a/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.h +++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,6 +1,6 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-01-10 00:35:34.145545000 +0100 -+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h 2019-01-10 00:35:53.135144000 +0100 -@@ -117,7 +117,7 @@ +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-03-11 22:01:16 UTC ++++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h +@@ -117,7 +117,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp index 2fabf991e3a9..d03c8d261459 100644 --- a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp +++ b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/core/SkCpu.cpp.orig 2018-06-13 00:12:11.000000000 +0200 -+++ third_party/skia/src/core/SkCpu.cpp 2018-07-19 20:40:05.469146000 +0200 -@@ -78,6 +78,8 @@ +--- third_party/skia/src/core/SkCpu.cpp.orig 2019-03-11 22:08:22 UTC ++++ third_party/skia/src/core/SkCpu.cpp +@@ -74,6 +74,8 @@ #include <sys/auxv.h> static uint32_t read_cpu_features() { @@ -9,7 +9,7 @@ const uint32_t kHWCAP_CRC32 = (1<< 7), kHWCAP_ASIMDHP = (1<<10); -@@ -86,6 +88,7 @@ +@@ -82,6 +84,7 @@ if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; } if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; } return features; diff --git a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h index b450ecfb8e17..4621798922e7 100644 --- a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h +++ b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h @@ -1,6 +1,6 @@ ---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2017-04-19 19:07:51 UTC +--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2019-03-11 22:08:28 UTC +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #define HAVE_XLOCALE 0 #endif diff --git a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp index af8600ec5449..a40c444b1336 100644 --- a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp +++ b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp @@ -1,7 +1,7 @@ ---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2017-12-28 17:28:55.164840000 +0100 -+++ third_party/skia/src/images/SkJpegEncoder.cpp 2017-12-28 17:34:22.821694000 +0100 -@@ -86,9 +86,14 @@ - } +--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-03-11 22:08:28 UTC ++++ third_party/skia/src/images/SkJpegEncoder.cpp +@@ -75,9 +75,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr + return (transform_scanline_proc) nullptr; }; +#ifdef JCS_EXTENSIONS @@ -15,7 +15,7 @@ case kRGBA_8888_SkColorType: fProc = chooseProc8888(); jpegColorType = JCS_EXT_RGBA; -@@ -99,6 +104,7 @@ +@@ -88,6 +93,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_BGRA; numComponents = 4; break; @@ -23,15 +23,15 @@ case kRGB_565_SkColorType: fProc = transform_scanline_565; jpegColorType = JCS_RGB; -@@ -118,6 +124,7 @@ +@@ -107,6 +113,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_GRAYSCALE; numComponents = 1; break; +#ifdef JCS_EXTENSIONS case kRGBA_F16_SkColorType: - if (!srcInfo.colorSpace() || !srcInfo.colorSpace()->gammaIsLinear() || - SkTransferFunctionBehavior::kRespect != options.fBlendBehavior) { -@@ -134,6 +141,7 @@ + if (kUnpremul_SkAlphaType == srcInfo.alphaType() && + options.fAlphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack) { +@@ -117,6 +124,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_RGBA; numComponents = 4; break; diff --git a/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h b/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h index 81667ad045ac..ede24774be9e 100644 --- a/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h +++ b/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h @@ -1,6 +1,6 @@ ---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2018-12-03 21:20:28.000000000 +0100 -+++ third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-15 16:12:21.651812000 +0100 -@@ -658,7 +658,7 @@ +--- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2019-03-11 22:08:28 UTC ++++ third_party/skia/src/opts/SkRasterPipeline_opts.h +@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) { } SI F from_half(U16 h) { @@ -9,7 +9,7 @@ return vcvt_f32_f16(h); #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -678,7 +678,7 @@ +@@ -749,7 +749,7 @@ SI F from_half(U16 h) { } SI U16 to_half(F f) { diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp index f371976cc61f..0d1c0f100471 100644 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-01-30 02:20:41.000000000 +0100 -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-02-01 13:08:18.165178000 +0100 -@@ -121,8 +121,6 @@ +--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-03-11 22:08:28 UTC ++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp +@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) : fGetVarDesignCoordinates(nullptr) , fGetVarAxisFlags(nullptr) , fLibrary(nullptr) @@ -9,7 +9,7 @@ { if (FT_New_Library(&gFTMemory, &fLibrary)) { return; -@@ -182,12 +180,7 @@ +@@ -183,12 +181,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) } #endif @@ -23,7 +23,7 @@ } ~FreeTypeLibrary() { if (fLibrary) { -@@ -196,8 +189,6 @@ +@@ -197,8 +190,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) } FT_Library library() { return fLibrary; } @@ -32,7 +32,7 @@ // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -214,8 +205,6 @@ +@@ -215,8 +206,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) private: FT_Library fLibrary; @@ -41,7 +41,7 @@ // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. // The following platforms provide FreeType of at least 2.4.0. -@@ -713,17 +702,6 @@ +@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR rec->fTextSize = SkIntToScalar(1 << 14); } @@ -59,7 +59,7 @@ SkFontHinting h = rec->getHinting(); if (kFull_SkFontHinting == h && !isLCD(*rec)) { // collapse full->normal hinting if we're not doing LCD -@@ -1137,11 +1115,11 @@ +@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { if (glyph->fMaskFormat == SkMask::kLCD16_Format) { if (fLCDIsVert) { diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp index 7281e6b2aa59..10a9d20a13c7 100644 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2017-08-10 02:10:46.427948000 +0200 -+++ third_party/skia/src/ports/SkOSFile_stdio.cpp 2017-08-10 02:11:15.515911000 +0200 -@@ -117,7 +117,7 @@ +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2019-03-11 22:08:28 UTC ++++ third_party/skia/src/ports/SkOSFile_stdio.cpp +@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) { void sk_fsync(FILE* f) { #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \ diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h index c7344a6bb992..5cf7d9de5ca3 100644 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,5 +1,5 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2017-12-24 19:10:48.599527000 +0100 -+++ third_party/skia/src/sksl/SkSLString.h 2017-12-24 19:11:12.662001000 +0100 +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC ++++ third_party/skia/src/sksl/SkSLString.h @@ -22,6 +22,8 @@ #include "SkString.h" #endif diff --git a/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h b/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h index 68e4e9883d7e..4710263d7bdd 100644 --- a/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h +++ b/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h @@ -1,6 +1,6 @@ ---- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2018-12-12 23:03:06.000000000 +0100 -+++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h 2018-12-16 02:27:17.323830000 +0100 -@@ -2232,7 +2232,7 @@ +--- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2019-03-17 01:47:13 UTC ++++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +@@ -2232,7 +2232,7 @@ remove them if not needed. #include <mutex> // for std::mutex #include <atomic> // for std::atomic diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index 3c3733a20451..747f4d473bb6 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2018-12-12 22:56:25.000000000 +0100 -+++ third_party/sqlite/BUILD.gn 2019-01-04 00:53:21.136257000 +0100 -@@ -213,7 +213,7 @@ +--- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC ++++ third_party/sqlite/BUILD.gn +@@ -251,7 +251,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn index 4aef49af7ad6..a2728e56134b 100644 --- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn +++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn @@ -1,12 +1,17 @@ ---- third_party/swiftshader/BUILD.gn.orig 2019-01-30 02:20:34.000000000 +0100 -+++ third_party/swiftshader/BUILD.gn 2019-02-01 13:30:51.566784000 +0100 -@@ -118,16 +118,12 @@ +--- third_party/swiftshader/BUILD.gn.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/BUILD.gn +@@ -126,9 +126,6 @@ config("swiftshader_config") { + ldflags = [ "-Wl,--gc-sections" ] if (target_cpu == "mipsel") { - ldflags += [ +- ldflags += [ - "-Wl,--hash-style=sysv", - "-mips32r2", - ] +- ] + if (mips_arch_variant == "r1") { + ldflags += [ + "-mips32", +@@ -140,11 +137,8 @@ config("swiftshader_config") { + } } else if (target_cpu == "mips64el") { ldflags += [ - "-Wl,--hash-style=sysv", diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp index 7f3cdbba69c8..a1e1ccf4a0f1 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/Common/Configurator.cpp.orig 2018-07-19 21:20:56.462917000 +0200 -+++ third_party/swiftshader/src/Common/Configurator.cpp 2018-07-19 21:23:09.940292000 +0200 -@@ -42,6 +42,9 @@ +--- third_party/swiftshader/src/Common/Configurator.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/Common/Configurator.cpp +@@ -42,6 +42,9 @@ namespace sw bool Configurator::readFile() { diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp index 59e590f9ac26..96aca3af105f 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp @@ -1,5 +1,5 @@ ---- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2017-06-26 22:06:54.283201000 +0200 -+++ third_party/swiftshader/src/Common/MutexLock.hpp 2017-06-26 22:07:18.656810000 +0200 +--- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/Common/MutexLock.hpp @@ -17,7 +17,7 @@ #include "Thread.hpp" diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp index 361633849208..fa03cd628462 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2017-06-26 22:08:50.265243000 +0200 -+++ third_party/swiftshader/src/Common/SharedLibrary.hpp 2017-06-26 22:10:22.637465000 +0200 -@@ -92,7 +92,7 @@ +--- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/Common/SharedLibrary.hpp +@@ -97,7 +97,7 @@ void *loadLibrary(const std::string &libraryDirectory, inline void *getLibraryHandle(const char *path) { diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp index 4f5d5e9ac54e..2264ab6c8787 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2018-07-19 21:23:23.845651000 +0200 -+++ third_party/swiftshader/src/Main/SwiftConfig.cpp 2018-07-19 21:24:08.531304000 +0200 -@@ -762,7 +762,11 @@ +--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/Main/SwiftConfig.cpp +@@ -762,7 +762,11 @@ namespace sw struct stat status; int lastModified = ini.getInteger("LastModified", "Time", 0); diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp index e01dfdf4d9ce..b291ee12c7f9 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-01-12 22:59:44.902034000 +0100 -+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp 2019-01-12 23:00:33.372667000 +0100 -@@ -684,7 +684,7 @@ +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp +@@ -686,7 +686,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; } return false; @@ -9,7 +9,7 @@ return false; // Non X11 linux is headless only #elif defined(__APPLE__) return sw::OSX::IsValidWindow(window); -@@ -860,7 +860,7 @@ +@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const { return sw::FORMAT_X8R8G8B8; } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp index 4c8b95a989cd..d46d40597ad6 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-01-12 22:56:53.902120000 +0100 -+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp 2019-01-12 22:57:13.884671000 +0100 -@@ -352,7 +352,7 @@ +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp +@@ -352,7 +352,7 @@ bool WindowSurface::checkForResize() int windowWidth = windowAttributes.width; int windowHeight = windowAttributes.height; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp index 7a6ae1d0ef22..7b690c4159fb 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2018-12-15 16:34:59.695784000 +0100 -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp 2018-12-15 16:37:11.859379000 +0100 -@@ -148,7 +148,7 @@ +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp +@@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id) // FIXME: Check if display_id is the default display } @@ -9,7 +9,7 @@ #if defined(USE_X11) if(!libX11) #endif // Non X11 linux is headless only -@@ -207,7 +207,7 @@ +@@ -207,7 +207,7 @@ const char *QueryString(EGLDisplay dpy, EGLint name) { return success( "EGL_KHR_client_get_all_proc_addresses " @@ -18,7 +18,7 @@ "EGL_KHR_platform_gbm " #endif #if defined(USE_X11) -@@ -1248,7 +1248,7 @@ +@@ -1248,7 +1248,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void * { TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list); diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp index e9ce90bca37d..59c1f562fb03 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2018-12-15 16:38:54.529408000 +0100 -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp 2018-12-15 16:39:22.143716000 +0100 -@@ -100,7 +100,7 @@ +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp +@@ -100,7 +100,7 @@ class LibEGL (private) #endif #elif defined(__ANDROID__) const char *libEGL_lib[] = {"libEGL_swiftshader.so", "libEGL_swiftshader.so"}; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp index bd4fb317a787..1f68f9ed3be6 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2018-12-03 21:20:24.000000000 +0100 -+++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp 2018-12-15 16:45:47.909334000 +0100 -@@ -261,7 +261,7 @@ +--- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp +@@ -261,7 +261,7 @@ class LibGLES_CM (private) #endif #elif defined(__ANDROID__) const char *libGLES_CM_lib[] = {"libGLESv1_CM_swiftshader.so", "libGLESv1_CM_swiftshader.so"}; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp index 0b6f5043ee36..7a1936b0dce0 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2018-12-03 21:20:24.000000000 +0100 -+++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp 2018-12-15 16:50:37.213988000 +0100 -@@ -286,7 +286,7 @@ +--- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2019-03-11 22:08:03 UTC ++++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp +@@ -286,7 +286,7 @@ class LibGLESv2 (private) #endif #elif defined(__ANDROID__) const char *libGLESv2_lib[] = {"libGLESv2_swiftshader.so", "libGLESv2_swiftshader.so"}; diff --git a/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h index 5d2ea390314f..d5afa9c50345 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h @@ -1,5 +1,5 @@ ---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2017-06-26 22:28:18.140795000 +0200 -+++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h 2017-06-26 22:30:40.465311000 +0200 +--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2019-03-11 22:08:30 UTC ++++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h @@ -121,7 +121,7 @@ #define HAVE_LINK_H 1 diff --git a/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc index c0bdc586f31b..28c940535747 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc @@ -1,5 +1,5 @@ ---- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2017-12-30 20:23:57.746690000 +0100 -+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc 2017-12-30 20:25:19.279850000 +0100 +--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2019-03-11 22:08:30 UTC ++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc @@ -35,7 +35,7 @@ // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for // <stdlib.h> instead. Unix.h includes this for us already. diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn index d4d49ded4c00..e12616cdc188 100644 --- a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn +++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/usrsctp/BUILD.gn.orig 2017-12-15 02:04:50.000000000 +0100 -+++ third_party/usrsctp/BUILD.gn 2018-01-03 13:28:10.295173000 +0100 -@@ -109,11 +109,16 @@ +--- third_party/usrsctp/BUILD.gn.orig 2019-03-11 22:01:18 UTC ++++ third_party/usrsctp/BUILD.gn +@@ -116,11 +116,16 @@ static_library("usrsctp") { "-UINET6", ] diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 8fb6fad4ac4a..5f28025bfc7a 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2017-12-15 02:05:39.000000000 +0100 -+++ third_party/webrtc/BUILD.gn 2017-12-24 19:21:52.441317000 +0100 -@@ -80,6 +80,9 @@ +--- third_party/webrtc/BUILD.gn.orig 2019-03-11 22:08:05 UTC ++++ third_party/webrtc/BUILD.gn +@@ -153,6 +153,9 @@ config("common_inherited_config") { if (is_linux) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 05758efac66b..4596e860ef72 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100 -+++ third_party/webrtc/modules/audio_device/BUILD.gn 2017-12-30 03:44:43.126008000 +0100 -@@ -177,7 +177,7 @@ +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-03-11 22:08:06 UTC ++++ third_party/webrtc/modules/audio_device/BUILD.gn +@@ -312,7 +312,7 @@ rtc_source_set("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index 53b3208ea2e0..068d460974e3 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-01-30 02:20:37.000000000 +0100 -+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2019-02-01 13:38:23.452214000 +0100 +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-03-11 22:08:10 UTC ++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -12,6 +12,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn new file mode 100644 index 000000000000..edb50f296022 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -0,0 +1,20 @@ +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/BUILD.gn +@@ -1088,8 +1088,6 @@ rtc_static_library("rtc_base") { + + if (rtc_use_x11) { + libs += [ +- "dl", +- "rt", + "Xext", + "X11", + "Xcomposite", +@@ -1097,7 +1095,7 @@ rtc_static_library("rtc_base") { + ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + libs += [ + "dl", + "rt", diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h new file mode 100644 index 000000000000..df1d8c9420cb --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -0,0 +1,11 @@ +--- third_party/webrtc/rtc_base/byte_order.h.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/byte_order.h +@@ -79,7 +79,7 @@ + #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. + #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) + #elif defined(WEBRTC_POSIX) +-#include <endian.h> ++#include <sys/endian.h> + #endif + + namespace rtc { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h new file mode 100644 index 000000000000..b4945de800d2 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h @@ -0,0 +1,11 @@ +--- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/ifaddrs_converter.h +@@ -14,6 +14,8 @@ + #if defined(WEBRTC_ANDROID) + #include "rtc_base/ifaddrs_android.h" + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <ifaddrs.h> + #endif // WEBRTC_ANDROID + diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 317846880623..5fe1396d3154 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/ipaddress.cc.orig 2019-02-01 23:33:19.402949000 +0100 -+++ third_party/webrtc/rtc_base/ipaddress.cc 2019-02-01 23:42:10.940296000 +0100 +--- third_party/webrtc/rtc_base/ip_address.cc.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/ip_address.cc @@ -11,6 +11,9 @@ #if defined(WEBRTC_POSIX) #include <netinet/in.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h index 9260ad8f423f..3db51306bd94 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/ipaddress.h.orig 2019-01-30 02:20:38.000000000 +0100 -+++ third_party/webrtc/rtc_base/ipaddress.h 2019-02-01 23:40:04.663435000 +0100 +--- third_party/webrtc/rtc_base/ip_address.h.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/ip_address.h @@ -17,6 +17,10 @@ #include <netinet/in.h> #include <sys/socket.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index cb07ce15e4e3..febff7cd7555 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2017-09-07 00:56:00.388312000 +0200 -+++ third_party/webrtc/rtc_base/network.cc 2017-09-07 01:03:02.971562000 +0200 +--- third_party/webrtc/rtc_base/network.cc.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/network.cc @@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and // it's transitively required by linux/route.h, so include that version on @@ -9,16 +9,16 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -658,7 +658,7 @@ +@@ -762,7 +762,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) bool IsDefaultRoute(const std::string& network_name) { - FileStream fs; - if (!fs.Open("/proc/net/route", "r", nullptr)) { -@@ -701,7 +701,7 @@ + FILE* f = fopen("/proc/net/route", "r"); + if (!f) { +@@ -805,7 +805,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h new file mode 100644 index 000000000000..4916dc17b405 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h @@ -0,0 +1,13 @@ +--- third_party/webrtc/rtc_base/network.h.orig 2019-03-11 22:08:15 UTC ++++ third_party/webrtc/rtc_base/network.h +@@ -25,6 +25,10 @@ + #include "rtc_base/network_monitor.h" + #include "rtc_base/third_party/sigslot/sigslot.h" + ++#if defined(WEBRTC_BSD) ++#include <sys/types.h> ++#endif ++ + #if defined(WEBRTC_POSIX) + struct ifaddrs; + #endif // defined(WEBRTC_POSIX) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index c83e9f1dcb67..d72e2a3f05fc 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physicalsocketserver.cc.orig 2018-12-03 21:20:27.000000000 +0100 -+++ third_party/webrtc/rtc_base/physicalsocketserver.cc 2018-12-15 16:59:55.918713000 +0100 -@@ -66,7 +66,7 @@ +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC ++++ third_party/webrtc/rtc_base/physical_socket_server.cc +@@ -66,7 +66,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -9,7 +9,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -286,7 +286,7 @@ +@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -18,7 +18,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -309,7 +309,7 @@ +@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -36,7 +36,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -338,7 +338,7 @@ +@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -529,7 +529,7 @@ +@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h new file mode 100644 index 000000000000..3fe92f247ce2 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h @@ -0,0 +1,11 @@ +--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2019-03-11 22:08:16 UTC ++++ third_party/webrtc/rtc_base/physical_socket_server.h +@@ -11,7 +11,7 @@ + #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ + #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ + +-#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) ++#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include <sys/epoll.h> + #define WEBRTC_USE_EPOLL 1 + #endif diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 8ec4c7636343..c13f1619297d 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2018-07-19 22:28:12.880328000 +0200 -+++ third_party/webrtc/rtc_base/platform_thread_types.cc 2018-07-19 22:30:17.907866000 +0200 +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-03-11 22:08:16 UTC ++++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,9 @@ #include "rtc_base/platform_thread_types.h" @@ -10,7 +10,7 @@ #include <sys/syscall.h> #endif -@@ -27,8 +29,10 @@ +@@ -27,8 +29,10 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); @@ -22,7 +22,7 @@ #else // Default implementation for nacl and solaris. return reinterpret_cast<pid_t>(pthread_self()); -@@ -55,6 +59,7 @@ +@@ -55,6 +59,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -30,7 +30,7 @@ #if defined(WEBRTC_WIN) struct { DWORD dwType; -@@ -72,6 +77,7 @@ +@@ -72,6 +77,7 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h index 17776644b0de..b01596a3dfe6 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/stringutils.h.orig 2019-01-30 02:20:38.000000000 +0100 -+++ third_party/webrtc/rtc_base/stringutils.h 2019-02-01 16:59:24.656841000 +0100 +--- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC ++++ third_party/webrtc/rtc_base/string_utils.h @@ -25,11 +25,11 @@ #endif // WEBRTC_WIN diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn deleted file mode 100644 index f97dacf0dbdc..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100 -+++ third_party/webrtc/rtc_base/BUILD.gn 2017-12-24 19:35:21.721858000 +0100 -@@ -649,8 +649,6 @@ - - if (use_x11) { - libs += [ -- "dl", -- "rt", - "Xext", - "X11", - "Xcomposite", -@@ -658,7 +656,7 @@ - ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs += [ - "dl", - "rt", diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h b/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h deleted file mode 100644 index 55f2a06cba43..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/rtc_base/byteorder.h.orig 2017-09-07 00:29:50.482044000 +0200 -+++ third_party/webrtc/rtc_base/byteorder.h 2017-09-07 00:30:15.190287000 +0200 -@@ -77,7 +77,7 @@ - #error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined. - #endif // defined(RTC_ARCH_CPU_LITTLE_ENDIAN) - #elif defined(WEBRTC_POSIX) --#include <endian.h> -+#include <sys/endian.h> - #endif - - namespace rtc { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h deleted file mode 100644 index ac0646ebd20e..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2017-09-07 00:50:44.713781000 +0200 -+++ third_party/webrtc/rtc_base/ifaddrs_converter.h 2017-09-07 00:51:25.775459000 +0200 -@@ -14,6 +14,8 @@ - #if defined(WEBRTC_ANDROID) - #include "webrtc/rtc_base/ifaddrs-android.h" - #else -+#include <sys/types.h> -+#include <sys/socket.h> - #include <ifaddrs.h> - #endif // WEBRTC_ANDROID - diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h b/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h deleted file mode 100644 index d2b4a2f364d7..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/webrtc/rtc_base/network.h.orig 2017-09-07 00:56:08.460370000 +0200 -+++ third_party/webrtc/rtc_base/network.h 2017-09-07 01:05:58.608460000 +0200 -@@ -24,6 +24,10 @@ - #include "webrtc/rtc_base/networkmonitor.h" - #include "webrtc/rtc_base/sigslot.h" - -+#if defined(WEBRTC_BSD) -+#include <sys/types.h> -+#endif -+ - #if defined(WEBRTC_POSIX) - struct ifaddrs; - #endif // defined(WEBRTC_POSIX) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h b/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h deleted file mode 100644 index 835628075a40..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/rtc_base/physicalsocketserver.h.orig 2017-09-07 05:58:03.996342000 +0200 -+++ third_party/webrtc/rtc_base/physicalsocketserver.h 2017-09-07 05:58:28.882396000 +0200 -@@ -11,7 +11,7 @@ - #ifndef WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_ - #define WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_ - --#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) -+#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - #include <sys/epoll.h> - #define WEBRTC_USE_EPOLL 1 - #endif diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index b8f49e406ff0..862741091780 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100 -+++ third_party/webrtc/system_wrappers/BUILD.gn 2017-12-24 19:38:19.942270000 +0100 -@@ -72,8 +72,6 @@ +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-03-11 22:08:22 UTC ++++ third_party/webrtc/system_wrappers/BUILD.gn +@@ -59,8 +59,6 @@ rtc_static_library("system_wrappers") { if (!build_with_chromium) { deps += [ ":cpu_features_linux" ] } @@ -8,4 +8,4 @@ - libs += [ "rt" ] } - if (is_linux || is_android) { + if (is_win) { diff --git a/www/chromium/files/patch-third__party_webrtc_webrtc.gni b/www/chromium/files/patch-third__party_webrtc_webrtc.gni deleted file mode 100644 index 30f4ca6a7802..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_webrtc.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/webrtc.gni.orig 2019-01-30 02:20:39.000000000 +0100 -+++ third_party/webrtc/webrtc.gni 2019-02-01 14:19:52.625516000 +0100 -@@ -234,7 +234,7 @@ - - # Desktop capturer is supported only on Windows, OSX and Linux. - rtc_desktop_capture_supported = -- is_win || is_mac || (is_linux && (rtc_use_x11 || rtc_use_pipewire)) -+ is_win || is_mac || (is_linux && (rtc_use_x11 || rtc_use_pipewire) && !is_bsd) - - ############################################################################### - # Templates diff --git a/www/chromium/files/patch-third__party_yasm_BUILD.gn b/www/chromium/files/patch-third__party_yasm_BUILD.gn deleted file mode 100644 index 4a4b810d4b41..000000000000 --- a/www/chromium/files/patch-third__party_yasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/yasm/BUILD.gn.orig 2017-12-15 02:04:50.000000000 +0100 -+++ third_party/yasm/BUILD.gn 2017-12-24 19:31:25.638531000 +0100 -@@ -60,7 +60,12 @@ - # x86insn_nasm.c. These files were previously generated during the build but - # are now shipped pre-generated by yasm. - yasm_gen_include_dir = "$target_gen_dir/gen_include" -- config_makefile = "source/config/Makefile" -+ # Hack for all BSD derivatives use OpenBSD include directory -+ if (is_bsd) { -+ config_makefile = "source/config/openbsd/Makefile" -+ } else { -+ config_makefile = "source/config/$host_os/Makefile" -+ } - version_file = "version.mac" - - import("//build/compiled_action.gni") diff --git a/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni b/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni new file mode 100644 index 000000000000..2ae6310b09d0 --- /dev/null +++ b/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni @@ -0,0 +1,159 @@ +--- third_party/yasm/yasm_assemble.gni.orig 2019-03-18 08:59:45 UTC ++++ third_party/yasm/yasm_assemble.gni +@@ -1,105 +1,23 @@ +-# Copyright 2014 The Chromium Authors. All rights reserved. ++# Copyright 2016 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-# This provides the yasm_assemble() template which uses YASM to assemble +-# assembly files. +-# +-# Files to be assembled with YASM should have an extension of .asm. +-# +-# Parameters +-# +-# yasm_flags (optional) +-# [list of strings] Pass additional flags into YASM. These are appended +-# to the command line. Note that the target machine type and system is +-# already set up based on the current toolchain so you don't need to +-# specify these things (see below). +-# +-# Example: yasm_flags = [ "--force-strict" ] +-# +-# include_dirs (optional) +-# [list of dir names] List of additional include dirs. Note that the +-# source root and the root generated file dir is always added, just like +-# our C++ build sets up. +-# +-# Example: include_dirs = [ "//some/other/path", target_gen_dir ] +-# +-# defines (optional) +-# [list of strings] List of defines, as with the native code defines. +-# +-# Example: defines = [ "FOO", "BAR=1" ] +-# +-# inputs, deps, visibility (optional) +-# These have the same meaning as in an action. +-# +-# Example +-# +-# yasm_assemble("my_yasm_target") { +-# sources = [ +-# "ultra_optimized_awesome.asm", +-# ] +-# include_dirs = [ "assembly_include" ] +-# } +- +-if (is_mac || is_ios) { +- if (current_cpu == "x86") { +- _yasm_flags = [ +- "-fmacho32", +- "-m", +- "x86", +- ] +- } else if (current_cpu == "x64") { +- _yasm_flags = [ +- "-fmacho64", +- "-m", +- "amd64", +- ] +- } +-} else if (is_posix || is_fuchsia) { +- if (current_cpu == "x86") { +- _yasm_flags = [ +- "-felf32", +- "-m", +- "x86", +- ] +- } else if (current_cpu == "x64") { +- _yasm_flags = [ +- "-DPIC", +- "-felf64", +- "-m", +- "amd64", +- ] +- } +-} else if (is_win) { +- if (current_cpu == "x86") { +- _yasm_flags = [ +- "-DPREFIX", +- "-fwin32", +- "-m", +- "x86", +- ] +- } else if (current_cpu == "x64") { +- _yasm_flags = [ +- "-fwin64", +- "-m", +- "amd64", +- ] +- } ++if (current_cpu == "x86") { ++ _yasm_flags = [ ++ "-felf32", ++ "-m", ++ "x86", ++ ] ++} else if (current_cpu == "x64") { ++ _yasm_flags = [ ++ "-DPIC", ++ "-felf64", ++ "-m", ++ "amd64", ++ ] + } + +-if (is_win) { +- asm_obj_extension = "obj" +-} else { +- asm_obj_extension = "o" +-} +- + template("yasm_assemble") { +- assert(defined(invoker.sources), "Need sources defined for $target_name") +- +- # Only depend on YASM on x86 systems. Force compilation of .asm files for +- # ARM to fail. +- assert(current_cpu == "x86" || current_cpu == "x64") +- + action_name = "${target_name}_action" + source_set_name = target_name + +@@ -114,24 +32,12 @@ template("yasm_assemble") { + inputs = invoker.inputs + } + +- # Executable (first in the args). The binary might be in the root build dir +- # (no cross-compiling) or in a toolchain-specific subdirectory of that +- # (when cross-compiling). +- yasm_label = "//third_party/yasm($host_toolchain)" +- args = [ "./" + # Force current dir. +- rebase_path(get_label_info(yasm_label, "root_out_dir") + "/yasm", +- root_build_dir) ] +- +- # Deps. +- deps = [ +- yasm_label, +- ] ++ deps = [] + if (defined(invoker.deps)) { + deps += invoker.deps + } + +- # Flags. +- args += _yasm_flags ++ args = [ "yasm" ] + _yasm_flags + if (defined(invoker.yasm_flags)) { + args += invoker.yasm_flags + } +@@ -188,9 +94,6 @@ template("yasm_assemble") { + } + + sources = get_target_outputs(":$action_name") +- +- # Do not publicize any header to remove build dependency. +- public = [] + + deps = [ + ":$action_name", diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn deleted file mode 100644 index 3d511223600f..000000000000 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/zlib/BUILD.gn.orig 2018-08-08 21:11:58.000000000 +0200 -+++ third_party/zlib/BUILD.gn 2018-09-12 01:00:34.445630000 +0200 -@@ -68,7 +68,7 @@ - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] - } else if (is_linux || is_chromeos) { -- defines += [ "ARMV8_OS_LINUX" ] -+# defines += [ "ARMV8_OS_LINUX" ] - } - } - } -@@ -327,7 +327,7 @@ - ] - } - -- if (is_mac || is_ios || is_android || is_nacl) { -+ if (is_mac || is_ios || is_android || is_nacl || is_bsd) { - # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We - # use fopen, ftell, and fseek instead on these systems. - defines = [ "USE_FILE32API" ] diff --git a/www/chromium/files/patch-third__party_zlib_arm__features.c b/www/chromium/files/patch-third__party_zlib_arm__features.c index 4a251e38325c..1dea27934e05 100644 --- a/www/chromium/files/patch-third__party_zlib_arm__features.c +++ b/www/chromium/files/patch-third__party_zlib_arm__features.c @@ -1,6 +1,6 @@ ---- third_party/zlib/arm_features.c.orig 2019-01-30 02:18:52.000000000 +0100 -+++ third_party/zlib/arm_features.c 2019-02-01 14:35:44.086582000 +0100 -@@ -21,9 +21,10 @@ +--- third_party/zlib/arm_features.c.orig 2019-03-11 22:01:18 UTC ++++ third_party/zlib/arm_features.c +@@ -21,9 +21,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; #include <asm/hwcap.h> #include <sys/auxv.h> #else @@ -12,7 +12,7 @@ static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; static void init_arm_features(void) -@@ -55,10 +56,13 @@ +@@ -55,10 +56,13 @@ static void init_arm_features(void) if (capabilities & flag_pmull) arm_cpu_enable_pmull = 1; } diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn deleted file mode 100644 index 2fd7fc605603..000000000000 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2018-07-19 20:33:30.438352000 +0200 -+++ third_party/blink/renderer/platform/BUILD.gn 2018-07-19 20:34:04.587283000 +0200 -@@ -146,6 +146,7 @@ - "//build/win:default_exe_manifest", - "//third_party/icu", - ] -+ libs = [ "cxxrt" ] - } - - # This isn't strictly necessary since we can just add the deps to "platform", diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn b/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn deleted file mode 100644 index 2f0425f105fc..000000000000 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2018-07-19 20:14:10.239594000 +0200 -+++ third_party/blink/renderer/platform/wtf/BUILD.gn 2018-07-19 20:15:01.317226000 +0200 -@@ -279,8 +279,12 @@ - if (is_android) { - libs = [ "log" ] - } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs = [ "dl" ] -+ } -+ -+ if (is_bsd) { -+ libs = [ "execinfo" ] - } - - if (is_mac) { diff --git a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h b/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h deleted file mode 100644 index f52678e85c7f..000000000000 --- a/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/atomics.h.orig 2018-07-19 20:13:40.615473000 +0200 -+++ third_party/blink/renderer/platform/wtf/atomics.h 2018-07-19 20:13:55.934336000 +0200 -@@ -176,7 +176,7 @@ - #if defined(THREAD_SANITIZER) - // The definitions below assume an LP64 data model. This is fine because - // TSan is only supported on x86_64 Linux. --#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX) -+#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX) || defined(OS_BSD) - ALWAYS_INLINE void ReleaseStore(volatile int* ptr, int value) { - __tsan_atomic32_store(ptr, value, __tsan_memory_order_release); - } diff --git a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc b/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc deleted file mode 100644 index c2fa7f668425..000000000000 --- a/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2018-07-19 19:49:00.959630000 +0200 -+++ third_party/crashpad/crashpad/util/posix/close_multiple.cc 2018-07-19 19:49:23.277639000 +0200 -@@ -71,7 +71,7 @@ - // This is an advantage over looping over all possible file descriptors, because - // no attempt needs to be made to close file descriptors that are not open. - bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - static constexpr char kFDDir[] = "/dev/fd"; - #elif defined(OS_LINUX) || defined(OS_ANDROID) - static constexpr char kFDDir[] = "/proc/self/fd"; diff --git a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_base_files_file__posix.cc index e79f953601e5..b96ca30305db 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_posix.cc.orig 2019-02-06 23:16:22.000000000 +0100 -+++ tools/gn/base/files/file_posix.cc 2019-02-08 18:18:17.423059000 +0100 -@@ -414,7 +414,7 @@ +--- tools/gn/base/files/file_posix.cc.orig 2019-03-11 22:12:13 UTC ++++ tools/gn/base/files/file_posix.cc +@@ -414,7 +414,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 30de95b46836..c133a516bb05 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,6 +1,6 @@ ---- tools/gn/build/gen.py.orig 2019-02-06 23:16:22.000000000 +0100 -+++ tools/gn/build/gen.py 2019-02-08 18:27:37.227094000 +0100 -@@ -44,7 +44,7 @@ +--- tools/gn/build/gen.py.orig 2019-03-11 22:12:13 UTC ++++ tools/gn/build/gen.py +@@ -44,7 +44,7 @@ class Platform(object): @staticmethod def known_platforms(): @@ -9,7 +9,7 @@ def platform(self): return self._platform -@@ -67,6 +67,9 @@ +@@ -67,6 +67,9 @@ class Platform(object): def is_aix(self): return self._platform == 'aix' @@ -19,7 +19,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] -@@ -332,6 +335,11 @@ +@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_aix(): cflags_cc.append('-maix64') ldflags.append('-maix64') diff --git a/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc new file mode 100644 index 000000000000..bd6d48b4274e --- /dev/null +++ b/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc @@ -0,0 +1,13 @@ +--- tools/gn/tools/gn/exec_process.cc.orig 2019-03-11 22:12:13 UTC ++++ tools/gn/tools/gn/exec_process.cc +@@ -29,6 +29,10 @@ + #include "base/posix/file_descriptor_shuffle.h" + #endif + ++#if defined(OS_BSD) ++#include <signal.h> ++#endif ++ + namespace internal { + + #if defined(OS_WIN) diff --git a/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc b/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc deleted file mode 100644 index d4def13d665e..000000000000 --- a/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- tools/gn/tools/gn/exec_process.cc.orig 2018-12-12 23:06:54.000000000 +0100 -+++ tools/gn/tools/gn/exec_process.cc 2018-12-15 22:04:21.665099000 +0100 -@@ -28,6 +28,10 @@ - #include "base/posix/file_descriptor_shuffle.h" - #endif - -+#if defined(OS_BSD) -+#include <signal.h> -+#endif -+ - namespace internal { - - #if defined(OS_WIN) diff --git a/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index 3e39ba415bae..1d07a4a406d6 100644 --- a/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2017-12-30 06:35:45.162972000 +0100 -+++ tools/json_schema_compiler/feature_compiler.py 2017-12-30 06:37:35.101873000 +0100 -@@ -211,6 +211,7 @@ +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-03-11 22:01:18 UTC ++++ tools/json_schema_compiler/feature_compiler.py +@@ -205,6 +205,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', diff --git a/www/chromium/files/patch-tools_json_schema_compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py index 703f5ca13dac..f8cbd5df67e7 100644 --- a/www/chromium/files/patch-tools_json_schema_compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/model.py.orig 2017-12-30 06:35:55.601371000 +0100 -+++ tools/json_schema_compiler/model.py 2017-12-30 06:36:37.374966000 +0100 -@@ -599,7 +599,7 @@ +--- tools/json_schema_compiler/model.py.orig 2019-03-11 22:01:18 UTC ++++ tools/json_schema_compiler/model.py +@@ -602,7 +602,7 @@ class Platforms(object): """ CHROMEOS = _PlatformInfo("chromeos") CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index e5477c629d5e..e2bf7a5b6725 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-12-15 02:04:51.000000000 +0100 -+++ tools/perf/chrome_telemetry_build/BUILD.gn 2017-12-24 19:48:41.050737000 +0100 -@@ -37,7 +37,7 @@ +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-03-11 22:01:18 UTC ++++ tools/perf/chrome_telemetry_build/BUILD.gn +@@ -40,7 +40,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index 3a30a8b7e5bf..d9ad340d66d8 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,6 +1,6 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-02-06 23:07:02.000000000 +0100 -+++ tools/variations/fieldtrial_to_struct.py 2019-02-08 19:20:20.308979000 +0100 -@@ -24,6 +24,7 @@ +--- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC ++++ tools/variations/fieldtrial_to_struct.py +@@ -24,6 +24,7 @@ finally: _platforms = [ 'android', 'android_webview', diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 8317eee7ca98..a40bc4c2c4bd 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2018-02-24 16:25:37.000000000 +0100 -+++ ui/base/dragdrop/os_exchange_data_provider_factory.cc 2018-03-04 04:46:54.356687000 +0100 -@@ -9,7 +9,7 @@ +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/base/dragdrop/os_exchange_data_provider_factory.cc +@@ -8,7 +8,7 @@ #if defined(USE_X11) #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" @@ -9,7 +9,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -43,7 +43,7 @@ +@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) return std::make_unique<OSExchangeDataProviderAuraX11>(); diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h index 3d9782d5f0e3..4157662ca703 100644 --- a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h +++ b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h @@ -1,8 +1,8 @@ ---- ui/base/ime/ime_engine_handler_interface.h.orig 2017-06-05 19:03:30 UTC +--- ui/base/ime/ime_engine_handler_interface.h.orig 2019-03-11 22:01:19 UTC +++ ui/base/ime/ime_engine_handler_interface.h -@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { - // Hides the input view window (from API call). - virtual void HideInputView() = 0; +@@ -166,7 +166,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { + virtual void SetMirroringEnabled(bool mirroring_enabled) = 0; + virtual void SetCastingEnabled(bool casting_enabled) = 0; -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc index 2afd67b9bb21..57a89929eca5 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc @@ -1,5 +1,5 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2018-06-13 00:11:09.000000000 +0200 -+++ ui/base/ime/input_method_initializer.cc 2018-07-19 21:52:04.744818000 +0200 +--- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/base/ime/input_method_initializer.cc @@ -8,7 +8,7 @@ #if defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory_for_testing; #endif -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ void ShutdownInputMethod() { void InitializeInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Initialize(); @@ -27,7 +27,7 @@ if (!g_linux_input_method_context_factory_for_testing) g_linux_input_method_context_factory_for_testing = new FakeInputMethodContextFactory(); -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Shutdown(); diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index e36c823b4353..c7c978f465e1 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2018-06-13 00:11:10.000000000 +0200 -+++ ui/base/resource/resource_bundle.cc 2018-07-19 21:58:34.994550000 +0200 -@@ -708,7 +708,7 @@ +--- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/base/resource/resource_bundle.cc +@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -754,7 +754,7 @@ +@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc index 326e40c22580..ea5ade19da2e 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc @@ -1,5 +1,5 @@ ---- ui/base/resource/resource_bundle_freebsd.cc.orig 2017-09-08 18:23:28.279481000 +0200 -+++ ui/base/resource/resource_bundle_freebsd.cc 2017-09-08 18:23:04.528326000 +0200 +--- ui/base/resource/resource_bundle_freebsd.cc.orig 2019-03-17 01:47:14 UTC ++++ ui/base/resource/resource_bundle_freebsd.cc @@ -0,0 +1,21 @@ +// Copyright 2017 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-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index bed486ca0fe4..37754d5c96d4 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,15 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2018-12-28 17:00:26.368000000 +0100 -+++ ui/base/ui_base_features.cc 2018-12-28 17:01:57.144030000 +0100 -@@ -115,7 +115,7 @@ - "PrecisionTouchpadScrollPhase", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // defined(OS_WIN) +--- ui/base/ui_base_features.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/base/ui_base_features.cc +@@ -111,7 +111,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo + "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -125,7 +125,7 @@ +@@ -121,7 +121,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index af4922276ce1..b82729f15f25 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,8 +1,8 @@ ---- ui/base/ui_base_features.h.orig 2018-12-28 17:00:21.672100000 +0100 -+++ ui/base/ui_base_features.h 2018-12-28 17:01:57.139278000 +0100 -@@ -42,9 +42,9 @@ - UI_BASE_EXPORT bool IsUsingWMPointerForTouch(); - #endif // defined(OS_WIN) +--- ui/base/ui_base_features.h.orig 2019-03-11 22:01:19 UTC ++++ ui/base/ui_base_features.h +@@ -46,9 +46,9 @@ UI_BASE_EXPORT bool IsUsingWMPointerForTouch(); + UI_BASE_EXPORT extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index f825383f6aad..d60216d5b592 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2017-04-19 19:06:54 UTC +--- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC +++ ui/base/webui/web_ui_util.cc -@@ -161,7 +161,7 @@ std::string GetFontFamily() { +@@ -217,7 +217,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index bb35e4e091dc..9b27e63463b8 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-06-05 19:03:30 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-03-11 22:01:19 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -828,6 +828,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -838,6 +840,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 73c2ac9ce66f..565f70395687 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,6 +1,6 @@ ---- ui/events/event_switches.cc.orig 2017-06-05 19:03:30 UTC +--- ui/events/event_switches.cc.orig 2019-03-11 22:01:19 UTC +++ ui/events/event_switches.cc -@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll- +@@ -14,7 +14,7 @@ namespace switches { const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h index 7fe62d810a8d..e7351a731084 100644 --- a/www/chromium/files/patch-ui_events_event__switches.h +++ b/www/chromium/files/patch-ui_events_event__switches.h @@ -1,7 +1,7 @@ ---- ui/events/event_switches.h.orig 2018-12-12 22:56:27.000000000 +0100 -+++ ui/events/event_switches.h 2019-01-09 23:42:56.991577000 +0100 -@@ -13,7 +13,7 @@ - +--- ui/events/event_switches.h.orig 2019-03-11 22:01:19 UTC ++++ ui/events/event_switches.h +@@ -13,7 +13,7 @@ namespace switches { + EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index e2be265a4b6f..ae795aaebad6 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,4 +1,4 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2017-04-19 19:06:54 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2019-03-11 22:01:19 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -19,7 +19,7 @@ namespace { // and DOM Level 3 |code| strings. diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 1ceeeae8c293..d9c4ad8f22e7 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,7 +1,7 @@ ---- ui/gfx/BUILD.gn.orig 2018-08-01 00:09:48.000000000 +0200 -+++ ui/gfx/BUILD.gn 2018-08-04 22:24:28.133674000 +0200 -@@ -568,7 +568,7 @@ - deps += [ "//third_party/libdrm" ] +--- ui/gfx/BUILD.gn.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/BUILD.gn +@@ -532,7 +532,7 @@ jumbo_source_set("memory_buffer_sources") { + deps += [ "//build/config/linux/libdrm" ] } - if (is_linux || is_android) { diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 8415264e47d0..55e37cb92698 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2017-06-05 19:03:30 UTC +--- ui/gfx/canvas_skia.cc.orig 2019-03-11 22:01:19 UTC +++ ui/gfx/canvas_skia.cc -@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin +@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc index 052cd8349b0e..1bd5ac55ec9e 100644 --- a/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc +++ b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc @@ -1,6 +1,6 @@ ---- ui/gfx/codec/jpeg_codec.cc.orig 2017-10-14 03:14:08.077073000 +0200 -+++ ui/gfx/codec/jpeg_codec.cc 2017-10-14 03:25:59.561802000 +0200 -@@ -219,6 +219,7 @@ +--- ui/gfx/codec/jpeg_codec.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/codec/jpeg_codec.cc +@@ -207,6 +207,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz case JCS_GRAYSCALE: case JCS_RGB: case JCS_YCbCr: @@ -8,7 +8,7 @@ // Choose an output colorspace and return if it is an unsupported one. // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats // used by Chromium (i.e. RGBA and BGRA) and we just map the input -@@ -237,6 +238,9 @@ +@@ -223,6 +224,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz NOTREACHED() << "Invalid pixel format"; return false; } diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index 382059b402e5..9a275a8e8fa3 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2017-04-19 19:06:54 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2019-03-11 22:01:19 UTC +++ ui/gfx/font_fallback_linux.cc @@ -15,6 +15,10 @@ #include "base/memory/ptr_util.h" diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc index ccb2e1a4e658..542476a0c3e2 100644 --- a/www/chromium/files/patch-ui_gfx_font__list.cc +++ b/www/chromium/files/patch-ui_gfx_font__list.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_list.cc.orig 2018-12-03 21:18:06.000000000 +0100 -+++ ui/gfx/font_list.cc 2018-12-15 20:17:39.591084000 +0100 -@@ -24,7 +24,7 @@ +--- ui/gfx/font_list.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/font_list.cc +@@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>:: bool g_default_impl_initialized = false; bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) { diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index ec0409fa71c1..de06f9dd7cc9 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,6 +1,6 @@ ---- ui/gfx/font_render_params.h.orig 2019-01-30 02:18:54.000000000 +0100 -+++ ui/gfx/font_render_params.h 2019-02-01 15:04:34.285442000 +0100 -@@ -111,13 +111,13 @@ +--- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/font_render_params.h +@@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); diff --git a/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index 74edba38766d..8090f7bcd79c 100644 --- a/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,6 +1,6 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2018-12-03 21:18:06.000000000 +0100 -+++ ui/gfx/gpu_memory_buffer.h 2018-12-15 20:30:42.393665000 +0100 -@@ -15,7 +15,7 @@ +--- ui/gfx/gpu_memory_buffer.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/gpu_memory_buffer.h +@@ -16,7 +16,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" @@ -9,8 +9,8 @@ #include "ui/gfx/native_pixmap_handle.h" #elif defined(OS_MACOSX) && !defined(OS_IOS) #include "ui/gfx/mac/io_surface.h" -@@ -65,7 +65,7 @@ - base::SharedMemoryHandle handle; +@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { + base::UnsafeSharedMemoryRegion region; uint32_t offset; int32_t stride; -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index 3bc8fea8a299..1d215a19459a 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,6 +1,6 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2017-08-02 17:11:09.924017000 +0200 -+++ ui/gfx/ipc/gfx_param_traits_macros.h 2017-08-02 17:11:50.017756000 +0200 -@@ -15,7 +15,7 @@ +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/ipc/gfx_param_traits_macros.h +@@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" #include "ui/gfx/swap_result.h" @@ -9,8 +9,8 @@ #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -39,7 +39,7 @@ - IPC_STRUCT_TRAITS_MEMBER(handle) +@@ -51,7 +51,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) + IPC_STRUCT_TRAITS_MEMBER(region) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(stride) -#if defined(OS_LINUX) @@ -18,7 +18,7 @@ IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_MACOSX) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -50,7 +50,7 @@ +@@ -66,7 +66,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() diff --git a/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index 129bbd31acec..3efa8ffce8ef 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,5 +1,5 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-08-02 16:54:46.101075000 +0200 -+++ ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-08-02 16:55:49.754442000 +0200 +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,9 +10,9 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -19,11 +21,7 @@ - #include "base/strings/stringprintf.h" +@@ -18,11 +20,7 @@ #include "base/trace_event/trace_event.h" + #include "build/build_config.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -#include <linux/dma-buf.h> diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc index 7ddbe8d3f443..66b1f30c3c79 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc @@ -1,6 +1,6 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-01-30 02:18:54.000000000 +0100 -+++ ui/gfx/mojo/buffer_types_struct_traits.cc 2019-02-01 15:10:31.292361000 +0100 -@@ -28,7 +28,7 @@ +--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/mojo/buffer_types_struct_traits.cc +@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format); } @@ -9,7 +9,7 @@ std::vector<mojo::ScopedHandle> StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>:: fds(const gfx::NativePixmapHandle& pixmap_handle) { -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ bool StructTraits< } return data.ReadPlanes(&out->planes); } @@ -18,7 +18,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: @@ -27,7 +27,7 @@ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( handle.native_pixmap_handle); #else -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h index c06d88ae83bf..08db910bf200 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h +++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h @@ -1,6 +1,6 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-01-30 02:18:54.000000000 +0100 -+++ ui/gfx/mojo/buffer_types_struct_traits.h 2019-02-01 15:19:04.908647000 +0100 -@@ -189,7 +189,7 @@ +--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/mojo/buffer_types_struct_traits.h +@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV } }; @@ -9,7 +9,7 @@ template <> struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane> { -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; diff --git a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc index 7a5499a5ba1b..2d50ce0b11f4 100644 --- a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,5 +1,5 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2018-03-20 23:05:56.000000000 +0100 -+++ ui/gfx/native_pixmap_handle.cc 2018-03-24 19:09:06.975980000 +0100 +--- ui/gfx/native_pixmap_handle.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/native_pixmap_handle.cc @@ -4,14 +4,14 @@ #include "ui/gfx/native_pixmap_handle.h" @@ -17,7 +17,7 @@ static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapPlane::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix NativePixmapHandle::~NativePixmapHandle() {} diff --git a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h index 9e9261d7e7f2..ac73c77b8cf9 100644 --- a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,5 +1,5 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2017-08-02 17:17:40.381296000 +0200 -+++ ui/gfx/native_pixmap_handle.h 2017-08-02 17:18:15.306967000 +0200 +--- ui/gfx/native_pixmap_handle.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gfx/native_pixmap_handle.h @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "ui/gfx/gfx_export.h" @@ -9,7 +9,7 @@ #include "base/file_descriptor_posix.h" #endif -@@ -46,14 +46,14 @@ +@@ -54,14 +54,14 @@ struct GFX_EXPORT NativePixmapHandle { ~NativePixmapHandle(); diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index deddc3d5161b..a805803da0a8 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2017-06-05 19:03:30 UTC +--- ui/gfx/render_text.cc.orig 2019-03-11 22:01:19 UTC +++ ui/gfx/render_text.cc -@@ -948,32 +948,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -934,32 +934,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 3013aad6a404..36b25afba995 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2018-12-03 21:18:06.000000000 +0100 -+++ ui/gl/BUILD.gn 2018-12-15 20:36:26.132070000 +0100 -@@ -203,7 +203,7 @@ +--- ui/gl/BUILD.gn.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/BUILD.gn +@@ -212,7 +212,7 @@ jumbo_component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_generate_bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index cf67dd5e9ba2..e9bb6663cf9d 100644 --- a/www/chromium/files/patch-ui_gl_generate_bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2017-09-10 02:49:38.177014000 +0200 -+++ ui/gl/generate_bindings.py 2017-09-10 02:52:26.524647000 +0200 -@@ -2257,6 +2257,9 @@ +--- ui/gl/generate_bindings.py.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/generate_bindings.py +@@ -2624,6 +2624,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h index 34f2a8164a20..c51dba36aabe 100644 --- a/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h +++ b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h @@ -1,6 +1,6 @@ ---- ui/gl/gl_bindings_api_autogen_glx.h.orig 2017-12-30 16:59:26.294402000 +0100 -+++ ui/gl/gl_bindings_api_autogen_glx.h 2017-12-30 17:01:57.250690000 +0100 -@@ -84,6 +84,7 @@ +--- ui/gl/gl_bindings_api_autogen_glx.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/gl_bindings_api_autogen_glx.h +@@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy, GLXDrawable drawable, int32_t* numerator, int32_t* denominator) override; diff --git a/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc index aa629db9f8b4..d94fc0f3246f 100644 --- a/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc +++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2018-12-03 21:18:06.000000000 +0100 -+++ ui/gl/gl_bindings_autogen_glx.cc 2018-12-15 20:44:07.948273000 +0100 -@@ -115,6 +115,8 @@ +--- ui/gl/gl_bindings_autogen_glx.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/gl_bindings_autogen_glx.cc +@@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { ext.b_GLX_ARB_create_context = gfx::HasExtension(extensions, "GLX_ARB_create_context"); @@ -9,7 +9,7 @@ ext.b_GLX_EXT_swap_control = gfx::HasExtension(extensions, "GLX_EXT_swap_control"); ext.b_GLX_EXT_texture_from_pixmap = -@@ -145,6 +147,11 @@ +@@ -145,6 +147,11 @@ void DriverGLX::InitializeExtensionBindings() { GetGLProcAddress("glXCreateContextAttribsARB")); } @@ -21,7 +21,7 @@ if (ext.b_GLX_SGIX_fbconfig) { fn.glXGetFBConfigFromVisualSGIXFn = reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>( -@@ -346,6 +353,10 @@ +@@ -346,6 +353,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy, return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); } @@ -32,7 +32,7 @@ void GLXApiBase::glXGetSelectedEventFn(Display* dpy, GLXDrawable drawable, unsigned long* mask) { -@@ -646,6 +657,11 @@ +@@ -646,6 +657,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); } @@ -44,7 +44,7 @@ void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, GLXDrawable drawable, unsigned long* mask) { -@@ -1068,6 +1084,14 @@ +@@ -1068,6 +1084,14 @@ bool DebugGLXApi::glXGetMscRateOMLFn(Display* dpy, << static_cast<const void*>(denominator) << ")"); bool result = glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); diff --git a/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h index b384d0bdb171..e95b9179865e 100644 --- a/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h +++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h @@ -1,6 +1,6 @@ ---- ui/gl/gl_bindings_autogen_glx.h.orig 2017-12-15 02:04:52.000000000 +0100 -+++ ui/gl/gl_bindings_autogen_glx.h 2017-12-30 20:37:25.644088000 +0100 -@@ -104,6 +104,8 @@ +--- ui/gl/gl_bindings_autogen_glx.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/gl_bindings_autogen_glx.h +@@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di GLXDrawable drawable, int32_t* numerator, int32_t* denominator); @@ -9,7 +9,7 @@ typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy, GLXDrawable drawable, unsigned long* mask); -@@ -166,6 +168,7 @@ +@@ -166,6 +168,7 @@ typedef void(GL_BINDING_CALL* glXWaitXProc)(void); struct ExtensionsGLX { bool b_GLX_ARB_create_context; @@ -17,7 +17,7 @@ bool b_GLX_EXT_swap_control; bool b_GLX_EXT_texture_from_pixmap; bool b_GLX_MESA_copy_sub_buffer; -@@ -203,6 +206,7 @@ +@@ -203,6 +206,7 @@ struct ProcsGLX { glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn; glXGetFBConfigsProc glXGetFBConfigsFn; glXGetMscRateOMLProc glXGetMscRateOMLFn; @@ -25,7 +25,7 @@ glXGetSelectedEventProc glXGetSelectedEventFn; glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn; glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn; -@@ -310,6 +314,7 @@ +@@ -310,6 +314,7 @@ class GL_EXPORT GLXApi { GLXDrawable drawable, int32_t* numerator, int32_t* denominator) = 0; @@ -33,7 +33,7 @@ virtual void glXGetSelectedEventFn(Display* dpy, GLXDrawable drawable, unsigned long* mask) = 0; -@@ -394,6 +399,7 @@ +@@ -394,6 +399,7 @@ class GL_EXPORT GLXApi { ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn diff --git a/www/chromium/files/patch-ui_gl_gl_fence.cc b/www/chromium/files/patch-ui_gl_gl__fence.cc index 73b97dbad2f3..5ba84b4bdb36 100644 --- a/www/chromium/files/patch-ui_gl_gl_fence.cc +++ b/www/chromium/files/patch-ui_gl_gl__fence.cc @@ -1,5 +1,5 @@ ---- ui/gl/gl_fence.cc.orig 2018-12-03 21:18:06.000000000 +0100 -+++ ui/gl/gl_fence.cc 2018-12-15 20:48:07.037480000 +0100 +--- ui/gl/gl_fence.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/gl_fence.cc @@ -18,7 +18,7 @@ #include "ui/gl/gl_fence_apple.h" #endif diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index 163ce26b882e..72ae09b4d8c1 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,5 +1,5 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2018-12-12 22:56:28.000000000 +0100 -+++ ui/gl/sync_control_vsync_provider.cc 2019-01-09 23:55:37.488409000 +0100 +--- ui/gl/sync_control_vsync_provider.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ const double kRelativeIntervalDifferenceThreshold = 0. namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { @@ -18,7 +18,7 @@ // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva base::TimeTicks* timebase_out, base::TimeDelta* interval_out) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); @@ -27,7 +27,7 @@ // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -157,11 +157,11 @@ +@@ -157,11 +157,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva return true; #else return false; diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index ecd2976f4c93..4321d70a7288 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,7 +1,7 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2017-12-15 02:04:52.000000000 +0100 -+++ ui/gl/sync_control_vsync_provider.h 2017-12-24 20:29:58.843365000 +0100 -@@ -23,11 +23,11 @@ - void GetVSyncParameters(const UpdateVSyncCallback& callback) override; +--- ui/gl/sync_control_vsync_provider.h.orig 2019-03-11 22:01:19 UTC ++++ ui/gl/sync_control_vsync_provider.h +@@ -26,11 +26,11 @@ class SyncControlVSyncProvider : public gfx::VSyncProv + bool SupportGetVSyncParametersIfAvailable() const override; static constexpr bool IsSupported() { -#if defined(OS_LINUX) @@ -14,7 +14,7 @@ } protected: -@@ -38,7 +38,7 @@ +@@ -41,7 +41,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: @@ -23,7 +23,7 @@ base::TimeTicks last_timebase_; uint64_t last_media_stream_counter_ = 0; base::TimeDelta last_good_interval_; -@@ -49,7 +49,7 @@ +@@ -52,7 +52,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv // from configuration change (monitor reconfiguration, moving windows // between monitors, suspend and resume, etc.). base::queue<base::TimeDelta> last_computed_intervals_; diff --git a/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h index f2ebc6499f42..a6db114882bc 100644 --- a/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h +++ b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h @@ -1,6 +1,6 @@ ---- ui/message_center/public/cpp/message_center_constants.h.orig 2019-01-04 01:05:19.610265000 +0100 -+++ ui/message_center/public/cpp/message_center_constants.h 2019-01-04 01:05:58.617215000 +0100 -@@ -106,7 +106,7 @@ +--- ui/message_center/public/cpp/message_center_constants.h.orig 2019-03-11 22:01:19 UTC ++++ ui/message_center/public/cpp/message_center_constants.h +@@ -101,7 +101,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. const int kButtonIconTopPadding = 11; // In DIPs. const int kButtonIconToTitlePadding = 16; // In DIPs. diff --git a/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc index 078a06d7d91c..94960ecb60cb 100644 --- a/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-01-04 01:03:15.842319000 +0100 -+++ ui/message_center/views/message_popup_view.cc 2019-01-04 01:03:49.177126000 +0100 -@@ -112,7 +112,7 @@ +--- ui/message_center/views/message_popup_view.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/message_center/views/message_popup_view.cc +@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.keep_on_top = true; diff --git a/www/chromium/files/patch-ui_native_theme_native_theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 4a8391ba8019..188ebfb75cfa 100644 --- a/www/chromium/files/patch-ui_native_theme_native_theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2017-09-07 02:03:42.878086000 +0200 -+++ ui/native_theme/native_theme.h 2017-09-07 02:04:02.716811000 +0200 -@@ -47,7 +47,7 @@ +--- ui/native_theme/native_theme.h.orig 2019-03-11 22:01:19 UTC ++++ ui/native_theme/native_theme.h +@@ -48,7 +48,7 @@ class NATIVE_THEME_EXPORT NativeTheme { // The part to be painted / sized. enum Part { kCheckbox, diff --git a/www/chromium/files/patch-ui_native_theme_native_theme_base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index ac0188d60d35..81633414c0a8 100644 --- a/www/chromium/files/patch-ui_native_theme_native_theme_base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2017-09-07 02:01:55.087892000 +0200 -+++ ui/native_theme/native_theme_base.cc 2017-09-07 02:02:23.038570000 +0200 -@@ -172,7 +172,7 @@ +--- ui/native_theme/native_theme_base.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/native_theme/native_theme_base.cc +@@ -172,7 +172,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: PaintCheckbox(canvas, state, rect, extra.button); break; diff --git a/www/chromium/files/patch-ui_strings_app_locale_settings.grd b/www/chromium/files/patch-ui_strings_app__locale__settings.grd index bcd14612c2f9..85b2669a3adb 100644 --- a/www/chromium/files/patch-ui_strings_app_locale_settings.grd +++ b/www/chromium/files/patch-ui_strings_app__locale__settings.grd @@ -1,5 +1,5 @@ ---- ui/strings/app_locale_settings.grd.orig 2017-09-07 19:24:56.013911000 +0200 -+++ ui/strings/app_locale_settings.grd 2017-09-07 19:26:00.987366000 +0200 +--- ui/strings/app_locale_settings.grd.orig 2019-03-11 22:01:19 UTC ++++ ui/strings/app_locale_settings.grd @@ -187,7 +187,7 @@ 75% </message> diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc index a8d75c43a73d..784570afe3fd 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc @@ -1,6 +1,6 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2018-12-15 21:04:16.740410000 +0100 -+++ ui/views/bubble/bubble_dialog_delegate_view.cc 2018-12-15 21:05:12.625861000 +0100 -@@ -114,7 +114,7 @@ +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/views/bubble/bubble_dialog_delegate_view.cc +@@ -112,7 +112,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 9a3e5f9998c8..b1f04455a0f4 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/controls/label.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/controls/label.cc -@@ -553,7 +553,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -542,7 +542,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() { +@@ -727,7 +727,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index a5c558313bca..974edeb7d427 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,7 +1,7 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2017-07-25 21:05:19.000000000 +0200 -+++ ui/views/controls/textfield/textfield.cc 2017-08-02 16:52:12.933845000 +0200 -@@ -58,7 +58,7 @@ - #include "ui/base/win/osk_display_manager.h" +--- ui/views/controls/textfield/textfield.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/views/controls/textfield/textfield.cc +@@ -59,7 +59,7 @@ + #include "base/win/win_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -165,14 +165,14 @@ +@@ -162,14 +162,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -233,7 +233,7 @@ +@@ -228,7 +228,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,16 +35,16 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -619,7 +619,7 @@ - ShowImeIfNeeded(); +@@ -682,7 +682,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e + #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) - RequestFocus(); + RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -658,7 +658,7 @@ +@@ -726,7 +726,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -801,7 +801,7 @@ +@@ -894,7 +894,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1897,7 +1897,7 @@ +@@ -2076,7 +2076,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 8dc832a8cb3e..ec9c9de96153 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,4 +1,4 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2017-04-19 19:06:54 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/corewm/tooltip_aura.cc @@ -34,7 +34,7 @@ const int kCursorOffsetY = 15; diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index fff47b1fd49e..8f0e0596f493 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/examples/widget_example.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/examples/widget_example.cc -@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc index 19120a88405b..f921809afa5b 100644 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -1,4 +1,4 @@ ---- ui/views/selection_controller.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/selection_controller.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/selection_controller.cc @@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 54a11c579927..2c76de33fe03 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2017-04-19 19:06:55 UTC +--- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/style/platform_style.cc -@@ -19,7 +19,7 @@ +@@ -18,7 +18,7 @@ #if defined(OS_CHROMEOS) #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index b8a1ae92e96a..52b9c44aa3e8 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/views_delegate.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/views_delegate.cc -@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const { +@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 36b55522a7fd..d0fd56aee4ef 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2017-06-05 19:03:30 UTC +--- ui/views/views_delegate.h.orig 2019-03-11 22:01:19 UTC +++ ui/views/views_delegate.h -@@ -161,7 +161,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc new file mode 100644 index 000000000000..9d48115a485a --- /dev/null +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -0,0 +1,20 @@ +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-03-17 17:58:04 UTC ++++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea + const Widget::InitParams& params) { + native_widget_delegate_->OnNativeWidgetCreated(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Setup a non_client_window_event_filter, which handles resize/move, double + // click and other events. + DCHECK(!non_client_window_event_filter_); +@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() { + } + + void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!non_client_window_event_filter_) + return; + diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h new file mode 100644 index 000000000000..5cd4277bdb55 --- /dev/null +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h @@ -0,0 +1,11 @@ +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-03-17 17:59:02 UTC ++++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h +@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform + + bool is_active_ = false; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // A handler for events intended for non client area. + std::unique_ptr<WindowEventFilter> non_client_window_event_filter_; + #endif diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 9bff3bfa6c9e..a5b874437720 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/window/custom_frame_view.cc -@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -305,7 +305,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index a483a8a79380..d3c99fcca7c6 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2017-06-05 19:03:30 UTC +--- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC +++ ui/views/window/dialog_delegate.cc -@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit +@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); diff --git a/www/chromium/files/patch-ui_views_window_frame_background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc index 667e6a802a87..b4784f5e246b 100644 --- a/www/chromium/files/patch-ui_views_window_frame_background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,6 +1,6 @@ ---- ui/views/window/frame_background.cc.orig 2018-12-03 21:18:07.000000000 +0100 -+++ ui/views/window/frame_background.cc 2018-12-15 21:23:38.516468000 +0100 -@@ -122,7 +122,7 @@ +--- ui/views/window/frame_background.cc.orig 2019-03-11 22:01:19 UTC ++++ ui/views/window/frame_background.cc +@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv const View* view) const { // Fill the top with the frame color first so we have a constant background // for areas not covered by the theme image. diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index 73a2958bfc91..9f4e8730e896 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2017-04-19 19:06:55 UTC +--- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC +++ ui/webui/resources/js/cr.js -@@ -451,6 +451,11 @@ var cr = cr || function() { +@@ -463,6 +463,11 @@ var cr = cr || function(global) { get doc() { return document; }, diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js index 7cd49238307d..e102e257ce76 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_icon.js +++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js @@ -1,4 +1,4 @@ ---- ui/webui/resources/js/icon.js.orig 2017-04-19 19:06:55 UTC +--- ui/webui/resources/js/icon.js.orig 2019-03-11 22:01:19 UTC +++ ui/webui/resources/js/icon.js @@ -14,7 +14,7 @@ cr.define('cr.icon', function() { // supports SCALE_FACTOR_100P on all non-iOS platforms. diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 37fc8f749ba5..8e9be5b72ff6 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2019-01-30 02:20:39.000000000 +0100 -+++ v8/BUILD.gn 2019-02-01 15:22:52.852309000 +0100 -@@ -3254,7 +3254,7 @@ +--- v8/BUILD.gn.orig 2019-03-11 22:08:08 UTC ++++ v8/BUILD.gn +@@ -3160,7 +3160,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3274,6 +3274,12 @@ +@@ -3180,6 +3180,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3478,6 +3484,7 @@ +@@ -3384,6 +3390,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho "src/snapshot/embedded-file-writer.h", "src/snapshot/mksnapshot.cc", ] diff --git a/www/chromium/files/patch-v8_src_api.cc b/www/chromium/files/patch-v8_src_api.cc index 4fa3d118e2e2..19e538ee0a8f 100644 --- a/www/chromium/files/patch-v8_src_api.cc +++ b/www/chromium/files/patch-v8_src_api.cc @@ -1,15 +1,15 @@ ---- v8/src/api.cc.orig 2019-02-06 23:49:54.462307000 +0100 -+++ v8/src/api.cc 2019-02-06 23:50:45.414499000 +0100 -@@ -105,7 +105,7 @@ +--- v8/src/api.cc.orig 2019-03-11 22:08:08 UTC ++++ v8/src/api.cc +@@ -107,7 +107,7 @@ #include "src/wasm/wasm-result.h" #include "src/wasm/wasm-serialization.h" -#if V8_OS_LINUX || V8_OS_MACOSX +#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD #include <signal.h> + #include "include/v8-wasm-trap-handler-posix.h" #include "src/trap-handler/handler-inside-posix.h" - #endif -@@ -5885,7 +5885,7 @@ +@@ -5759,7 +5759,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index c653251f6a07..90464f2308d7 100644 --- a/www/chromium/files/patch-v8_src_base_cpu.cc +++ b/www/chromium/files/patch-v8_src_base_cpu.cc @@ -1,18 +1,18 @@ ---- v8/src/base/cpu.cc.orig 2017-09-11 03:04:32.333164000 +0200 -+++ v8/src/base/cpu.cc 2017-09-11 03:05:48.364215000 +0200 -@@ -607,6 +607,7 @@ +--- v8/src/base/cpu.cc.orig 2019-03-11 22:08:08 UTC ++++ v8/src/base/cpu.cc +@@ -424,6 +424,7 @@ CPU::CPU() - #elif V8_HOST_ARCH_ARM64 + #if V8_OS_LINUX +#if V8_OS_LINUX CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -640,6 +641,7 @@ +@@ -457,6 +458,7 @@ CPU::CPU() } delete[] part; } +#endif - #elif V8_HOST_ARCH_PPC - + // Extract architecture from the "CPU Architecture" field. + // The list is well-known, unlike the the output of diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 7577a15bfbcb..51fb7a8f7f0f 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,15 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2018-02-24 16:26:18.000000000 +0100 -+++ v8/src/base/platform/platform-posix.cc 2018-03-04 05:02:38.985674000 +0100 -@@ -459,6 +459,12 @@ +--- v8/src/base/platform/platform-posix.cc.orig 2019-03-21 01:39:38.000000000 +0100 ++++ v8/src/base/platform/platform-posix.cc 2019-03-24 19:04:25.066535000 +0100 +@@ -376,7 +376,7 @@ + + // static + bool OS::HasLazyCommits() { +-#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX || V8_OS_FREEBSD + return true; + #else + // TODO(bbudge) Return true for all POSIX platforms. +@@ -501,6 +501,12 @@ return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-v8_src_external-reference-table.cc b/www/chromium/files/patch-v8_src_external-reference-table.cc new file mode 100644 index 000000000000..9ca737217419 --- /dev/null +++ b/www/chromium/files/patch-v8_src_external-reference-table.cc @@ -0,0 +1,11 @@ +--- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC ++++ v8/src/external-reference-table.cc +@@ -9,7 +9,7 @@ + #include "src/external-reference.h" + #include "src/ic/stub-cache.h" + +-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) ++#if defined(DEBUG) && (defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID) + #define SYMBOLIZE_FUNCTION + #include <execinfo.h> + #include <vector> diff --git a/www/chromium/files/patch-v8_src_log-utils.h b/www/chromium/files/patch-v8_src_log-utils.h index 6347ca61f9a8..67b92cd174d1 100644 --- a/www/chromium/files/patch-v8_src_log-utils.h +++ b/www/chromium/files/patch-v8_src_log-utils.h @@ -1,8 +1,8 @@ ---- v8/src/log-utils.h.orig 2017-07-04 22:40:30.657540000 +0200 -+++ v8/src/log-utils.h 2017-07-04 22:40:59.090730000 +0200 -@@ -14,6 +14,8 @@ - #include "src/base/platform/mutex.h" +--- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC ++++ v8/src/log-utils.h +@@ -16,6 +16,8 @@ #include "src/flags.h" + #include "src/ostreams.h" +#include <stdarg.h> + diff --git a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index b5b3f979ed1d..dd1ea4153ede 100644 --- a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,5 +1,5 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2019-02-02 10:20:15.963337000 +0100 -+++ v8/src/trap-handler/handler-inside-posix.cc 2019-02-02 10:41:12.897011000 +0100 +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2019-03-11 22:08:08 UTC ++++ v8/src/trap-handler/handler-inside-posix.cc @@ -27,7 +27,7 @@ #include <signal.h> @@ -9,7 +9,7 @@ #include <ucontext.h> #elif V8_OS_MACOSX #include <sys/ucontext.h> -@@ -109,6 +109,8 @@ +@@ -112,6 +112,8 @@ bool TryHandleSignal(int signum, siginfo_t* info, void auto* context_rip = &uc->uc_mcontext.gregs[REG_RIP]; #elif V8_OS_MACOSX auto* context_rip = &uc->uc_mcontext->__ss.__rip; diff --git a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h index 2cfa80c34aa4..3e8c86402c73 100644 --- a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h +++ b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h @@ -1,6 +1,6 @@ ---- v8/src/trap-handler/handler-inside-posix.h.orig 2019-02-02 10:19:11.070129000 +0100 -+++ v8/src/trap-handler/handler-inside-posix.h 2019-02-02 10:19:28.516985000 +0100 -@@ -12,7 +12,7 @@ +--- v8/src/trap-handler/handler-inside-posix.h.orig 2019-03-11 22:08:08 UTC ++++ v8/src/trap-handler/handler-inside-posix.h +@@ -12,7 +12,7 @@ namespace v8 { namespace internal { namespace trap_handler { diff --git a/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h b/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h index 4003178f8df0..1d2e48b14832 100644 --- a/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h +++ b/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h @@ -1,6 +1,6 @@ ---- v8/src/trap-handler/trap-handler.h.orig 2019-02-02 10:48:04.472258000 +0100 -+++ v8/src/trap-handler/trap-handler.h 2019-02-02 10:49:11.178676000 +0100 -@@ -23,6 +23,8 @@ +--- v8/src/trap-handler/trap-handler.h.orig 2019-03-11 22:08:08 UTC ++++ v8/src/trap-handler/trap-handler.h +@@ -23,6 +23,8 @@ namespace trap_handler { #define V8_TRAP_HANDLER_SUPPORTED true #elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX #define V8_TRAP_HANDLER_SUPPORTED true diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 8cad1f2bbb47..d18b16aa0e67 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -119,9 +119,9 @@ bin/chrome %%DATADIR%%/protoc %%DATADIR%%/resources.pak %%DATADIR%%/resources/inspector/.htaccess -%%DATADIR%%/resources/inspector/Images/accelerometer-back.png +%%DATADIR%%/resources/inspector/Images/accelerometer-back.svg %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png -%%DATADIR%%/resources/inspector/Images/accelerometer-front.png +%%DATADIR%%/resources/inspector/Images/accelerometer-front.svg %%DATADIR%%/resources/inspector/Images/accelerometer-left.png %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png @@ -138,7 +138,6 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png -%%DATADIR%%/resources/inspector/Images/deleteIcon.png %%DATADIR%%/resources/inspector/Images/errorWave.png %%DATADIR%%/resources/inspector/Images/errorWave_2x.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg |