diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-04-13 10:37:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-04-13 10:37:15 +0000 |
| commit | e3b53fa1271f0ecfc6d650148fa6a2ce7fd59689 (patch) | |
| tree | 4282b6dacc1a8a20ec4bc04900a236b3e3fb61a0 /www/chromium | |
| parent | 92caaf920ca8e049c4565e93cf9eca2fbd6026d8 (diff) | |
www/chromium: update to 81.0.4044.92
Currently the camera and geolocation do not work.
Submitted by: Matthias Wolf
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/173
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/174
MFH: 2020Q2
Security: https://www.vuxml.org/freebsd/6e3b700a-7ca3-11ea-b594-3065ec8fd3ec.html
Notes
Notes:
svn path=/head/; revision=531592
Diffstat (limited to 'www/chromium')
439 files changed, 3315 insertions, 1895 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b8d9271e7671..ab4575717e14 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 80.0.3987.163 -PORTREVISION= 1 +PORTVERSION= 81.0.4044.92 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -104,8 +103,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. -GN_ARGS+= \ - clang_use_chrome_plugins=false \ +GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_one_click_signin=true \ @@ -157,11 +155,9 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false -CODECS_VARS= \ - GN_ARGS+=ffmpeg_branding="Chrome" \ +CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true -CODECS_VARS_OFF= \ - GN_ARGS+=ffmpeg_branding="Chromium" \ +CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 42234890479f..278fcde7421b 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1585876838 -SHA256 (chromium-80.0.3987.163.tar.xz) = b6ddefa9434877a9b923631b7525f7f2f80118dd986ecdac87f2c9f11f237346 -SIZE (chromium-80.0.3987.163.tar.xz) = 796981144 -SHA256 (chromium-80.0.3987.163-testdata.tar.xz) = 252745bd42ebb61a3eb01630d47529580cedaad1a606287ff4d649f2a8cdf1f8 -SIZE (chromium-80.0.3987.163-testdata.tar.xz) = 251251488 +TIMESTAMP = 1586156942 +SHA256 (chromium-81.0.4044.92.tar.xz) = a2cf3fd07a66330b189724cdcb4549ddac72705fba6adb33020bc6444efb1a44 +SIZE (chromium-81.0.4044.92.tar.xz) = 785906276 +SHA256 (chromium-81.0.4044.92-testdata.tar.xz) = 038b5c19607b93a8b5db97ed0aa05728de9de7f5c84265831d1e384524c70e68 +SIZE (chromium-81.0.4044.92-testdata.tar.xz) = 256999760 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 7879e66fc553..887a416b5f2d 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -38,50 +38,3 @@ EXPECT_CALL(callback_, OnError()).Times(2); ---- 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 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD - : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>( - data->Slice(offset, data->ReadUShort( - offset + Offset::kFormat0Length))) -- : reinterpret_cast<WritableFontData*>(NULL), -+ : static_cast<WritableFontData*>(NULL), - CMapFormat::kFormat2, cmap_id) { - // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. - } -@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD - : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>( - data->Slice(offset, data->ReadUShort( - offset + Offset::kFormat0Length))) -- : reinterpret_cast<ReadableFontData*>(NULL), -+ : static_cast<ReadableFontData*>(NULL), - CMapFormat::kFormat2, cmap_id) { - // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. - } -@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD - CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, - 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 @@ 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-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h index 47510992750c..a3130315b68e 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,38 +1,11 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-01-07 21:54:50 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-04-03 04:13:08 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -13,7 +13,7 @@ - #if defined(OS_MACOSX) - #include <mach/mach.h> +@@ -16,7 +16,7 @@ + #if defined(OS_ANDROID) + #include <sys/prctl.h> #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include <sys/resource.h> #include <algorithm> -@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce - } - } - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS) - - // 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 @@ bool AdjustAddressSpaceLimit(int64_t amount) { - // schemes that reduce that to 4 GiB. - constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB - --#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS) - - void* SystemAllocPagesInternal(void* hint, - size_t length, -@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal( - void FreePagesInternal(void* address, size_t length) { - CHECK(!munmap(address, length)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS) - // Restore the address space limit. - if (length >= kMinimumGuardedMemorySize) { - CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length))); diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 57e49e2f2877..0af06e81260e 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2020-03-03 18:53:46 UTC +--- BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ BUILD.gn -@@ -411,7 +411,7 @@ group("gn_all") { +@@ -418,7 +418,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -452,8 +452,6 @@ group("gn_all") { +@@ -459,8 +459,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -508,10 +506,6 @@ group("gn_all") { +@@ -515,10 +513,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -567,10 +561,6 @@ group("gn_all") { +@@ -575,10 +569,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -644,7 +634,7 @@ group("gn_all") { +@@ -652,7 +642,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)" ] } -@@ -782,7 +772,6 @@ group("gn_all") { +@@ -794,7 +784,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,7 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -918,7 +907,6 @@ if (is_chromeos) { +@@ -934,7 +923,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -65,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1069,7 +1057,7 @@ if (!is_ios) { +@@ -1092,7 +1080,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1078,7 +1066,7 @@ if (!is_ios) { +@@ -1101,7 +1089,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1220,9 +1208,6 @@ group("chromium_builder_perf") { +@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc new file mode 100644 index 000000000000..dc9a47b7323a --- /dev/null +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -0,0 +1,11 @@ +--- apps/app_restore_service_browsertest.cc.orig 2020-03-23 15:18:04 UTC ++++ apps/app_restore_service_browsertest.cc +@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc + } + + // Flaky: crbug.com/269613 +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + #define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored + #else + #define MAYBE_FileAccessIsRestored FileAccessIsRestored 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 e08ed66b48e5..d5bf99f6dba3 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 2020-03-03 18:53:46 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-03-16 18:40:27 UTC +++ ash/display/mirror_window_controller.cc -@@ -298,7 +298,11 @@ void MirrorWindowController::UpdateWindow( +@@ -276,7 +276,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 a5884f43793b..30f1110ebaff 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,28 @@ ---- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC +--- base/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ base/BUILD.gn -@@ -1302,7 +1302,7 @@ jumbo_component("base") { +@@ -912,7 +912,7 @@ jumbo_component("base") { + "timer/hi_res_timer_manager_posix.cc", + ] + +- if (!is_nacl && !is_mac && !is_ios) { ++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { + sources += [ + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", +@@ -921,6 +921,12 @@ jumbo_component("base") { + "profiler/thread_delegate_posix.h", + ] + } ++ ++ if (is_bsd) { ++ sources += [ ++ "profiler/stack_sampler_posix.cc", ++ ] ++ } + } + + if (is_win) { +@@ -1305,7 +1311,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 +31,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1328,7 +1328,7 @@ jumbo_component("base") { +@@ -1331,7 +1337,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +40,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1919,6 +1919,33 @@ jumbo_component("base") { +@@ -1930,6 +1936,33 @@ jumbo_component("base") { } } @@ -52,7 +74,16 @@ # iOS if (is_ios) { sources -= [ -@@ -3069,6 +3096,12 @@ test("base_unittests") { +@@ -2880,7 +2913,7 @@ test("base_unittests") { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", + ] +- if (!is_nacl && !is_mac && !is_ios) { ++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { + sources += [ "profiler/stack_copier_signal_unittest.cc" ] + } + } +@@ -3068,6 +3101,12 @@ test("base_unittests") { manifest = "//build/config/fuchsia/tests.cmx" } 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 c04a8ce22feb..c7b4ac21c804 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 2020-03-03 18:52:59 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-02-03 21:52:37 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -6,18 +6,28 @@ #include "base/compiler_specific.h" 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 ecab203687b6..1f7664842a07 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); @@ -34,3 +34,12 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); +@@ -550,7 +550,7 @@ static size_t GetAllocatedSize(void* ptr) { + static size_t GetAllocatedSize(void* ptr) { + return malloc_size(ptr); + } +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + static size_t GetAllocatedSize(void* ptr) { + return malloc_usable_size(ptr); + } 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 new file mode 100644 index 000000000000..12143fe54c50 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc @@ -0,0 +1,17 @@ +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-03-23 15:20:45 UTC ++++ base/allocator/partition_allocator/partition_alloc_unittest.cc +@@ -314,9 +314,13 @@ void FreeFullPage(PartitionPage* page) { + } + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + bool CheckPageInCore(void* ptr, bool in_core) { ++#if defined(OS_BSD) ++ char ret = 0; ++#else + unsigned char ret = 0; ++#endif + EXPECT_EQ(0, mincore(ptr, kSystemPageSize, &ret)); + return in_core == (ret & 1); + } diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 2cf3eb22fc0e..8eca61e3c66e 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,16 @@ ---- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC +--- base/debug/elf_reader.cc.orig 2020-02-24 18:39:05 UTC +++ base/debug/elf_reader.cc -@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -35,7 +35,9 @@ using Nhdr = Elf64_Nhdr; + using Word = Elf64_Word; + #endif + ++#if !defined(OS_BSD) + constexpr char kGnuNoteName[] = "GNU"; ++#endif + + // Returns a pointer to the header of the ELF binary mapped into memory, + // or a null pointer if the header is invalid. +@@ -98,6 +100,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); @@ -8,7 +18,7 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -107,6 +110,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } 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 d01a104d5413..21024cb210a8 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 2019-03-11 22:00:51 UTC +--- base/debug/proc_maps_linux.cc.orig 2020-03-16 18:39:41 UTC +++ base/debug/proc_maps_linux.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" @@ -9,3 +9,133 @@ #include <inttypes.h> #endif +@@ -28,6 +28,11 @@ + namespace base { + namespace debug { + ++#if defined(OS_BSD) ++const char kProcSelfMapsPath[] = "/proc/curproc/map"; ++#else ++const char kProcSelfMapsPath[] = "/proc/self/maps"; ++ + // Scans |proc_maps| starting from |pos| returning true if the gate VMA was + // found, otherwise returns false. + static bool ContainsGateVMA(std::string* proc_maps, size_t pos) { +@@ -43,15 +48,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si + return false; + #endif + } ++#endif + + bool ReadProcMaps(std::string* proc_maps) { + // seq_file only writes out a page-sized amount on each call. Refer to header + // file for details. + const long kReadSize = sysconf(_SC_PAGESIZE); + +- base::ScopedFD fd(HANDLE_EINTR(open("/proc/self/maps", O_RDONLY))); ++ base::ScopedFD fd(HANDLE_EINTR(open(kProcSelfMapsPath, O_RDONLY))); + if (!fd.is_valid()) { +- DPLOG(ERROR) << "Couldn't open /proc/self/maps"; ++ DPLOG(ERROR) << "Couldn't open " << kProcSelfMapsPath; + return false; + } + proc_maps->clear(); +@@ -65,7 +71,7 @@ bool ReadProcMaps(std::string* proc_maps) { + + ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize)); + if (bytes_read < 0) { +- DPLOG(ERROR) << "Couldn't read /proc/self/maps"; ++ DPLOG(ERROR) << "Couldn't read " << kProcSelfMapsPath; + proc_maps->clear(); + return false; + } +@@ -76,6 +82,7 @@ bool ReadProcMaps(std::string* proc_maps) { + if (bytes_read == 0) + break; + ++#if !defined(OS_BSD) + // The gate VMA is handled as a special case after seq_file has finished + // iterating through all entries in the virtual memory table. + // +@@ -86,6 +93,7 @@ bool ReadProcMaps(std::string* proc_maps) { + // Avoid this by searching for the gate VMA and breaking early. + if (ContainsGateVMA(proc_maps, pos)) + break; ++#endif + } + + return true; +@@ -114,10 +122,32 @@ bool ParseProcMaps(const std::string& input, + MappedMemoryRegion region; + const char* line = lines[i].c_str(); + char permissions[5] = {'\0'}; // Ensure NUL-terminated string. ++ int path_index = 0; ++ ++#if defined(OS_BSD) ++ if (lines[i].empty()) ++ continue; ++ ++ ++ char cow; ++ ++ // Format: ++ // ++ // start end resident private_resident obj perms ref_count shadow_count flags cow needs_copy type fullpath cred ruid ++ // 0x200000 0x202000 2 6 0xfffff80005be9000 r-- 3 1 0x1000 COW NC vnode /bin/cat NCH -1 ++ // ++ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*llx %3c %*d %*d %*x %c%*s %*s %*s %n", ++ ®ion.start, ®ion.end, permissions, &cow, &path_index) < 4) { ++ DPLOG(WARNING) << "sscanf failed for line: " << line; ++ return false; ++ } ++ ++ const char* fullpath = line + path_index; ++ const char* cred = strchr(fullpath, ' '); ++#else + uint8_t dev_major = 0; + uint8_t dev_minor = 0; + long inode = 0; +- int path_index = 0; + + // Sample format from man 5 proc: + // +@@ -133,6 +163,7 @@ bool ParseProcMaps(const std::string& input, + DPLOG(WARNING) << "sscanf failed for line: " << line; + return false; + } ++#endif + + region.permissions = 0; + +@@ -151,14 +182,31 @@ bool ParseProcMaps(const std::string& input, + else if (permissions[2] != '-') + return false; + ++#if defined(OS_BSD) ++ if (cow == 'C') { ++ region.permissions |= MappedMemoryRegion::PRIVATE; ++ } else if (cow != 'N') { ++ DPLOG(WARNING) << "unknown value for COW in line " << line << ": " << cow; ++ return false; ++ } ++#else + if (permissions[3] == 'p') + region.permissions |= MappedMemoryRegion::PRIVATE; + else if (permissions[3] != 's' && permissions[3] != 'S') // Shared memory. + return false; ++#endif + + // Pushing then assigning saves us a string copy. + regions.push_back(region); ++#if defined(OS_BSD) ++ if (cred != nullptr) { ++ regions.back().path.assign(line + path_index, cred - fullpath); ++ } else { ++ regions.back().path.assign(line + path_index); ++ } ++#else + regions.back().path.assign(line + path_index); ++#endif + } + + regions_out->swap(regions); 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 38beddf996ab..f3b967c844e2 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2019-09-09 21:55:05 UTC +--- base/debug/stack_trace_posix.cc.orig 2020-03-16 18:39:41 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,23 +9,15 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -657,6 +657,11 @@ class SandboxSymbolizeHelper { - // for the modules that are loaded in the current process. - // Returns true on success. - bool CacheMemoryRegions() { +@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper { + // Skip regions with empty file names. + continue; + } +#if defined(OS_BSD) -+ // TODO (rene) avoid link error, implement something? -+ NOTIMPLEMENTED(); -+ return false; -+#else - // Reads /proc/self/maps. - std::string contents; - if (!ReadProcMaps(&contents)) { -@@ -674,6 +679,7 @@ class SandboxSymbolizeHelper { - - is_initialized_ = true; - return true; ++ if (region.path[0] == '-') { ++#else + if (region.path[0] == '[') { +#endif - } - - // Opens all object files and caches their file descriptors. + // Skip pseudo-paths, like [stack], [vdso], [heap], etc ... + continue; + } diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc new file mode 100644 index 000000000000..933a8e8ce401 --- /dev/null +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -0,0 +1,31 @@ +--- base/debug/stack_trace_unittest.cc.orig 2020-03-23 14:01:09 UTC ++++ base/debug/stack_trace_unittest.cc +@@ -86,6 +86,7 @@ TEST_F(StackTraceTest, OutputToStream) { + std::string::npos) + << "Unable to resolve symbols."; + ++#if !defined(OS_BSD) + // Expect a demangled symbol. + // Note that Windows Release builds omit the function parameters from the + // demangled stack output, otherwise this could be "testing::Test::Run()". +@@ -103,9 +104,10 @@ TEST_F(StackTraceTest, OutputToStream) { + EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos) + << "Expected to find " << __func__ << " in backtrace:\n" + << backtrace_message; ++#endif + } + +-#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) ++#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) + // Disabled in Official builds, where Link-Time Optimization can result in two + // or fewer stack frames being available, causing the test to fail. + TEST_F(StackTraceTest, TruncatedTrace) { +@@ -119,7 +121,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { + truncated.Addresses(&count); + EXPECT_EQ(2u, count); + } +-#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) ++#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) + + // The test is used for manual testing, e.g., to see the raw output. + TEST_F(StackTraceTest, DebugOutputToStream) { 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 25c8b6849e54..26521d022831 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 2019-04-30 22:22:28 UTC +--- base/files/file_path_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_unittest.cc -@@ -1139,7 +1139,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1149,7 +1149,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.cc b/www/chromium/files/patch-base_files_file__path__watcher.cc index 8617c587be43..87abcb7fbda1 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher.cc @@ -1,11 +1,15 @@ ---- base/files/file_path_watcher.cc.orig 2019-07-29 18:12:09 UTC +--- base/files/file_path_watcher.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_watcher.cc -@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() { +@@ -20,10 +20,10 @@ FilePathWatcher::~FilePathWatcher() { // static bool FilePathWatcher::RecursiveWatchAvailable() { #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ - defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) ++ (defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_ANDROID) || defined(OS_AIX) return true; #else - // FSEvents isn't available on iOS. +- // FSEvents isn't available on iOS. ++ // FSEvents isn't available on iOS and the kqueue watcher. + return false; + #endif + } 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 c5e3e567015b..fc76cd1b16b3 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,4 +1,4 @@ ---- base/files/file_path_watcher_stub.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_stub.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_watcher_stub.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -20,20 +20,22 @@ namespace base { -@@ -22,12 +23,26 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl +@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl bool Watch(const FilePath& path, bool recursive, const FilePathWatcher::Callback& callback) override { -- return false; ++#if defined(OS_BSD) + DCHECK(!impl_.get()); + if (recursive) { -+ if (!FilePathWatcher::RecursiveWatchAvailable()) -+ return false; ++ return false; + } else { -+ impl_ = std::make_unique<FilePathWatcherKQueue>(); ++ impl_ = std::make_unique<FilePathWatcherKQueue>(); + } + DCHECK(impl_.get()); + return impl_->Watch(path, recursive, callback); ++#else + return false; ++#endif } - void Cancel() 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 9e792e43db08..5e7e385e5e23 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,4 +1,4 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2019-10-21 19:06:18 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_watcher_unittest.cc @@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; @@ -9,3 +9,33 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; +@@ -808,7 +808,7 @@ enum Permission { + Execute + }; + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { + struct stat stat_buf; + +@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi + } + return chmod(path.value().c_str(), stat_buf.st_mode) == 0; + } +-#endif // defined(OS_MACOSX) ++#endif // defined(OS_MACOSX) || defined(OS_BSD) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // Linux implementation of FilePathWatcher doesn't catch attribute changes. + // http://crbug.com/78043 + // Windows implementation of FilePathWatcher catches attribute changes that +@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { + ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); + } + +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + } // namespace + + } // namespace base diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 3ed565dd5e58..65171a867e06 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 2019-12-16 21:51:21 UTC +--- base/files/file_util.h.orig 2020-03-16 18:39:41 UTC +++ base/files/file_util.h -@@ -512,7 +512,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -519,7 +519,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 index c9ecfc25cf3c..4342a618c454 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_posix.cc.orig 2020-03-03 18:52:59 UTC +--- base/files/file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +++ base/files/file_util_posix.cc @@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc new file mode 100644 index 000000000000..5ddff833acb1 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -0,0 +1,20 @@ +--- base/files/file_util_unittest.cc.orig 2020-03-23 13:34:59 UTC ++++ base/files/file_util_unittest.cc +@@ -3434,7 +3434,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { + } + #endif // defined(OS_WIN) + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { + FilePath file_path("/proc/cpuinfo"); + std::string data = "temp"; +@@ -3452,7 +3452,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste + + EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + TEST_F(FileUtilTest, ReadFileToStringWithLargeFile) { + std::string data(kLargeFileSize, 'c'); diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index ee299d6fd853..34f2453a25de 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC +--- base/i18n/icu_util.cc.orig 2020-03-16 18:40:27 UTC +++ base/i18n/icu_util.cc -@@ -43,7 +43,7 @@ +@@ -46,7 +46,7 @@ #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -288,7 +288,7 @@ void InitializeIcuTimeZone() { +@@ -341,7 +341,7 @@ void InitializeIcuTimeZone() { fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif defined(OS_LINUX) && !defined(IS_CHROMECAST) -+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) +-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) // To respond to the timezone change properly, the default timezone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc new file mode 100644 index 000000000000..b50f404a2764 --- /dev/null +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -0,0 +1,63 @@ +--- base/memory/discardable_memory.cc.orig 2020-02-07 10:23:12 UTC ++++ base/memory/discardable_memory.cc +@@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ + "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // defined(OS_POSIX) + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kDiscardableMemoryBackingTrial{ + "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; + +@@ -41,13 +41,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> + DiscardableMemoryTrialGroup::kEmulatedSharedMemory, + &kDiscardableMemoryBackingParamOptions}; + +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace features + + namespace { + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + DiscardableMemoryBacking GetBackingForFieldTrial() { + DiscardableMemoryTrialGroup trial_group = +@@ -61,11 +61,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { + } + NOTREACHED(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + // Probe capabilities of this device to determine whether we should participate + // in the discardable memory backing trial. +@@ -87,18 +87,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin + DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); + return features::kDiscardableMemoryBackingParam.Get(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + DiscardableMemory::DiscardableMemory() = default; + + DiscardableMemory::~DiscardableMemory() = default; + + DiscardableMemoryBacking GetDiscardableMemoryBacking() { +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + if (DiscardableMemoryBackingFieldTrialIsEnabled()) { + return GetBackingForFieldTrial(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_ANDROID) + if (ashmem_device_is_supported()) diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h new file mode 100644 index 000000000000..c8225e74d049 --- /dev/null +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -0,0 +1,19 @@ +--- base/memory/discardable_memory_internal.h.orig 2020-02-07 10:22:39 UTC ++++ base/memory/discardable_memory_internal.h +@@ -10,7 +10,7 @@ + #include "base/metrics/field_trial_params.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + namespace base { + +@@ -47,6 +47,6 @@ GetDiscardableMemoryBackingFieldTrialGroup(); + + } // namespace base + +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_ diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 63c4145feb53..5368440e775b 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-03 18:53:47 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-16 18:39:41 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -267,7 +267,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -282,7 +282,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index 77da780e4912..477b8029c4a6 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2020-03-03 18:52:59 UTC +--- base/memory/platform_shared_memory_region.h.orig 2020-02-03 21:52:37 UTC +++ base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 16123e3aa1ae..c5f57c29c6bc 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-03-03 18:52:59 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-02-03 21:52:37 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; diff --git a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc new file mode 100644 index 000000000000..b2525b4381ee --- /dev/null +++ b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc @@ -0,0 +1,16 @@ +--- base/memory/shared_memory_region_unittest.cc.orig 2020-03-23 16:31:23 UTC ++++ base/memory/shared_memory_region_unittest.cc +@@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs + std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize); + ASSERT_TRUE(region.IsValid()); + ASSERT_TRUE(rw_mapping.IsValid()); ++#if !defined(OS_BSD) ++ // On FreeBSD, mmap() does not require an aligned offset + off_t offset = kDataSize / 2; + typename TypeParam::MappingType mapping = + region.MapAt(offset, kDataSize - offset); + EXPECT_FALSE(mapping.IsValid()); ++#endif + } + + TYPED_TEST(SharedMemoryRegionTest, MapZeroBytesFails) { diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc new file mode 100644 index 000000000000..20ffac278abc --- /dev/null +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -0,0 +1,11 @@ +--- base/path_service_unittest.cc.orig 2020-03-23 15:23:42 UTC ++++ base/path_service_unittest.cc +@@ -36,7 +36,7 @@ bool ReturnsValidPath(int dir_type) { + if (dir_type == DIR_CACHE) + check_path_exists = false; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), + // but it doesn't exist. + if (dir_type == DIR_USER_DESKTOP) diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index ca42b91c4296..abfff7cd44ce 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,16 +1,97 @@ ---- base/process/internal_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 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; +@@ -29,7 +29,11 @@ namespace internal { -+#if !defined(OS_BSD) - if (!ReadFileToString(file, buffer)) { + const char kProcDir[] = "/proc"; + ++#if defined(OS_BSD) ++const char kStatFile[] = "status"; ++#else + const char kStatFile[] = "stat"; ++#endif + + FilePath GetProcPidDir(pid_t pid) { + return FilePath(kProcDir).Append(NumberToString(pid)); +@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } -+#endif + return !buffer->empty(); } +@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, + if (stats_data.empty()) + return false; + ++#if defined(OS_BSD) ++ proc_stats->clear(); ++ ++ std::vector<std::string> other_stats = SplitString( ++ stats_data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); ++ ++ for (const auto& i : other_stats) { ++ auto pos = i.find(','); ++ ++ if (pos == std::string::npos) { ++ proc_stats->push_back(i); ++ } else { ++ proc_stats->push_back(i.substr(0, pos)); ++ } ++ } ++#else + // The stat file is formatted as: + // pid (process name) data1 data2 .... dataN + // Look for the closing paren by scanning backwards, to avoid being fooled by +@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + for (const auto& i : other_stats) + proc_stats->push_back(i); ++#endif + return true; + } + +@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro + } + + int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { ++#if defined(OS_BSD) ++ FilePath stat_file = FilePath(kProcDir).Append("curproc").Append(kStatFile); ++#else + FilePath stat_file = FilePath(kProcDir).Append("self").Append(kStatFile); ++#endif + return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); + } + +@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, + } + + Time GetBootTime() { ++#if defined(OS_BSD) ++ return Time(); ++#else + FilePath path("/proc/stat"); + std::string contents; + if (!ReadProcFile(path, &contents)) +@@ -184,9 +213,13 @@ Time GetBootTime() { + if (!StringToInt(btime_it->second, &btime)) + return Time(); + return Time::FromTimeT(btime); ++#endif + } + + TimeDelta GetUserCpuTimeSinceBoot() { ++#if defined(OS_BSD) ++ return TimeDelta(); ++#else + FilePath path("/proc/stat"); + std::string contents; + if (!ReadProcFile(path, &contents)) +@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { + return TimeDelta(); + + return ClockTicksToTimeDelta(user + nice); ++#endif + } + + TimeDelta ClockTicksToTimeDelta(int clock_ticks) { diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index ba0e347dbe91..bfa9c8630afd 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 2019-03-11 22:00:51 UTC +--- base/process/internal_linux.h.orig 2020-03-16 18:39:41 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ @@ -9,3 +9,26 @@ namespace base { class Time; +@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data, + // If the ordering ever changes, carefully review functions that use these + // values. + enum ProcStatsFields { ++#if defined(OS_BSD) ++ VM_COMM = 0, // Command name. ++ VM_PPID = 2, // Parent process id. ++ VM_PGRP = 3, // Process group id. ++ VM_STARTTIME = 7, // The process start time. ++ VM_UTIME = 8, // The user time. ++ VM_STIME = 9, // The system time ++#else + VM_COMM = 1, // Filename of executable, without parentheses. + VM_STATE = 2, // Letter indicating the state of the process. + VM_PPID = 3, // PID of the parent. +@@ -62,6 +72,7 @@ enum ProcStatsFields { + VM_STARTTIME = 21, // The time the process started in clock ticks. + VM_VSIZE = 22, // Virtual memory size in bytes. + VM_RSS = 23, // Resident Set Size in pages. ++#endif + }; + + // Reads the |field_num|th field from |proc_stats|. Returns 0 on failure. diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 590c0daa084c..75708ea5561e 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2020-03-03 18:52:59 UTC +--- base/process/launch.h.orig 2020-02-03 21:52:37 UTC +++ base/process/launch.h @@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index f8e1d34c369d..ff61c2e5408b 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,7 +1,7 @@ ---- base/process/memory.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/memory.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/memory.cc -@@ -10,7 +10,7 @@ - namespace base { +@@ -42,7 +42,7 @@ void OnNoMemoryInternal(size_t size) { + } // namespace internal // Defined in memory_win.cc for Windows. -#if !defined(OS_WIN) @@ -9,8 +9,8 @@ namespace { -@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - #endif +@@ -61,7 +61,7 @@ void TerminateBecauseOutOfMemory(size_t size) { + #endif // !defined(OS_WIN) // Defined in memory_mac.mm for Mac. -#if !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 1a2457e0d3df..82dcfd37c1c7 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 2019-10-21 19:06:18 UTC +--- base/process/memory_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/memory_unittest.cc -@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -106,7 +106,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 { -@@ -527,5 +527,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -589,5 +589,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__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index b385b7c7908a..2ec55582fbfa 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,14 +1,27 @@ ---- base/process/process_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_linux.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/process_linux.cc -@@ -88,6 +88,7 @@ Time Process::CreationTime() const { +@@ -79,6 +79,9 @@ Time Process::CreationTime() const { + internal::VM_STARTTIME) + : internal::ReadProcStatsAndGetFieldAsInt64( + Pid(), internal::VM_STARTTIME); ++#if defined(OS_BSD) ++ return Time::FromTimeT(start_ticks); ++#else + if (!start_ticks) + return Time(); + TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); +@@ -86,8 +89,10 @@ Time Process::CreationTime() const { + if (boot_time.is_null()) + return Time(); return Time(boot_time + start_offset); ++#endif } +#if !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { #if defined(OS_CHROMEOS) -@@ -139,6 +140,7 @@ bool Process::SetProcessBackgrounded(bool background) +@@ -139,6 +144,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc new file mode 100644 index 000000000000..e6378dd51b22 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -0,0 +1,16 @@ +--- base/process/process_util_unittest.cc.orig 2020-03-23 15:26:12 UTC ++++ base/process/process_util_unittest.cc +@@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli + options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + options.clone_flags = clone_flags; + #else + CHECK_EQ(0, clone_flags); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + EXPECT_TRUE(LaunchProcess(cmdline, options).IsValid()); + write_pipe.Close(); diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index 310559c5bd55..ea2c126353b4 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,4 +1,4 @@ ---- base/profiler/register_context.h.orig 2020-03-03 18:53:47 UTC +--- base/profiler/register_context.h.orig 2020-03-16 18:39:41 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include <windows.h> @@ -9,7 +9,7 @@ #include <sys/ucontext.h> #endif -@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc +@@ -165,6 +165,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc } #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index ae7ad53dfd7d..96db1204abdd 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2020-03-03 18:52:59 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-02-07 10:24:19 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -7,7 +7,7 @@ namespace base { diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index 5021fd2c6d04..589e083be74d 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2020-03-05 05:52:21 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2020-02-07 10:24:33 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc index 6a2ff859b823..b9e757471f17 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_copier_signal.cc.orig 2020-03-03 18:53:47 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-04-10 00:33:01 UTC +++ base/profiler/stack_copier_signal.cc -@@ -4,10 +4,16 @@ +@@ -4,7 +4,14 @@ #include "base/profiler/stack_copier_signal.h" @@ -14,11 +14,8 @@ +#endif #include <signal.h> #include <sys/ucontext.h> --#include <syscall.h> - - #include <atomic> - -@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent { + #include <syscall.h> +@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -32,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent { +@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -45,7 +42,7 @@ } private: -@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; @@ -57,6 +54,7 @@ } +#elif defined(OS_FREEBSD) + if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { ++ NOTREACHED(); + return false; + } +#endif diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index 232e4a5e1fe0..0d7ec24c9210 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,16 +1,16 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-03-03 18:53:47 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2020-04-03 04:10:36 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -3,6 +3,9 @@ - // found in the LICENSE file. +@@ -9,6 +9,9 @@ + #include "base/stl_util.h" - #include <pthread.h> -+#if defined(__FreeBSD__) + #include "build/build_config.h" ++#if defined(OS_FREEBSD) +#include <pthread_np.h> +#endif - #include "base/process/process_handle.h" - #include "base/profiler/thread_delegate_posix.h" -@@ -17,12 +20,20 @@ namespace { + namespace base { + +@@ -17,7 +20,12 @@ uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,21 +23,25 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; - pthread_attr_getstack(&attr, &address, &size); - const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; +@@ -93,16 +103,33 @@ + return { + // Return the set of callee-save registers per the i386 System V ABI + // section 2.2.3, plus the stack pointer. +#if defined(OS_FREEBSD) -+ pthread_attr_destroy(&attr); ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_ebx), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_ebp), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_esi), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_edi), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_esp), ++#else + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EBX]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EBP]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_ESI]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EDI]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_ESP]), +#endif - return base_address; - } - -@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist - for (size_t i = 19; i <= 29; ++i) - registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i])); - return registers; --#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) && -- // defined(ARCH_CPU_32_BITS) -+#elif defined(ARCH_CPU_X86_64) + }; + #elif defined(ARCH_CPU_X86_FAMILY) && defined(ARCH_CPU_64_BITS) return { // Return the set of callee-save registers per the x86-64 System V ABI // section 3.2.1, plus the stack pointer. @@ -53,7 +57,7 @@ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]), -@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -110,6 +137,7 @@ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 48f85cbb38e1..2159a51c6b6f 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,7 +1,7 @@ ---- base/system/sys_info.h.orig 2019-12-16 21:50:40 UTC +--- base/system/sys_info.h.orig 2020-03-16 18:39:41 UTC +++ base/system/sys_info.h -@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo { - // See also SysUtils.java, method isLowEndDevice. +@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo { + // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); + static uint64_t MaxSharedMemorySize(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo { +@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_test_fontconfig__util__linux.cc b/www/chromium/files/patch-base_test_fontconfig__util__linux.cc index 1b268188190b..eb6ff5024c46 100644 --- a/www/chromium/files/patch-base_test_fontconfig__util__linux.cc +++ b/www/chromium/files/patch-base_test_fontconfig__util__linux.cc @@ -1,4 +1,4 @@ ---- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC +--- base/test/fontconfig_util_linux.cc.orig 2020-02-03 21:52:37 UTC +++ base/test/fontconfig_util_linux.cc @@ -6,22 +6,397 @@ 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 ef9b64f86bfc..4ec5e581d6b6 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 2019-09-09 21:55:05 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-03-16 18:40:27 UTC +++ base/test/launcher/test_launcher.cc -@@ -54,6 +54,7 @@ +@@ -55,6 +55,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,3 +8,12 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" +@@ -551,7 +552,7 @@ ChildProcessResults DoLaunchChildTestProcess( + #if !defined(OS_FUCHSIA) + options.new_process_group = true; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + options.kill_on_parent_death = true; + #endif + 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 deleted file mode 100644 index 76dce43e7393..000000000000 --- a/www/chromium/files/patch-base_test_test__file__util__linux.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- 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; -+#if !defined(OS_BSD) - if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) - return false; -+#endif - return true; - } - 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 2fec80954b3c..a65fcc61d56b 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,4 +1,4 @@ ---- base/test/test_file_util_posix.cc.orig 2020-03-03 18:52:59 UTC +--- base/test/test_file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +++ base/test/test_file_util_posix.cc @@ -84,7 +84,7 @@ void SyncPageCacheToDisk() { sync(); diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc new file mode 100644 index 000000000000..74f7f01726cc --- /dev/null +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -0,0 +1,37 @@ +--- base/test/test_suite.cc.orig 2020-03-23 15:30:45 UTC ++++ base/test/test_suite.cc +@@ -68,7 +68,7 @@ + #include "base/test/test_support_ios.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/test/fontconfig_util_linux.h" + #endif + +@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { + testing::GTEST_FLAG(catch_exceptions) = false; + #endif + EnableTerminationOnHeapCorruption(); +-#if defined(OS_LINUX) && defined(USE_AURA) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) + // When calling native char conversion functions (e.g wrctomb) we need to + // have the locale set. In the absence of such a call the "C" locale is the + // default. In the gtk code (below) gtk_init() implicitly sets a locale. + setlocale(LC_ALL, ""); + // We still need number to string conversions to be locale insensitive. + setlocale(LC_NUMERIC, "C"); +-#endif // defined(OS_LINUX) && defined(USE_AURA) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) + + // On Android, AtExitManager is created in + // testing/android/native_test_wrapper.cc before main() is called. +@@ -620,7 +620,7 @@ void TestSuite::Initialize() { + // TODO(jshin): Should we set the locale via an OS X locale API here? + i18n::SetICUDefaultLocale("en_US"); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SetUpFontconfig(); + #endif + diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index 56e93cf75760..0ff2fc68f36a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,15 +1,6 @@ ---- base/threading/platform_thread.h.orig 2020-03-03 18:52:59 UTC +--- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +++ base/threading/platform_thread.h -@@ -36,6 +36,8 @@ typedef DWORD PlatformThreadId; - typedef zx_handle_t PlatformThreadId; - #elif defined(OS_MACOSX) - typedef mach_port_t PlatformThreadId; -+#elif defined(OS_FREEBSD) -+typedef long PlatformThreadId; - #elif defined(OS_POSIX) - typedef pid_t PlatformThreadId; - #endif -@@ -221,7 +223,7 @@ class BASE_EXPORT PlatformThread { +@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); 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 ba0f3ee4b84e..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,17 +1,6 @@ ---- base/threading/platform_thread_posix.cc.orig 2020-03-03 18:53:47 UTC +--- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC +++ base/threading/platform_thread_posix.cc -@@ -32,6 +32,10 @@ - #include <sys/syscall.h> - #endif - -+#if defined(OS_FREEBSD) -+#include <sys/thr.h> -+#endif -+ - #if defined(OS_FUCHSIA) - #include <zircon/process.h> - #else -@@ -66,7 +70,7 @@ void* ThreadFunc(void* params) { +@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); @@ -20,14 +9,3 @@ // Threads on linux/android may inherit their priority from the thread // where they were created. This explicitly sets the priority of all new // threads. -@@ -188,6 +192,10 @@ PlatformThreadId PlatformThread::CurrentId() { - return g_thread_id; - #elif defined(OS_ANDROID) - return gettid(); -+#elif defined(OS_FREEBSD) -+ long x; -+ thr_self(&x); -+ return x; - #elif defined(OS_FUCHSIA) - return zx_thread_self(); - #elif defined(OS_SOLARIS) || defined(OS_QNX) diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc new file mode 100644 index 000000000000..b998b2d83f2c --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -0,0 +1,20 @@ +--- base/threading/platform_thread_unittest.cc.orig 2020-03-23 15:31:47 UTC ++++ base/threading/platform_thread_unittest.cc +@@ -302,7 +302,7 @@ TEST(PlatformThreadTest, + // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this + // proprerty changes for a given platform. + TEST(PlatformThreadTest, CanIncreaseThreadPriority) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be + // able to increase priority to any level. + constexpr bool kCanIncreasePriority = false; +@@ -398,7 +398,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { + TEST(PlatformThreadTest, GetDefaultThreadStackSize) { + size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); + #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !defined(THREAD_SANITIZER)) || \ ++ ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(THREAD_SANITIZER)) || \ + (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER)) + EXPECT_EQ(0u, stack_size); + #else 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 04dd6804af30..fef6ba833abf 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,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2019-12-16 21:50:40 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2020-03-16 18:39:41 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ @@ -18,4 +18,4 @@ + allocated_objects_size = 0; #else struct mallinfo info = mallinfo(); - #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + // In case of Android's jemalloc |arena| is 0 and the outer pages size is diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index ff4041f01ba3..5eadb70887bf 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/BUILD.gn.orig 2020-03-03 18:53:47 UTC +--- build/config/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. @@ -19,7 +19,7 @@ ] } } -@@ -321,7 +319,7 @@ config("executable_config") { +@@ -315,7 +313,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_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index f675da2c0714..76e9706a7967 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,15 +1,15 @@ ---- build/config/compiler/BUILD.gn.orig 2020-03-03 18:53:47 UTC +--- build/config/compiler/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ build/config/compiler/BUILD.gn -@@ -57,7 +57,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 = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -308,7 +308,7 @@ config("compiler") { +@@ -137,7 +137,7 @@ declare_args() { + # TODO(vitalybuka): + # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. + # 'use_xcode_clang' may call old clang. +- init_stack_vars = !is_android && !use_xcode_clang && !is_official_build ++ init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd + } + + declare_args() { +@@ -298,7 +298,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && @@ -18,7 +18,7 @@ # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -403,7 +403,7 @@ config("compiler") { +@@ -393,7 +393,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", -@@ -503,7 +503,7 @@ config("compiler") { +@@ -486,7 +486,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -773,7 +773,7 @@ config("compiler_cpu_abi") { +@@ -767,7 +767,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1124,7 +1124,7 @@ config("compiler_deterministic") { +@@ -1118,7 +1118,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1513,7 +1513,7 @@ config("default_warnings") { +@@ -1507,7 +1507,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1761,7 +1761,7 @@ config("thin_archive") { +@@ -1741,7 +1741,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). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2351,7 +2351,7 @@ config("symbols") { +@@ -2334,7 +2334,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) { @@ -81,7 +81,7 @@ } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2372,7 +2372,7 @@ config("symbols") { +@@ -2355,7 +2355,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 7cafcf425f1e..5826499ed89a 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,15 @@ ---- build/config/compiler/compiler.gni.orig 2020-03-03 18:53:47 UTC +--- build/config/compiler/compiler.gni.orig 2020-03-16 18:40:27 UTC +++ build/config/compiler/compiler.gni -@@ -187,7 +187,7 @@ declare_args() { +@@ -47,7 +47,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 = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -200,7 +200,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-build_linux_unbundle_libxml.gn b/www/chromium/files/patch-build_linux_unbundle_libxml.gn deleted file mode 100644 index 20b0ffcaad5f..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_libxml.gn +++ /dev/null @@ -1,53 +0,0 @@ ---- build/linux/unbundle/libxml.gn.orig 2020-03-03 18:53:47 UTC -+++ build/linux/unbundle/libxml.gn -@@ -8,11 +8,48 @@ pkg_config("system_libxml") { - packages = [ "libxml-2.0" ] - } - --static_library("libxml") { -+source_set("libxml") { -+ public_configs = [ ":system_libxml" ] -+} -+ -+static_library("libxml_utils") { -+ # Do not expand this visibility list without first consulting with the -+ # Security Team. -+ visibility = [ -+ ":xml_reader", -+ ":xml_writer", -+ "//base/test:test_support", -+ "//services/data_decoder:xml_parser_fuzzer", -+ ] - sources = [ - "chromium/libxml_utils.cc", - "chromium/libxml_utils.h", - ] -- - public_configs = [ ":system_libxml" ] -+} -+ -+static_library("xml_reader") { -+ # Do not expand this visibility list without first consulting with the -+ # Security Team. -+ visibility = [ -+ "//base/test:test_support", -+ "//components/policy/core/common:unit_tests", -+ "//services/data_decoder:*", -+ "//tools/traffic_annotation/auditor:auditor_sources", -+ ] -+ sources = [ -+ "chromium/xml_reader.cc", -+ "chromium/xml_reader.h", -+ ] -+ deps = [ ":libxml_utils" ] -+} -+ -+static_library("xml_writer") { -+ # The XmlWriter is considered safe to use from any target. -+ visibility = [ "*" ] -+ sources = [ -+ "chromium/xml_writer.cc", -+ "chromium/xml_writer.h", -+ ] -+ deps = [ ":libxml_utils" ] - } diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index f2adaef3dd3d..4d315485b923 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-10-21 19:06:18 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-03-16 18:40:27 UTC +++ build/toolchain/gcc_toolchain.gni @@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { enable_resource_whitelist_generation = false @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -589,13 +594,23 @@ template("clang_toolchain") { +@@ -577,13 +582,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 384befab6e63..f2e64c64d738 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,20 +1,18 @@ ---- cc/BUILD.gn.orig 2020-03-03 18:53:47 UTC +--- cc/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ cc/BUILD.gn -@@ -578,7 +578,7 @@ cc_test_static_library("test_support") { +@@ -582,7 +582,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } - if (!is_android) { + if (!is_android && !is_bsd) { - data_deps = [ - "//third_party/mesa_headers", - ] -@@ -783,9 +783,6 @@ cc_test("cc_unittests") { - "//ui/gfx/geometry", - "//ui/gl", - "//ui/gl:test_support", -- ] -- data_deps = [ + data_deps = [ "//third_party/mesa_headers" ] + } + } +@@ -788,7 +788,6 @@ cc_test("cc_unittests") { + ] + data_deps = [ + "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 020f2f4e038d..d8e7bed84ae0 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-03-03 18:53:47 UTC +--- cc/trees/property_tree.cc.orig 2020-03-16 18:40:27 UTC +++ cc/trees/property_tree.cc -@@ -1234,13 +1234,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); 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 b3ad808ce585..983a9acf8891 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,4 +1,4 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-03-03 18:53:48 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-02-03 21:53:28 UTC +++ chrome/app/chrome_command_ids.h @@ -62,7 +62,7 @@ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 diff --git a/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc deleted file mode 100644 index 216a2d3e3491..000000000000 --- a/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2020-03-03 18:53:48 UTC -+++ chrome/app/chrome_content_browser_overlay_manifest.cc -@@ -60,7 +60,7 @@ - #include "chrome/browser/ui/webui/app_management/app_management.mojom.h" - #endif - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - #include "chrome/browser/ui/webui/discards/discards.mojom.h" - #endif -@@ -145,7 +145,7 @@ const service_manager::Manifest& GetChromeContentBrows - #else - app_management::mojom::PageHandlerFactory, - #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - discards::mojom::DetailsProvider, discards::mojom::GraphDump, - #endif 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 cb6504532d33..88a9416974a2 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-03-03 18:53:48 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-03-16 18:40:27 UTC +++ chrome/app/chrome_main_delegate.cc @@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -142,7 +142,7 @@ +@@ -142,12 +142,12 @@ #include "v8/include/v8.h" #endif @@ -18,6 +18,12 @@ #include "base/environment.h" #endif + #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/policy/policy_path_parser.h" + #include "components/crash/content/app/crashpad.h" + #endif @@ -246,7 +246,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -88,7 +94,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -684,7 +684,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -97,7 +103,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -708,7 +708,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -106,7 +112,7 @@ nacl::RegisterPathProvider(); #endif -@@ -902,7 +902,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -115,7 +121,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1026,7 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -124,7 +130,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -133,7 +139,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1057,7 +1057,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1059,7 +1059,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. @@ -142,3 +148,12 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) +@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess( + // This entry is not needed on Linux, where the NaCl loader + // process is launched via nacl_helper instead. + #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ +- !defined(OS_LINUX) ++ !defined(OS_LINUX) && !defined(OS_BSD) + {switches::kNaClLoaderProcess, NaClMain}, + #else + {"<invalid>", NULL}, // To avoid constant array of size 0 diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 03a87cb4cb4c..7a0c0ed086dc 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,15 +1,15 @@ ---- chrome/app/chromium_strings.grd.orig 2020-03-03 18:53:48 UTC +--- chrome/app/chromium_strings.grd.orig 2020-03-16 18:40:27 UTC +++ chrome/app/chromium_strings.grd -@@ -623,7 +623,7 @@ Chromium is unable to recover your settings. +@@ -649,7 +649,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -727,7 +727,7 @@ Chromium is unable to recover your settings. +@@ -750,7 +750,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,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> -@@ -960,7 +960,7 @@ Chromium is unable to recover your settings. +@@ -972,7 +972,7 @@ Chromium is unable to recover your settings. </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 3a967a8e9eb8..fcae380a37c1 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,15 +1,15 @@ ---- chrome/app/generated_resources.grd.orig 2020-03-03 18:53:48 UTC +--- chrome/app/generated_resources.grd.orig 2020-03-16 18:40:27 UTC +++ chrome/app/generated_resources.grd -@@ -5008,7 +5008,7 @@ Keep your key file in a safe place. You will need it t +@@ -5141,7 +5141,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -6712,7 +6712,7 @@ the Bookmarks menu."> +@@ -6861,7 +6861,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> -@@ -7669,7 +7669,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7822,7 +7822,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 951ad0dfed8a..47ad7a871540 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,15 +1,15 @@ ---- chrome/app/google_chrome_strings.grd.orig 2020-03-03 18:53:48 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-03-16 18:40:27 UTC +++ chrome/app/google_chrome_strings.grd -@@ -635,7 +635,7 @@ Google Chrome is unable to recover your settings. +@@ -661,7 +661,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -739,7 +739,7 @@ Google Chrome is unable to recover your settings. +@@ -762,7 +762,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,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> -@@ -979,7 +979,7 @@ Google Chrome is unable to recover your settings. +@@ -991,7 +991,7 @@ Google Chrome is unable to recover your settings. </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 e81df1c78818..18bd3350bdf8 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 2020-03-03 18:53:51 UTC +--- chrome/app/settings_strings.grdp.orig 2020-03-16 18:40:29 UTC +++ chrome/app/settings_strings.grdp -@@ -784,7 +784,7 @@ +@@ -811,7 +811,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> -@@ -798,7 +798,7 @@ +@@ -825,7 +825,7 @@ Use Classic </message> </if> 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 bf4a3a3c21cf..34bf723d2edc 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,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-09-09 21:55:08 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-02-03 21:53:28 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 399578ffb714..aec113703d20 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/about_flags.cc.orig 2020-04-03 04:11:28 UTC +++ chrome/browser/about_flags.cc -@@ -166,7 +166,7 @@ +@@ -170,7 +170,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -804,7 +804,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -834,7 +834,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +18,16 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -956,7 +956,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat +@@ -872,7 +872,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP + base::size(kOmniboxDocumentProviderClientScoring), nullptr}, + {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring, + base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}}; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + + const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { + {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}}; +@@ -994,14 +994,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), nullptr}}; @@ -27,7 +36,15 @@ defined(OS_CHROMEOS) const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = { {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}}; -@@ -1981,13 +1981,13 @@ const FeatureEntry kFeatureEntries[] = { + + const FeatureEntry::FeatureVariation kTranslateBubbleUIVariations[] = { + {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}}; +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD + + const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { + {security_state::features::kMarkHttpAsFeatureParameterName, +@@ -2031,13 +2031,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -43,7 +60,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2031,14 +2031,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2074,14 +2074,14 @@ const FeatureEntry kFeatureEntries[] = { "OverrideTranslateTriggerInIndia")}, #endif // OS_ANDROID @@ -60,7 +77,14 @@ #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) {"enable-native-notifications", -@@ -2119,7 +2119,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2159,13 +2159,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, + FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, + #endif // OS_CHROMEOS +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + {"dynamic-tcmalloc-tuning", flag_descriptions::kDynamicTcmallocName, flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, #endif // BUILDFLAG(USE_TCMALLOC) @@ -69,7 +93,7 @@ #if defined(OS_ANDROID) {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2197,7 +2197,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2239,7 +2239,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, #endif // OS_ANDROID @@ -78,16 +102,16 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2858,7 +2858,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxExperimentalSuggestScoringDescription, kOsAll, - FEATURE_VALUE_TYPE(omnibox::kOmniboxExperimentalSuggestScoring)}, +@@ -2907,7 +2907,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2903,7 +2903,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2956,7 +2956,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxAutocompleteTitlesName, flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)}, @@ -96,7 +120,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3136,13 +3136,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3182,13 +3182,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -111,8 +135,41 @@ +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) - {"chrome-colors", flag_descriptions::kChromeColorsName, -@@ -3965,13 +3965,13 @@ const FeatureEntry kFeatureEntries[] = { + {"ntp-confirm-suggestion-removals", +@@ -3850,12 +3850,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(kClickToCallDetectionV2)}, + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, + flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kRemoteCopyReceiver)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"shared-clipboard-receiver", +@@ -3899,7 +3899,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingUseDeviceInfoDescription, kOsAll, + FEATURE_VALUE_TYPE(kSharingUseDeviceInfo)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"sharing-peer-connection-receiver", + flag_descriptions::kSharingPeerConnectionReceiverName, +@@ -3910,7 +3910,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingPeerConnectionSenderName, + flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"sharing-qr-code-generator", +@@ -3985,13 +3985,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -128,7 +185,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4425,12 +4425,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4436,7 +4436,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -137,39 +194,12 @@ {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(media::kGlobalMediaControls)}, +@@ -4453,7 +4453,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, + kOsWin | kOsMac | kOsLinux | kOsCrOS, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) {"win-use-native-spellchecker", -@@ -4450,12 +4450,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSafetyTipDescription, kOsAll, - FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)}, - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"animated-avatar-button", flag_descriptions::kAnimatedAvatarButtonName, - flag_descriptions::kAnimatedAvatarButtonDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(features::kAnimatedAvatarButton)}, --#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_CHROMEOS) - {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName, -@@ -4587,12 +4587,12 @@ const FeatureEntry kFeatureEntries[] = { - chrome::android::kDarkenWebsitesCheckboxInThemesSetting)}, - #endif // defined(OS_ANDROID) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"profile-menu-revamp", flag_descriptions::kProfileMenuRevampName, - flag_descriptions::kProfileMenuRevampDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(features::kProfileMenuRevamp)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - - {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName, - flag_descriptions::kPasswordLeakDetectionDescription, kOsAll, 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 e4818a5553b8..fb5b5d6cd963 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,4 +1,4 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-12-16 21:51:23 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -33,7 +33,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -120,7 +120,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -127,7 +127,7 @@ void SetBrowserStartupIsComplete() { +@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -136,7 +136,7 @@ void SetBrowserStartupIsComplete() { +@@ -137,7 +137,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index de6545ee82da..3aa2fe1a3c84 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/background/background_mode_manager.cc @@ -797,7 +797,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 6273a97a71b4..021a83b1c450 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,20 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/browser_resources.grd.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/browser_resources.grd @@ -54,7 +54,7 @@ <include name="IDR_DISCARDS_MOJO_PUBLIC_BASE_PROCESS_ID_MOJOM_LITE_JS" file="${root_gen_dir}\mojo\public\mojom\base\process_id.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" /> </if> -- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" /> <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" /> <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> -@@ -457,7 +457,7 @@ - <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" 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" compress="gzip" /> -- <if expr="is_android or is_linux"> -+ <if expr="is_android or is_posix"> - <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> - </if> diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc new file mode 100644 index 000000000000..80a27c8a8950 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -0,0 +1,20 @@ +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-03-17 09:35:03 UTC ++++ chrome/browser/chrome_browser_interface_binders.cc +@@ -97,7 +97,7 @@ + #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/ui/webui/discards/discards.mojom.h" + #include "chrome/browser/ui/webui/discards/discards_ui.h" +@@ -471,7 +471,7 @@ void PopulateChromeWebUIFrameBinders( + map); + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, + DiscardsUI>(map); 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 6a8d26381688..51bb283f651b 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 2020-03-03 18:53:51 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -223,9 +223,9 @@ +@@ -224,9 +224,9 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -12,7 +12,7 @@ #if defined(OS_LINUX) #include "components/crash/content/app/breakpad_linux.h" -@@ -264,7 +264,7 @@ +@@ -265,7 +265,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif -@@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,7 +30,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 . -@@ -1082,7 +1082,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -39,7 +39,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -48,7 +48,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1274,6 +1274,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -56,7 +56,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1282,6 +1283,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } 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 bac7e0c31072..270f07c28cd5 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -382,7 +382,7 @@ +@@ -390,7 +390,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -435,12 +435,12 @@ +@@ -444,7 +444,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,13 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #include "services/service_manager/sandbox/features.h" #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/crash/content/app/crash_switches.h" - #include "components/crash/content/app/crashpad.h" - #endif -@@ -468,7 +468,7 @@ +@@ -477,7 +477,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -33,7 +27,21 @@ #if defined(USE_X11) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" #else -@@ -1222,7 +1222,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -820,11 +820,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos + } + + int GetCrashSignalFD(const base::CommandLine& command_line) { ++#if !defined(OS_BSD) + if (crash_reporter::IsCrashpadEnabled()) { + int fd; + pid_t pid; + return crash_reporter::GetHandlerSocket(&fd, &pid) ? fd : -1; + } ++#endif + + // Extensions have the same process type as renderers. + if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { +@@ -1269,7 +1271,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -42,7 +50,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1248,7 +1248,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1295,7 +1297,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -51,7 +59,7 @@ #if defined(USE_X11) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else -@@ -1987,7 +1987,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2020,7 +2022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -60,7 +68,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2252,7 +2252,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2288,7 +2290,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -69,7 +77,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(service_manager::switches::kNoSandbox)) { -@@ -3553,7 +3553,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3564,7 +3566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -78,7 +86,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3683,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager +@@ -3696,7 +3698,7 @@ void ChromeContentBrowserClient::BindCredentialManager } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -87,7 +95,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { const base::Value* audio_sandbox_enabled_policy_value = policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3701,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& +@@ -3714,7 +3716,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -96,7 +104,7 @@ if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -3988,7 +3988,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -3999,7 +4001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 933b44c9dd6e..c8b5fce3597e 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -371,12 +371,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -364,12 +364,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; 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 index 74d7e7675512..b1db05585e76 100644 --- 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 @@ -1,4 +1,4 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd new file mode 100644 index 000000000000..3a56c04bdb97 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -0,0 +1,11 @@ +--- chrome/browser/dev_ui_browser_resources.grd.orig 2020-03-17 09:36:38 UTC ++++ chrome/browser/dev_ui_browser_resources.grd +@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa + <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> + <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js" flattenhtml="true" type="BINDATA" compress="gzip" /> + +- <if expr="is_android or is_linux"> ++ <if expr="is_android or is_posix"> + <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> + </if> 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 d536b963323f..d53ca3e6d56b 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,4 +1,4 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc @@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. 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 5239eb469044..e44deb129a08 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 2019-12-16 21:51:23 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1234,7 +1234,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1249,7 +1249,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 -@@ -1258,7 +1258,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1273,7 +1273,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { 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 e0c3482b0ebc..126f0123875b 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 2019-07-24 18:58:09 UTC +--- chrome/browser/download/download_commands.h.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/download/download_commands.h -@@ -45,7 +45,7 @@ class DownloadCommands { +@@ -48,7 +48,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 ffe9bb008817..4b367d9bc2e5 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-12-16 21:51:23 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/download/download_item_model.cc -@@ -575,7 +575,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -592,7 +592,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(); -@@ -612,7 +612,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -632,7 +632,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 dbee010289e0..ddf30c396fc6 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/download/download_prefs.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/download/download_prefs.cc @@ -63,7 +63,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and 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 43feaa12b2b5..71f0ca430012 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,6 +1,6 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -137,7 +137,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -147,7 +147,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index edd723f111ef..4309d41da843 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1154,6 +1154,12 @@ jumbo_static_library("extensions") { +@@ -1175,6 +1175,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc new file mode 100644 index 000000000000..591517203deb --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc @@ -0,0 +1,20 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig 2020-03-17 09:37:45 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_mac.h" + #elif defined(OS_WIN) + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.h" + #endif + +@@ -58,7 +58,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: + return std::make_unique<DeviceInfoFetcherMac>(); + #elif defined(OS_WIN) + return std::make_unique<DeviceInfoFetcherWin>(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return std::make_unique<DeviceInfoFetcherLinux>(); + #else + return std::make_unique<StubDeviceFetcher>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc new file mode 100644 index 000000000000..8620f64e57fd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc @@ -0,0 +1,40 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-03-18 08:39:42 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc +@@ -8,7 +8,9 @@ + #include <gio/gio.h> + #endif // defined(USE_GIO) + #include <sys/stat.h> ++#if !defined(OS_BSD) + #include <sys/sysmacros.h> ++#endif + + #include <string> + +@@ -90,6 +92,7 @@ enterprise_reporting_private::SettingValue GetScreenlo + // Implements the logic from the native host installation script. First find the + // root device identifier, then locate its parent and get its type. + enterprise_reporting_private::SettingValue GetDiskEncrypted() { ++#if !defined(OS_BSD) + struct stat info; + // First figure out the device identifier. + stat("/", &info); +@@ -109,6 +112,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr + return is_encrypted ? enterprise_reporting_private::SETTING_VALUE_ENABLED + : enterprise_reporting_private::SETTING_VALUE_DISABLED; + } ++#endif + return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; + } + +@@ -120,7 +124,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de + + DeviceInfo DeviceInfoFetcherLinux::Fetch() { + DeviceInfo device_info; ++#if defined(OS_FREEBSD) ++ device_info.os_name = "freebsd"; ++#else + device_info.os_name = "linux"; ++#endif + device_info.os_version = GetOsVersion(); + device_info.device_host_name = GetDeviceHostName(); + device_info.device_model = GetDeviceModel(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc new file mode 100644 index 000000000000..8a3736baf4ee --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -0,0 +1,29 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-04-03 04:11:29 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc +@@ -39,7 +39,7 @@ + #include "base/win/registry.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #endif +@@ -382,7 +382,7 @@ base::FilePath GetEndpointVerificationDir() { + return *GetEndpointVerificationDirOverride(); + #if defined(OS_WIN) + if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, + base::nix::kDotConfigDir); +@@ -393,7 +393,7 @@ base::FilePath GetEndpointVerificationDir() { + if (true) + #endif + return path; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + path = path.AppendASCII("google"); + #else + path = path.AppendASCII("Google"); 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 71a67ef060fa..40176332dcff 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 2020-03-03 18:53:51 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -158,7 +158,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -160,7 +160,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*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 -@@ -168,7 +168,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -170,7 +170,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_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 04e47b7b26ce..fbddcf6c422b 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,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -52,7 +52,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" 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 80dc1b275f67..8c813c1db5c8 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,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -762,7 +762,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -760,7 +760,7 @@ void ExternalProviderImpl::CreateExternalProviders( } #endif if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -789,7 +789,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -787,7 +787,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 index d64e09197a3f..831136e37584 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/install_signer.cc.orig 2019-03-17 20:14:24 UTC +--- chrome/browser/extensions/install_signer.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/extensions/install_signer.cc -@@ -293,13 +293,13 @@ void LogRequestStartHistograms() { +@@ -294,13 +294,13 @@ void LogRequestStartHistograms() { DCHECK(g_single_thread_checker.Get().CalledOnValidThread()); // Process::Current().CreationTime is only defined on some platforms. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 1746fff2153a..0252971d0ac9 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,15 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-04-03 04:11:29 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3861,7 +3861,7 @@ const char kDynamicTcmallocDescription[] = +@@ -3646,7 +3646,7 @@ const char kZeroStateFilesDescription[] = + + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(USE_TCMALLOC) + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; +@@ -3655,7 +3655,7 @@ const char kDynamicTcmallocDescription[] = "utilization."; #endif // BUILDFLAG(USE_TCMALLOC) @@ -9,7 +18,7 @@ // All views-based platforms -------------------------------------------------- -@@ -3886,13 +3886,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -3680,13 +3680,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -25,8 +34,21 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -3921,7 +3921,7 @@ const char kRemoteCopyReceiverDescription[] = - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || +@@ -3703,7 +3703,7 @@ const char kClickToCallDetectionV2Description[] = + + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + + const char kRemoteCopyReceiverName[] = +@@ -3712,16 +3712,16 @@ const char kRemoteCopyReceiverDescription[] = + "Enables the remote copy feature to handle messages by writing content to " + "the clipboard and showing a notification to the user."; + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -34,3 +56,10 @@ const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = + "If enabled, Chrome will scroll web pages on stylus drag."; + +-#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) + diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 4cccd16331ec..027a0d85fea5 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 2020-03-03 18:53:51 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-04-03 04:11:29 UTC +++ chrome/browser/flag_descriptions.h -@@ -20,9 +20,9 @@ +@@ -21,9 +21,9 @@ #include "ui/android/buildflags.h" #endif // defined(OS_ANDROID) @@ -12,7 +12,15 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2299,7 +2299,7 @@ extern const char kDynamicTcmallocName[]; +@@ -2128,14 +2128,14 @@ extern const char kZeroStateFilesDescription[]; + + #endif // #if defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(USE_TCMALLOC) + extern const char kDynamicTcmallocName[]; extern const char kDynamicTcmallocDescription[]; #endif // BUILDFLAG(USE_TCMALLOC) @@ -21,7 +29,7 @@ // All views-based platforms -------------------------------------------------- -@@ -2318,12 +2318,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2154,12 +2154,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -36,8 +44,19 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -2344,7 +2344,7 @@ extern const char kRemoteCopyReceiverDescription[]; - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || +@@ -2171,21 +2171,21 @@ extern const char kClickToCallDetectionV2Description[] + + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + + extern const char kRemoteCopyReceiverName[]; + extern const char kRemoteCopyReceiverDescription[]; + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -45,3 +64,9 @@ extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; + +-#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) + 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 7075d6d16697..76fb8bab73c0 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,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / const char kProduct[] = "Chrome"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 7bb32c2a010e..981d24078676 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2019-10-30 15:49:45 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -24,10 +24,10 @@ #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -267,7 +267,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -270,7 +270,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -312,7 +312,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -315,7 +315,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index eb1de484753b..a1c3fbc542a8 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -708,11 +708,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -718,11 +718,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -980,7 +980,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc index f961b6718c78..7994a85f8cec 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -425,7 +425,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -438,7 +438,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -448,7 +448,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -461,7 +461,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / 1024); diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc index b47ca87af0ae..21db21328ad3 100644 --- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2019-12-16 21:51:23 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -231,7 +231,7 @@ const struct { +@@ -144,7 +144,7 @@ const struct { {base::DIR_APP_DATA, nullptr, true}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, #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 adba2542a795..aace9f122f49 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,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -79,11 +79,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -14,7 +14,7 @@ #if defined(OS_WIN) || defined(OS_MACOSX) #include "content/public/common/network_service_util.h" -@@ -211,10 +211,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -160,10 +160,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -480,10 +480,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -429,10 +429,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -535,10 +535,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -485,10 +485,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -643,7 +643,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -610,7 +610,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea insecure_stub_resolver_enabled, secure_dns_mode, std::move(dns_over_https_servers)); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 30eac17e804e..7688028b44a2 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -34,7 +34,7 @@ +@@ -33,7 +33,7 @@ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #endif -@@ -123,7 +123,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); 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 e0e2968f5767..b9786e7622f2 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,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-03-03 18:53:51 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -87,7 +87,11 @@ +@@ -88,7 +88,11 @@ #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc index e731be379cf8..c45a5b0d8d92 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/plugins/plugin_info_host_impl.cc @@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { 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 836e7b1844d1..35342997a152 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,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.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 1fe34985955b..8f82b5f2a44d 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 2020-03-03 18:53:51 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -117,7 +117,7 @@ +@@ -118,7 +118,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -357,11 +357,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -355,11 +355,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kWebComponentsV0Enabled, prefs::kWebComponentsV0Enabled, base::Value::Type::BOOLEAN }, @@ -23,7 +23,7 @@ #if defined(OS_POSIX) { key::kNtlmV2Enabled, prefs::kNtlmV2Enabled, -@@ -1147,7 +1147,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1163,7 +1163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, base::Value::Type::BOOLEAN }, #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -32,7 +32,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1208,7 +1208,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1203,7 +1203,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = browser_switcher::prefs::kChromeParameters, base::Value::Type::LIST }, #endif 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 ee85318e5d7d..816eeffdc37e 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,4 +1,4 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-03-03 18:53:01 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -250,6 +250,8 @@ class PolicyTestCase { const std::string os("chromeos"); 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 5a8b94f61bf5..7f9fbfc4cd49 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 2020-03-03 18:53:51 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -352,7 +352,7 @@ +@@ -360,7 +360,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1005,7 +1005,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1022,7 +1022,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 6858fa15da2c..a2ac58994f69 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 2020-03-03 18:53:51 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -292,7 +292,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -295,7 +295,7 @@ void ChromeBrowserMainExtraPartsProfiles:: if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore)) media_history::MediaHistoryKeyedServiceFactory::GetInstance(); #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 7ba802447e2b..48f0d0c5ddd2 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 2020-03-03 18:53:51 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -115,7 +115,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -108,7 +108,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 1d5f5636ed35..4a46416a7065 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 2020-03-03 18:53:51 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1701,7 +1701,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1702,7 +1702,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, -@@ -1743,7 +1743,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1744,7 +1744,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -2082,7 +2082,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); 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 6d29b9e93304..db4c5e81a31d 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,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" -@@ -145,7 +145,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -164,7 +164,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -165,7 +165,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif 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 79e7bc063d60..1470f1f0d2c0 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 2020-03-03 18:53:52 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -66,7 +66,7 @@ +@@ -49,7 +49,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_" external></cr-link-row> @@ -9,7 +9,7 @@ <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <cr-button id="useDefault" on-click="onUseDefaultTap_"> -@@ -74,7 +74,7 @@ +@@ -57,7 +57,7 @@ </cr-button> </template> </if> @@ -18,7 +18,7 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -137,7 +137,7 @@ +@@ -120,7 +120,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 a866ff36c1e5..a080e83db65c 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-10-21 19:06:23 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -130,7 +130,7 @@ Polymer({ +@@ -104,7 +104,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> -@@ -238,7 +238,7 @@ Polymer({ +@@ -190,7 +190,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -315,10 +315,10 @@ Polymer({ +@@ -267,10 +267,10 @@ Polymer({ } let i18nId; 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 256580b75b54..8771fedfa758 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-12-16 21:51:24 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -681,7 +681,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -671,7 +671,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_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc index b0d2de23ee8d..e1b209c81c94 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc @@ -1,11 +1,17 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-02-07 12:34:27 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc -@@ -11,7 +11,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboar +@@ -10,12 +10,12 @@ const base::Feature kSharedClipboardReceiver{"SharedCl + const base::Feature kSharedClipboardUI{"SharedClipboardUI", base::FEATURE_DISABLED_BY_DEFAULT}; - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins = { + &kRemoteCopyReceiver, "RemoteCopyAllowedOrigins", ""}; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h index 57e3f84e85cc..6a0e3079731b 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h +++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h @@ -1,11 +1,19 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.h -@@ -18,7 +18,7 @@ extern const base::Feature kSharedClipboardReceiver; +@@ -17,14 +17,14 @@ extern const base::Feature kSharedClipboardReceiver; + // Feature to allow shared clipboard gets processed. extern const base::Feature kSharedClipboardUI; - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) // Feature to enable handling remote copy messages. extern const base::Feature kRemoteCopyReceiver; + // List of allowed origins to fetch images from, comma separated. + extern const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_FEATURE_FLAGS_H_ diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc new file mode 100644 index 000000000000..0c3723e85860 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -0,0 +1,24 @@ +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2020-03-26 18:39:48 UTC ++++ chrome/browser/sharing/sharing_device_registration.cc +@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( + } + + bool SharingDeviceRegistration::IsRemoteCopySupported() const { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + return base::FeatureList::IsEnabled(kRemoteCopyReceiver); + #endif +@@ -334,10 +334,10 @@ bool SharingDeviceRegistration::IsRemoteCopySupported( + } + + bool SharingDeviceRegistration::IsPeerConnectionSupported() const { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + return base::FeatureList::IsEnabled(kSharingPeerConnectionReceiver); +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + return false; diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc new file mode 100644 index 000000000000..a9744c4a6a8d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -0,0 +1,32 @@ +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2020-03-16 18:39:44 UTC ++++ chrome/browser/sharing/sharing_handler_registry_impl.cc +@@ -24,10 +24,10 @@ + #include "chrome/browser/sharing/webrtc/webrtc_message_handler.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( +@@ -73,14 +73,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl + {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + if (sharing_device_registration->IsRemoteCopySupported()) { + AddSharingHandler( + std::make_unique<RemoteCopyMessageHandler>(profile), + {chrome_browser_sharing::SharingMessage::kRemoteCopyMessage}); + } +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc new file mode 100644 index 000000000000..7e096df1b053 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/sharing/sharing_service.cc.orig 2020-03-30 09:34:43 UTC ++++ chrome/browser/sharing/sharing_service.cc +@@ -30,7 +30,7 @@ namespace { + SharingMessageSender::DelegateType GetSendDelegateType( + const syncer::DeviceInfo& device, + const chrome_browser_sharing::SharingMessage& message) { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // Messages other than SharedClipboard are always sent via FCM. + if (message.payload_case() != +@@ -56,7 +56,7 @@ SharingMessageSender::DelegateType GetSendDelegateType + // logic once we wrap up the experiment and e.g. only send messages over a + // certain size via WebRTC. + return SharingMessageSender::DelegateType::kWebRtc; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_CHROMEOS) + + // Only FCM is supported for non desktop OS. diff --git a/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc new file mode 100644 index 000000000000..cfac06c08d3d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc @@ -0,0 +1,17 @@ +--- chrome/browser/sharing/webrtc/webrtc_flags.cc.orig 2020-03-30 09:35:30 UTC ++++ chrome/browser/sharing/webrtc/webrtc_flags.cc +@@ -4,12 +4,12 @@ + + #include "chrome/browser/sharing/webrtc/webrtc_flags.h" + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const base::Feature kSharingPeerConnectionReceiver{ + "SharingPeerConnectionReceiver", base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::Feature kSharingPeerConnectionSender{ + "SharingPeerConnectionSender", base::FEATURE_ENABLED_BY_DEFAULT}; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h new file mode 100644 index 000000000000..fdec699052e2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h @@ -0,0 +1,19 @@ +--- chrome/browser/sharing/webrtc/webrtc_flags.h.orig 2020-03-30 09:35:47 UTC ++++ chrome/browser/sharing/webrtc/webrtc_flags.h +@@ -8,14 +8,14 @@ + #include "base/feature_list.h" + #include "build/build_config.h" + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // Feature flag to enable receiving PeerConnection requests. + extern const base::Feature kSharingPeerConnectionReceiver; + + // Feature flag to enable sending SharingMessage using PeerConnection. + extern const base::Feature kSharingPeerConnectionSender; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #endif // CHROME_BROWSER_SHARING_WEBRTC_WEBRTC_FLAGS_H_ 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 3b76cf45fb70..50ed28cdeb0a 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,4 +1,4 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc @@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) @@ -9,7 +9,7 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -204,7 +204,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -205,7 +205,7 @@ void SSLErrorControllerClient::Proceed() { } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { 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 346d3200a07f..155f4fdf474c 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 2020-03-03 18:53:52 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -408,7 +408,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -442,7 +442,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy } #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { controllers.push_back( -@@ -416,7 +416,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy syncer::DICTIONARY, model_type_store_factory, GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } 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 a2ea0b3e146f..0727f82f22b9 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,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -24,8 +24,8 @@ on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); -@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - on_swapped_mem_refresh_callback_); +@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + base::BindOnce(on_swapped_mem_refresh_callback_)); } -#if defined(OS_MACOSX) || defined(OS_LINUX) @@ -33,9 +33,9 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -95,9 +95,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), - on_idle_wakeups_callback_); +@@ -93,9 +93,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + base::BindOnce(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), + base::BindOnce(on_idle_wakeups_callback_)); } -#endif // defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -45,16 +45,16 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -106,7 +106,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this), - on_open_fd_count_callback_); +@@ -103,7 +103,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + base::BindOnce(&TaskGroupSampler::RefreshOpenFdCount, this), + base::BindOnce(on_open_fd_count_callback_)); } -#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)) { -@@ -149,13 +149,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -145,13 +145,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index a0e7ffe83b9a..cf606ad8b2ce 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,24 +1,24 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2019-12-16 21:51:24 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -20,7 +20,7 @@ +@@ -23,7 +23,7 @@ + #include "chrome/browser/themes/theme_helper_win.h" + #endif - #if defined(OS_WIN) - #include "chrome/browser/themes/theme_service_win.h" --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -64,7 +64,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc - ThemeService* provider = NULL; - #if defined(OS_WIN) - provider = new ThemeServiceWin; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - provider = new ThemeServiceAuraLinux; - #else - provider = new ThemeService; -@@ -76,7 +76,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc +@@ -78,7 +78,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {} + + KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* profile) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + using ThemeService = ThemeServiceAuraLinux; + #endif + +@@ -90,7 +90,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { 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 5b223607a463..9e2f7535e762 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 2019-10-21 19:06:23 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -160,6 +160,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 295ce35c2e8a..1ee7f7ff4e27 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,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -251,7 +251,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -252,7 +252,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 = -@@ -472,7 +472,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -476,7 +476,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -951,7 +951,7 @@ void BrowserCommandController::InitCommandState() { +@@ -961,7 +961,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_gtk_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc new file mode 100644 index 000000000000..6d796805d2fa --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/gtk/print_dialog_gtk.cc.orig 2020-03-16 18:40:30 UTC ++++ chrome/browser/ui/gtk/print_dialog_gtk.cc +@@ -336,7 +336,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>( +- GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | ++ GTK_PRINT_CAPABILITY_GENERATE_PS | GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | + GTK_PRINT_CAPABILITY_REVERSE); + gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_), 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 ab0c25914276..fd379c49386c 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,4 +1,4 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc @@ -31,7 +31,7 @@ #include "ui/base/ime/chromeos/ime_keymap.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 deleted file mode 100644 index d2b8a9c562a4..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-10-21 19:06:24 UTC -+++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -336,6 +336,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>( -+ GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_GENERATE_PDF | - GTK_PRINT_CAPABILITY_PAGE_SET | - GTK_PRINT_CAPABILITY_COPIES | 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 116607d0a49c..d03e6c550af9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2019-12-16 21:51:24 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -184,7 +184,7 @@ std::vector<int> SadTab::GetSubMessages() { - // Only show incognito suggestion if not already in Incognito mode. +@@ -188,7 +188,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); -#if defined(OS_MACOSX) || defined(OS_LINUX) 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 eede32ddeca5..e40b9803cffb 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,4 +1,4 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc @@ -87,7 +87,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, 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 995e243283c3..b3cf9e596cbe 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,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -82,7 +82,7 @@ #include "chrome/browser/ui/user_manager.h" 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 06b70c7d2bd0..053ec7216342 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 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -124,7 +124,7 @@ +@@ -132,7 +132,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 -@@ -329,11 +329,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -347,11 +347,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_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index ec7a7f674581..f348ce9eaf16 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 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -687,7 +687,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -684,7 +684,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_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 95e0585d8c8f..47a25b7a998d 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,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-03-03 18:53:02 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -33,7 +33,7 @@ #include "ui/wm/core/wm_state.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc new file mode 100644 index 000000000000..2e9f1501f8a7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-03-17 09:40:34 UTC ++++ chrome/browser/ui/views/download/download_item_view.cc +@@ -234,7 +234,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do + open_button_ = AddChildView(std::move(open_button)); + + int file_name_style = views::style::STYLE_PRIMARY; +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) + file_name_style = STYLE_EMPHASIZED; + #endif +@@ -1633,7 +1633,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty + if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) + return; + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + base::string16 filename = ElidedFilename(); + size_t file_name_position = label->GetText().find(filename); + if (file_name_position != std::string::npos) { 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 0e72494a4c66..d2029ff732a8 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 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -119,8 +119,10 @@ void FirstRunDialog::Done() { +@@ -114,8 +114,10 @@ void FirstRunDialog::Done() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); 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 f9015055b92d..b69b8869760f 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 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1560,7 +1560,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1633,7 +1633,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; 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 d7275af493b9..9429876dcf27 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -48,7 +48,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -349,7 +349,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt } else if (sender == close_button_) { frame()->CloseWithReason(views::Widget::ClosedReason::kCloseButtonClicked); } else if (sender == window_icon_) { @@ -18,7 +18,7 @@ // TODO(pbos): Figure out / document why this is Linux only. This needs a // comment. views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), -@@ -481,7 +481,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { 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 f115290a378f..dc06c4f10c39 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -62,7 +62,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM 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 index e89110ff1282..45d717c16389 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-12-16 21:50:43 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -379,7 +379,7 @@ bool HungRendererDialogView::Cancel() { +@@ -417,7 +417,7 @@ bool HungRendererDialogView::Cancel() { content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 587602b69dfd..beabaf0792a0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2019-12-16 21:51:24 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -582,7 +582,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) +@@ -584,7 +584,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; 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 a4b42c03b701..166112807cf0 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,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -450,7 +450,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. @@ -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. -@@ -2060,7 +2060,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2082,7 +2082,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 78299fd39210..473b7690ddfc 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,4 +1,4 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/webui/about_ui.cc @@ -561,7 +561,7 @@ std::string ChromeURLs() { return html; 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 bae62b49aad7..6fed2b7df1f6 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,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -215,11 +215,11 @@ +@@ -224,11 +224,11 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -328,7 +328,7 @@ bool IsAboutUI(const GURL& url) { +@@ -337,7 +337,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) -@@ -658,7 +658,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -669,7 +669,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 -@@ -706,17 +706,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -717,17 +717,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index d2ce20f1910b..8df5419b8753 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-03-03 18:53:52 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -752,7 +752,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -333,7 +333,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,10 +9,10 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -772,7 +772,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP}, - {"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER}, - #endif +@@ -348,7 +348,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"changeHomePage", IDS_SETTINGS_CHANGE_HOME_PAGE}, + {"themesGalleryUrl", IDS_THEMES_GALLERY_URL}, + {"chooseFromWebStore", IDS_SETTINGS_WEB_STORE}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc index 503a1f7ef936..abc103c98166 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig 2020-03-03 18:53:53 UTC +--- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig 2020-02-07 12:36:50 UTC +++ chrome/browser/web_applications/components/web_app_file_handler_registration.cc @@ -15,7 +15,7 @@ namespace web_app { // // Note: Because OS_LINUX includes OS_CHROMEOS be sure to use the stub on // OS_CHROMEOS. -#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if !defined(OS_WIN) && !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) bool ShouldRegisterFileHandlersWithOs() { return false; } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc new file mode 100644 index 000000000000..934359b14459 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2020-03-17 09:41:50 UTC ++++ chrome/browser/web_applications/components/web_app_shortcut.cc +@@ -35,7 +35,7 @@ namespace { + const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; + const size_t kNumDesiredIconSizesForShortcut = + base::size(kDesiredIconSizesForShortcut); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Linux supports icons of any size. FreeDesktop Icon Theme Specification states + // that "Minimally you should install a 48x48 icon in the hicolor theme." + const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; 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 deleted file mode 100644 index 5b19a746a55e..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-12-16 21:51:24 UTC -+++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc -@@ -51,7 +51,7 @@ namespace { - #if defined(OS_MACOSX) - const int kDesiredSizes[] = {16, 32, 128, 256, 512}; - const size_t kNumDesiredSizes = base::size(kDesiredSizes); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - // Linux supports icons of any size. FreeDesktop Icon Theme Specification states - // that "Minimally you should install a 48x48 icon in the hicolor theme." - const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512}; diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index ff1781c7279c..bf1e0b6e0415 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 2020-03-03 18:53:53 UTC +--- chrome/common/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ chrome/common/BUILD.gn -@@ -278,6 +278,10 @@ static_library("common") { +@@ -272,6 +272,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index 65b7dd363876..11726bed5663 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,4 +1,4 @@ ---- chrome/common/channel_info_posix.cc.orig 2020-03-03 18:53:03 UTC +--- chrome/common/channel_info_posix.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/common/channel_info_posix.cc @@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() { } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 40f57c3c5911..4591e746fab7 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 2020-03-03 18:53:53 UTC +--- chrome/common/chrome_features.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_features.cc -@@ -81,13 +81,13 @@ const base::Feature kAsyncDns { +@@ -86,13 +86,13 @@ const base::Feature kAsyncDns { #endif }; @@ -14,14 +14,5 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Enables or disables whether permission prompts are automatically blocked - // after the user has explicitly dismissed them too many times. -@@ -147,7 +147,7 @@ const base::Feature kThirdPartyModulesBlocking{ - const base::Feature kTLS13HardeningForLocalAnchors{ - "TLS13HardeningForLocalAnchors", base::FEATURE_DISABLED_BY_DEFAULT}; - --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - // Enables the dual certificate verification trial feature. - // https://crbug.com/649026 - const base::Feature kCertDualVerificationTrialFeature{ + // Once the user declines a notification permission prompt in a WebContents, + // automatically dismiss subsequent prompts in the same WebContents, from any diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index ac9d311968f4..d23bca53bf82 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 2020-03-03 18:53:53 UTC +--- chrome/common/chrome_features.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_features.h -@@ -62,10 +62,10 @@ extern const base::Feature kAppServiceShelf; +@@ -68,10 +68,10 @@ extern const base::Feature kAppServiceShelf; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -12,13 +12,4 @@ +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -84,7 +84,7 @@ extern const base::Feature kBundledConnectionHelpFeatu - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kCaptionSettings; - --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kCertDualVerificationTrialFeature; - #endif + extern const base::Feature kBlockRepeatedNotificationPermissionPrompts; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index b67f166b4d4b..8f8695168ae5 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2020-03-03 18:53:03 UTC +--- chrome/common/chrome_paths.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/common/chrome_paths.cc @@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 576443d4df0d..0cf96df2deef 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 2020-03-03 18:53:53 UTC +--- chrome/common/chrome_switches.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_switches.cc -@@ -868,7 +868,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -846,7 +846,7 @@ 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 6d27b5efe1cf..957faae8a127 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2020-03-03 18:53:53 UTC +--- chrome/common/chrome_switches.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_switches.h -@@ -266,7 +266,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -261,7 +261,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif 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 308974623398..52d07bac4945 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,4 +1,4 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-12-16 21:51:24 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2020-02-03 21:52:41 UTC +++ chrome/common/extensions/api/api_sources.gni @@ -113,7 +113,7 @@ if (is_chromeos) { if (use_cups) { diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index 4053f1dc5e34..5af21971a15e 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 2020-03-03 18:53:53 UTC +--- chrome/common/features.gni.orig 2020-03-16 18:40:30 UTC +++ chrome/common/features.gni -@@ -51,9 +51,9 @@ declare_args() { +@@ -49,9 +49,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos enable_one_click_signin = diff --git a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc new file mode 100644 index 000000000000..0f28ca47dca6 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -0,0 +1,11 @@ +--- chrome/common/media/cdm_host_file_path.cc.orig 2020-03-17 09:44:41 UTC ++++ chrome/common/media/cdm_host_file_path.cc +@@ -98,7 +98,7 @@ void AddCdmHostFilePaths( + cdm_host_file_paths->emplace_back(chrome_framework_path, + chrome_framework_sig_path); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + + base::FilePath chrome_exe_dir; + if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 04dc24fe3401..edf68e0cec56 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 2020-03-03 18:53:53 UTC +--- chrome/common/pref_names.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/pref_names.cc -@@ -1049,7 +1049,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1059,7 +1059,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 -@@ -1176,7 +1176,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1193,7 +1193,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"; -@@ -1593,7 +1593,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1621,7 +1621,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -1889,12 +1889,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = +@@ -1917,12 +1917,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = const char kAmbientAuthenticationInPrivateModesEnabled[] = "auth.ambient_auth_in_private_modes"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index d95136a8b974..7f7af0082f1f 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2020-03-03 18:53:53 UTC +--- chrome/common/pref_names.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/pref_names.h -@@ -331,7 +331,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -334,7 +334,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -362,7 +362,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -365,7 +365,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[]; +@@ -532,7 +532,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) -@@ -738,9 +738,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; +@@ -744,9 +744,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; extern const char kGloballyScopeHTTPAuthCacheEnabled[]; extern const char kAmbientAuthenticationInPrivateModesEnabled[]; 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 991ccb671519..c9a01fc94ffe 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2020-03-03 18:53:53 UTC +--- chrome/common/webui_url_constants.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/webui_url_constants.cc -@@ -316,7 +316,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -321,7 +321,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { const char kChromeUICastHost[] = "cast"; #endif @@ -9,7 +9,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -327,17 +327,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -332,17 +332,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -30,7 +30,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -599,13 +599,13 @@ const char* const kChromeHostURLs[] = { +@@ -608,13 +608,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif 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 bfa3b58a41f8..dc27881da387 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2020-03-03 18:53:53 UTC +--- chrome/common/webui_url_constants.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/webui_url_constants.h -@@ -274,7 +274,7 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -275,7 +275,7 @@ bool IsSystemWebUIHost(base::StringPiece host); extern const char kChromeUICastHost[]; #endif @@ -9,7 +9,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -286,17 +286,17 @@ extern const char kChromeUIHatsURL[]; +@@ -287,17 +287,17 @@ 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 index 09464a61a99b..e6be28220164 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-03-03 18:53:53 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1056,7 +1056,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1053,7 +1053,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index db50f20cb1de..67e371b45b43 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2020-03-03 18:53:53 UTC +--- chrome/test/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ chrome/test/BUILD.gn -@@ -5920,7 +5920,7 @@ test("chrome_app_unittests") { +@@ -6042,7 +6042,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//components/tracing", ] diff --git a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc new file mode 100644 index 000000000000..d09f2d1d0fd1 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc @@ -0,0 +1,20 @@ +--- chrome/test/base/chrome_test_launcher.cc.orig 2020-04-06 07:46:40 UTC ++++ chrome/test/base/chrome_test_launcher.cc +@@ -59,7 +59,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h" + #include "testing/gtest/include/gtest/gtest.h" + #endif +@@ -221,7 +221,7 @@ int LaunchChromeTests(size_t parallel_jobs, + } + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Cause a test failure for any test that triggers an unexpected relaunch. + // Tests that fail here should likely be restructured to put the "before + // relaunch" code into a PRE_ test with its own 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 9cb955d64867..f4de4bb39b0c 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,4 +1,4 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2019-12-16 21:51:24 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2020-04-03 04:11:30 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -77,6 +77,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" @@ -20,3 +20,21 @@ #include "ui/views/test/test_desktop_screen_x11.h" #endif +@@ -253,7 +257,7 @@ void InProcessBrowserTest::SetUp() { + // Cookies). Without this on Mac and Linux, many tests will hang waiting for a + // user to approve KeyChain/kwallet access. On Windows this is not needed as + // OS APIs never block. +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + OSCryptMocker::SetUp(); + #endif + +@@ -308,7 +312,7 @@ void InProcessBrowserTest::TearDown() { + com_initializer_.reset(); + #endif + BrowserTestBase::TearDown(); +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + OSCryptMocker::TearDown(); + #endif + diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc new file mode 100644 index 000000000000..f80c31dcc8d4 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -0,0 +1,25 @@ +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-04-06 07:47:38 UTC ++++ chrome/test/base/interactive_ui_tests_main.cc +@@ -16,7 +16,7 @@ + #if defined(USE_AURA) + #include "ui/aura/test/ui_controls_factory_aura.h" + #include "ui/base/test/ui_controls_aura.h" +-#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) + #include "ui/ozone/public/ozone_platform.h" + #endif + #if defined(USE_X11) +@@ -54,11 +54,11 @@ class InteractiveUITestSuite : public ChromeTestSuite + com_initializer_.reset(new base::win::ScopedCOMInitializer()); + ui_controls::InstallUIControlsAura( + aura::test::CreateUIControlsAura(nullptr)); +-#elif defined(USE_OZONE) && defined(OS_LINUX) ++#elif defined(USE_OZONE) && (defined(OS_LINUX) || defined(OS_BSD)) + ui::OzonePlatform::InitParams params; + params.single_process = true; + ui::OzonePlatform::InitializeForUI(params); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + ui_controls::InstallUIControlsAura( + views::test::CreateUIControlsDesktopAura()); + #else diff --git a/www/chromium/files/patch-chrome_test_base_test__browser__window.h b/www/chromium/files/patch-chrome_test_base_test__browser__window.h new file mode 100644 index 000000000000..842f9dd09dd2 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h @@ -0,0 +1,11 @@ +--- chrome/test/base/test_browser_window.h.orig 2020-04-06 07:48:42 UTC ++++ chrome/test/base/test_browser_window.h +@@ -178,7 +178,7 @@ class TestBrowserWindow : public BrowserWindow { + bool is_source_keyboard) override {} + + #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + void ShowHatsBubble(const std::string& site_id) override {} + #endif + diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index ccf89b8582e6..79b4cc08b788 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-03-03 18:53:53 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -68,6 +68,10 @@ +@@ -69,6 +69,10 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" #endif 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 e7ae30aba315..1aa645203816 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,4 +1,4 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-03-03 18:53:03 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-02-24 18:39:10 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc new file mode 100644 index 000000000000..81970dcbbec1 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -0,0 +1,38 @@ +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-03-23 14:46:39 UTC ++++ chrome/test/chromedriver/key_converter_unittest.cc +@@ -278,7 +278,7 @@ TEST(KeyConverter, AllShorthandKeys) { + ->Generate(&key_events); + builder.Generate(&key_events); + builder.SetKeyCode(ui::VKEY_TAB); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + builder.SetText("\t", "\t")->Generate(&key_events); + #else + builder.SetText(std::string(), std::string()); +@@ -286,7 +286,7 @@ TEST(KeyConverter, AllShorthandKeys) { + key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); + #endif + builder.SetKeyCode(ui::VKEY_BACK); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + builder.SetText("\b", "\b")->Generate(&key_events); + #else + builder.SetText(std::string(), std::string()); +@@ -297,7 +297,7 @@ TEST(KeyConverter, AllShorthandKeys) { + CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Fails on bots: crbug.com/174962 + #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols + #else +@@ -354,7 +354,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { + TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { + ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); + const char kTextForKeys[] = { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, + #else + 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, 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 fad92c10ac6a..06032792b186 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 2020-03-03 18:53:53 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-03-16 18:40:30 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,25 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -305,7 +305,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate + + #endif // defined(USE_AURA) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + base::FilePath GetApplicationFontsDir() { + std::unique_ptr<base::Environment> env(base::Environment::Create()); +@@ -279,7 +279,7 @@ base::FilePath GetApplicationFontsDir() { + } + } + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + } // namespace + +@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -18,7 +36,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. -@@ -315,7 +315,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -27,7 +45,7 @@ // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -457,7 +457,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -459,7 +459,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) 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 002215b79bd9..ceca4fa67274 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,11 +1,11 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2020-03-03 18:53:53 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2020-03-16 18:40:30 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -443,7 +443,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Necessary for accelerated 2d canvas. By default on Linux, Chromium assumes - // GLES2 contexts can be lost to a power-save mode, which breaks GPU canvas - // apps. + // Necessary for accelerated 2d canvas. By default on Linux, Chromium + // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU + // canvas apps. diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc index 276769369f80..381734887dcb 100644 --- a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc +++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -1,4 +1,4 @@ ---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-03-03 18:53:04 UTC +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-02-03 21:52:43 UTC +++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc @@ -7,7 +7,7 @@ #include <map> diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc new file mode 100644 index 000000000000..079d79856b84 --- /dev/null +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -0,0 +1,11 @@ +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-03-17 09:46:13 UTC ++++ chromecast/renderer/cast_content_renderer_client.cc +@@ -208,7 +208,7 @@ void CastContentRendererClient::RenderFrameCreated( + dispatcher->OnRenderFrameCreated(render_frame); + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // JsChannelBindings destroys itself when the RenderFrame is destroyed. + JsChannelBindings::Create(render_frame); + #endif diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc new file mode 100644 index 000000000000..25ba63628ba8 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-03-16 18:40:30 UTC ++++ components/autofill/core/browser/autofill_external_delegate.cc +@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( + + // Append the "Hide Suggestions" menu item for only Autofill Address and + // Autocomplete popups. +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + if (base::FeatureList::IsEnabled( + features::kAutofillEnableHideSuggestionsUI)) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index b3f14c055499..76d3e7dee3ed 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2020-03-03 18:53:53 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-03-16 18:40:30 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1816,10 +1816,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1856,10 +1856,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index c6a46dc6b659..016f6de85d3c 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2020-03-03 18:53:53 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-03-16 18:40:30 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -130,7 +130,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio +@@ -122,7 +122,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio bool ShouldShowImprovedUserConsentForCreditCardSave() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 459a1fefae4b..2d01264b0bad 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/content/app/BUILD.gn.orig 2020-03-03 18:53:53 UTC +--- components/crash/content/app/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ components/crash/content/app/BUILD.gn -@@ -53,17 +53,20 @@ static_library("app") { +@@ -49,17 +49,20 @@ static_library("app") { "crashpad_win.cc", ] @@ -23,7 +23,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] -@@ -75,7 +78,7 @@ static_library("app") { +@@ -69,7 +72,7 @@ static_library("app") { "//build:branding_buildflags", ] @@ -32,7 +32,7 @@ deps += [ "//third_party/crashpad/crashpad/client", "//third_party/crashpad/crashpad/util", -@@ -101,7 +104,7 @@ static_library("app") { +@@ -95,7 +98,7 @@ static_library("app") { ] } @@ -41,12 +41,12 @@ deps += [ "//third_party/breakpad:client" ] } -@@ -132,7 +135,7 @@ static_library("app") { +@@ -126,7 +129,7 @@ static_library("app") { libs = [ "log" ] } - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps = [ - "//third_party/crashpad/crashpad/handler:crashpad_handler", - ] + data_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] + } + } diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc b/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc index 819e2b741de2..20d5d6295eb7 100644 --- a/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc +++ b/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc @@ -1,4 +1,4 @@ ---- components/crash/content/app/crashpad_linux.cc.orig 2019-12-19 16:47:28 UTC +--- components/crash/content/app/crashpad_linux.cc.orig 2020-03-16 18:39:48 UTC +++ components/crash/content/app/crashpad_linux.cc @@ -5,7 +5,9 @@ #include "components/crash/content/app/crashpad.h" @@ -10,7 +10,7 @@ #include <limits> -@@ -66,9 +68,11 @@ void SetPtracerAtFork() { +@@ -67,9 +69,11 @@ void SetPtracerAtFork() { if (!GetHandlerSocket(nullptr, &pid)) { return; } 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 4af45375d035..b7c5ab969a32 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-12-16 21:50:45 UTC +--- components/crash/core/common/BUILD.gn.orig 2020-03-16 18:39:48 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,7 +9,7 @@ } group("common") { -@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") { +@@ -104,7 +104,9 @@ target(crash_key_target_type, "crash_key_lib") { ] } @@ -20,7 +20,7 @@ if (use_combined_annotations) { public_deps += [ "//third_party/crashpad/crashpad/client" ] } -@@ -173,7 +175,7 @@ source_set("unit_tests") { +@@ -167,7 +169,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index 73a816e50170..def54d6eaffa 100644 --- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,6 +1,6 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-03-03 18:53:53 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-03-16 18:40:30 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "components/discardable_memory/common/discardable_shared_memory_heap.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" -@@ -181,7 +181,7 @@ int64_t GetDefaultMemoryLimit() { +@@ -182,7 +182,7 @@ int64_t GetDefaultMemoryLimit() { max_default_memory_limit /= 8; #endif 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 a257a1d20dd8..ea4af4e91c50 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,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2020-03-03 18:53:05 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2020-02-03 21:52:44 UTC +++ components/feature_engagement/public/event_constants.cc @@ -12,12 +12,12 @@ namespace feature_engagement { namespace events { 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 8bbe4d2f1e93..96b274df41fb 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,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.h.orig 2020-03-03 18:53:05 UTC +--- components/feature_engagement/public/event_constants.h.orig 2020-02-03 21:52:44 UTC +++ components/feature_engagement/public/event_constants.h @@ -14,15 +14,15 @@ namespace events { diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 082ff191855a..699be09ed7b4 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2020-03-03 18:53:53 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2020-02-03 21:53:30 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 625dda9252ab..415b6f1d8c71 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2020-03-03 18:53:53 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2020-02-03 21:53:30 UTC +++ components/feature_engagement/public/feature_constants.h @@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 7127f59f5e41..6bfd36f75f8d 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2020-03-03 18:53:53 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2020-03-16 18:39:48 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -58,7 +58,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedReadingListFeature, &kIPHBadgedTranslateManualTriggerFeature, #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) &kIPHFocusModeFeature, &kIPHGlobalMediaControlsFeature, -@@ -68,7 +68,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -69,7 +69,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHIncognitoWindowFeature, &kIPHNewTabFeature, #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index d7b0084fb495..246d10568f99 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2020-03-03 18:53:53 UTC +--- components/feature_engagement/public/feature_list.h.orig 2020-03-16 18:39:48 UTC +++ components/feature_engagement/public/feature_list.h -@@ -110,7 +110,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge +@@ -111,7 +111,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge "IPH_BadgedTranslateManualTrigger"); #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); -@@ -121,7 +121,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm +@@ -122,7 +122,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) @@ -18,7 +18,7 @@ // defined(OS_CHROMEOS) } // namespace -@@ -170,7 +170,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -172,7 +172,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), @@ -27,7 +27,7 @@ defined(OS_CHROMEOS) VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -181,7 +181,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -183,7 +183,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHIncognitoWindowFeature), VARIATION_ENTRY(kIPHNewTabFeature), #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 3b3abd6eb95c..ec853d75bd26 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,7 +1,7 @@ ---- components/feedback/anonymizer_tool.cc.orig 2019-10-21 19:06:29 UTC +--- components/feedback/anonymizer_tool.cc.orig 2020-03-16 18:40:30 UTC +++ components/feedback/anonymizer_tool.cc -@@ -14,7 +14,11 @@ - #include "base/strings/stringprintf.h" +@@ -15,7 +15,11 @@ + #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" #include "net/base/ip_address.h" +#if defined(OS_BSD) 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 34c9c69305ca..fdaa3f2f453c 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,4 +1,4 @@ ---- components/flags_ui/flags_state.cc.orig 2020-03-03 18:53:53 UTC +--- components/flags_ui/flags_state.cc.orig 2020-02-03 21:53:30 UTC +++ components/flags_ui/flags_state.cc @@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; 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 ce981fe07b83..d40f905a889e 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,4 +1,4 @@ ---- components/gcm_driver/gcm_client.h.orig 2020-03-03 18:53:53 UTC +--- components/gcm_driver/gcm_client.h.orig 2020-02-03 21:53:30 UTC +++ components/gcm_driver/gcm_client.h @@ -87,6 +87,7 @@ class GCMClient { PLATFORM_CROS, 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 253d8e2aecd6..52e43837a5bd 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,4 +1,4 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2020-03-03 18:53:53 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2020-02-03 21:53:30 UTC +++ components/gcm_driver/gcm_client_impl.cc @@ -135,6 +135,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 153d83f87b2b..b89758947847 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 2020-03-03 18:53:53 UTC +--- components/metrics/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ components/metrics/BUILD.gn -@@ -171,6 +171,11 @@ jumbo_static_library("metrics") { +@@ -173,6 +173,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index dcea970102f6..07a9dedb488d 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,4 +1,4 @@ ---- components/neterror/resources/neterror.js.orig 2020-03-03 18:53:53 UTC +--- components/neterror/resources/neterror.js.orig 2020-02-03 21:53:30 UTC +++ components/neterror/resources/neterror.js @@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) { } 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 8e74c0b77efd..658b31ad44fb 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 2020-03-03 18:53:53 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-03-16 18:40:30 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -749,7 +749,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -718,7 +718,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 6677371a0166..015ca5836d21 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,4 +1,4 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2019-09-09 21:55:14 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2020-03-16 18:40:30 UTC +++ components/new_or_sad_tab_strings.grdp @@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) @@ -36,3 +36,12 @@ <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer."> Restart your computer </message> +@@ -106,7 +106,7 @@ + Learn more + </message> + </if> +- <if expr="is_win or is_linux or is_macosx or chromeos"> ++ <if expr="is_win or is_posix or is_macosx or chromeos"> + <message name="IDS_SAD_TAB_ERROR_CODE" desc="The message displayed on the crashed web page indicating the type of the crash."> + Error code: <ph name="ERROR_CODE">$1<ex>STATUS_ACCESS_VIOLATION</ex></ph> + </message> 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 8475388fa886..f9e601a9a454 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt.h.orig 2020-03-03 18:53:53 UTC +--- components/os_crypt/os_crypt.h.orig 2020-02-03 21:53:30 UTC +++ components/os_crypt/os_crypt.h @@ -15,9 +15,9 @@ #include "base/strings/string16.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 505cdebf6da4..06a59baab59d 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,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-03-03 18:53:06 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-02-03 21:52:44 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.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 c522ff1beaeb..5eca40e4b2ae 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,15 +1,15 @@ ---- components/policy/resources/policy_templates.json.orig 2020-03-03 18:53:53 UTC +--- components/policy/resources/policy_templates.json.orig 2020-03-16 18:40:31 UTC +++ components/policy/resources/policy_templates.json -@@ -1081,7 +1081,7 @@ +@@ -1088,7 +1088,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, -- 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], -+ 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'chrome.freebsd:9-'], +- 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'], ++ 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-', 'chrome.freebsd:9-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1111,7 +1111,7 @@ +@@ -1118,7 +1118,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1138,7 +1138,7 @@ +@@ -1145,7 +1145,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1937,7 +1937,7 @@ +@@ -1944,7 +1944,7 @@ 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3780,7 +3780,7 @@ +@@ -3807,7 +3807,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3834,7 +3834,7 @@ +@@ -3861,7 +3861,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7302,7 +7302,7 @@ +@@ -7329,7 +7329,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8526,7 +8526,7 @@ +@@ -8621,7 +8621,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -9202,7 +9202,7 @@ +@@ -9297,7 +9297,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], '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 1d0f92fb0e24..0274c627676a 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,4 +1,4 @@ ---- components/policy/tools/generate_policy_source.py.orig 2020-03-03 18:53:54 UTC +--- components/policy/tools/generate_policy_source.py.orig 2020-02-03 21:53:30 UTC +++ components/policy/tools/generate_policy_source.py @@ -97,6 +97,7 @@ class PolicyDetails: 'chrome.linux', diff --git a/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc index 66155c52494c..b9eaf2aa1e95 100644 --- a/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2020-03-03 18:53:52 UTC -+++ chrome/browser/ssl/captive_portal_blocking_page.cc -@@ -135,7 +135,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c +--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2020-03-16 18:39:49 UTC ++++ components/security_interstitials/content/captive_portal_blocking_page.cc +@@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c wifi_service->GetConnectedNetworkSSID(&ssid, &error); if (!error.empty()) return std::string(); diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc new file mode 100644 index 000000000000..f6e9116c28d0 --- /dev/null +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -0,0 +1,29 @@ +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2020-02-24 18:39:14 UTC ++++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc +@@ -15,7 +15,7 @@ + + #if defined(OS_WIN) + #include "content/public/child/dwrite_font_proxy_init_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/cpp/font_loader.h" + #endif + +@@ -35,7 +35,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + // Initialize font access for Skia. + #if defined(OS_WIN) + content::InitializeDWriteFontProxy(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + mojo::PendingRemote<font_service::mojom::FontService> font_service; + content::UtilityThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -54,7 +54,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + // encoding to PNG or we could provide our own codec implementations. + + // Sanity check that fonts are working. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // No WebSandbox is provided on Linux so the local fonts aren't accessible. + // This is fine since since the subsetted fonts are provided in the SkPicture. + // However, we still need to check that the SkFontMgr starts as it is used by diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h new file mode 100644 index 000000000000..d84c48a27037 --- /dev/null +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -0,0 +1,20 @@ +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2020-02-26 13:13:33 UTC ++++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h +@@ -19,7 +19,7 @@ + #include "mojo/public/cpp/bindings/pending_receiver.h" + #include "mojo/public/cpp/bindings/receiver.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/cpp/font_loader.h" + #include "third_party/skia/include/core/SkRefCnt.h" + #endif +@@ -68,7 +68,7 @@ class PaintPreviewCompositorCollectionImpl + std::unique_ptr<PaintPreviewCompositorImpl>> + compositors_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp<font_service::FontLoader> font_loader_; + #endif + diff --git a/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc b/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc index 701521433208..c075e1c2a99c 100644 --- a/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc +++ b/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/device_info_sync_bridge.cc.orig 2020-03-03 18:53:54 UTC +--- components/sync_device_info/device_info_sync_bridge.cc.orig 2020-03-16 18:40:31 UTC +++ components/sync_device_info/device_info_sync_bridge.cc -@@ -445,11 +445,13 @@ void DeviceInfoSyncBridge::OnStoreCreated( +@@ -456,11 +456,13 @@ void DeviceInfoSyncBridge::OnStoreCreated( return; } diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index 37d940498d23..5c9398a7ea7c 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,34 +1,14 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-03-03 18:53:06 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-02-24 18:39:14 UTC +++ components/sync_device_info/local_device_info_util_linux.cc -@@ -8,6 +8,7 @@ - #include <string> - - #include "base/linux_util.h" -+#include "build/build_config.h" - - #if defined(OS_CHROMEOS) - #include "chromeos/constants/devicetype.h" -@@ -36,6 +37,23 @@ std::string GetChromeOSDeviceNameFromType() { - std::string GetPersonalizableDeviceNameInternal() { +@@ -37,8 +37,9 @@ std::string GetPersonalizableDeviceNameInternal() { #if defined(OS_CHROMEOS) return GetChromeOSDeviceNameFromType(); -+#elif defined(OS_BSD) -+ long len = sysconf(_SC_HOST_NAME_MAX); -+ -+ if (len == -1) -+ return "FreeBSD"; -+ -+ char *hostname = new (std::nothrow) char[len](); -+ -+ if ((hostname == nullptr) || (gethostname(hostname, len) == -1)) { -+ delete[](hostname); -+ return "FreeBSD"; -+ } -+ -+ std::string res{hostname}; -+ delete[](hostname); -+ -+ return res; #else - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. +- char hostname[HOST_NAME_MAX]; +- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. ++ int len = sysconf(_SC_HOST_NAME_MAX); ++ char hostname[len]; ++ if (gethostname(hostname, _SC_HOST_NAME_MAX) == 0) // Success. + return hostname; + return base::GetLinuxDistro(); + #endif diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc new file mode 100644 index 000000000000..5b6a93f948a3 --- /dev/null +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -0,0 +1,11 @@ +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-03-17 09:48:11 UTC ++++ components/url_formatter/spoof_checks/idn_spoof_checker.cc +@@ -262,7 +262,7 @@ IDNSpoofChecker::IDNSpoofChecker() { + // The ideal fix would be to change the omnibox font used for Thai. In + // that case, the Linux-only list should be revisited and potentially + // removed. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + "[ทนบพรหเแ๐ดลปฟม]", + #else + "[บพเแ๐]", diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc new file mode 100644 index 000000000000..ad1c4166adfc --- /dev/null +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -0,0 +1,20 @@ +--- components/viz/common/features.cc.orig 2020-03-17 09:49:01 UTC ++++ components/viz/common/features.cc +@@ -17,7 +17,7 @@ + namespace features { + + // Use Skia's readback API instead of GLRendererCopier. +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback", + base::FEATURE_ENABLED_BY_DEFAULT}; + #else +@@ -26,7 +26,7 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForG + #endif + + // Use the SkiaRenderer. +-#if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)) ++#if (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD) + const base::Feature kUseSkiaRenderer{"UseSkiaRenderer", + base::FEATURE_ENABLED_BY_DEFAULT}; + #else diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc new file mode 100644 index 000000000000..ea33615fe7e0 --- /dev/null +++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -0,0 +1,11 @@ +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2020-02-26 13:14:08 UTC ++++ components/viz/common/gpu/dawn_context_provider.cc +@@ -17,7 +17,7 @@ namespace { + dawn_native::BackendType GetDefaultBackendType() { + #if defined(OS_WIN) + return dawn_native::BackendType::D3D12; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return dawn_native::BackendType::Vulkan; + #else + NOTREACHED(); diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc index 5a966801f88d..bdfec86f1ddf 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.cc +++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc @@ -1,4 +1,4 @@ ---- components/viz/host/host_display_client.cc.orig 2020-03-03 18:53:07 UTC +--- components/viz/host/host_display_client.cc.orig 2020-02-03 21:52:45 UTC +++ components/viz/host/host_display_client.cc @@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( } diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.h b/www/chromium/files/patch-components_viz_host_host__display__client.h index 0ae9d3ec0ae3..4b57c1bf5f23 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.h +++ b/www/chromium/files/patch-components_viz_host_host__display__client.h @@ -1,4 +1,4 @@ ---- components/viz/host/host_display_client.h.orig 2020-03-03 18:53:07 UTC +--- components/viz/host/host_display_client.h.orig 2020-02-03 21:52:45 UTC +++ components/viz/host/host_display_client.h @@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc new file mode 100644 index 000000000000..7b27a7dd14d1 --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display_embedder/skia_output_device_dawn.cc.orig 2020-02-26 13:15:08 UTC ++++ components/viz/service/display_embedder/skia_output_device_dawn.cc +@@ -10,7 +10,7 @@ + + #if defined(OS_WIN) + #include <dawn_native/D3D12Backend.h> +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include <dawn_native/VulkanBackend.h> + #endif + diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc new file mode 100644 index 000000000000..a3cbc1921992 --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2020-03-17 09:50:06 UTC ++++ components/viz/service/display_embedder/skia_output_surface_impl.cc +@@ -224,7 +224,7 @@ void SkiaOutputSurfaceImpl::Reshape(const gfx::Size& s + if (characterization_.isValid()) { + // TODO(vasilyt): We temporary keep old code for linux to not interferee + // with M81. Remove this after. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp<SkColorSpace> sk_color_space = color_space.ToSkColorSpace(); + if (!SkColorSpace::Equals(characterization_.colorSpace(), + sk_color_space.get())) { diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 167c3dd6fda6..a31cdeada8fc 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,4 +1,4 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-03-03 18:53:54 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-02-03 21:53:31 UTC +++ components/viz/service/display_embedder/software_output_surface.cc @@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: base::TimeTicks now = base::TimeTicks::Now(); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 83ba655afef4..78a386e1b26f 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,4 +1,4 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2019-12-17 19:30:42 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2020-03-16 18:40:31 UTC +++ components/viz/service/display_embedder/software_output_surface.h @@ -50,7 +50,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi UpdateVSyncParametersCallback callback) override; @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -72,7 +72,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_; ui::LatencyTracker latency_tracker_; diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 2cbe68ce1d91..f52c82d287af 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-03-03 18:53:54 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-03-16 18:40:31 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -353,7 +353,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -418,7 +418,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw #if defined(OS_ANDROID) if (display_client_) display_client_->DidCompleteSwapWithSize(pixel_size); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 1b8ce5d43855..0cd42362caa3 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,8 +1,8 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-03-03 18:53:54 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-03-16 18:40:31 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -138,7 +138,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp - // to the BFS. - std::unique_ptr<Display> display_; +@@ -149,7 +149,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp + base::TimeDelta preferred_frame_interval_ = + FrameRateDecider::UnspecifiedFrameInterval(); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc new file mode 100644 index 000000000000..59a258fd3b15 --- /dev/null +++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc @@ -0,0 +1,11 @@ +--- components/viz/test/fake_output_surface.cc.orig 2020-04-06 07:59:49 UTC ++++ components/viz/test/fake_output_surface.cc +@@ -114,7 +114,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra + : gfx::OVERLAY_TRANSFORM_NONE; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void FakeOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) {} + #endif diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.h b/www/chromium/files/patch-components_viz_test_fake__output__surface.h new file mode 100644 index 000000000000..5da27a2de0cd --- /dev/null +++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.h @@ -0,0 +1,11 @@ +--- components/viz/test/fake_output_surface.h.orig 2020-04-06 08:00:10 UTC ++++ components/viz/test/fake_output_surface.h +@@ -84,7 +84,7 @@ class FakeOutputSurface : public OutputSurface { + UpdateVSyncParametersCallback callback) override; + void SetDisplayTransformHint(gfx::OverlayTransform transform) override; + gfx::OverlayTransform GetDisplayTransform() override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif diff --git a/www/chromium/files/patch-components_viz_test_mock__display__client.h b/www/chromium/files/patch-components_viz_test_mock__display__client.h new file mode 100644 index 000000000000..43940cf13781 --- /dev/null +++ b/www/chromium/files/patch-components_viz_test_mock__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/test/mock_display_client.h.orig 2020-04-06 08:00:42 UTC ++++ components/viz/test/mock_display_client.h +@@ -35,7 +35,7 @@ class MockDisplayClient : public mojom::DisplayClient + MOCK_METHOD1(OnContextCreationResult, void(gpu::ContextResult)); + MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&)); + #endif + 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 801a7ec49b2e..dc4a030d4d3f 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,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2020-03-03 18:53:54 UTC +--- content/app/content_main_runner_impl.cc.orig 2020-03-16 18:40:31 UTC +++ content/app/content_main_runner_impl.cc @@ -101,17 +101,17 @@ #include "base/posix/global_descriptors.h" @@ -48,7 +48,7 @@ } // namespace -@@ -453,7 +453,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -462,7 +462,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -618,11 +618,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -622,11 +622,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID 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 86c7887d22b9..d390038358d3 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/browser_main_loop.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/browser_main_loop.cc -@@ -248,6 +248,13 @@ +@@ -242,6 +242,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -603,6 +610,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -613,6 +620,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,7 +26,7 @@ #endif #if defined(USE_X11) -@@ -648,7 +660,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -658,7 +670,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MACOSX) @@ -35,7 +35,7 @@ defined(OS_ANDROID) // 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. -@@ -658,7 +670,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -668,7 +680,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); 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 cfd02d65c1dc..49d1b92ec5ea 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,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2020-02-03 21:52:45 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -17,7 +17,9 @@ #include "content/public/common/sandboxed_process_launcher_delegate.h" diff --git a/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc deleted file mode 100644 index 16841a6d8d03..000000000000 --- a/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-03 18:53:54 UTC -+++ content/browser/compositor/gpu_process_transport_factory.cc -@@ -115,7 +115,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() { - return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager(); - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - class HostDisplayClient : public viz::HostDisplayClient { - public: - explicit HostDisplayClient(ui::Compositor* compositor) diff --git a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc deleted file mode 100644 index 17f9412277f1..000000000000 --- a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/compositor/software_browser_compositor_output_surface.cc.orig 2019-12-17 19:33:09 UTC -+++ content/browser/compositor/software_browser_compositor_output_surface.cc -@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe - const gfx::Size& pixel_size) { - latency_tracker_.OnGpuSwapBuffersCompleted(latency_info); - client_->DidReceiveSwapBuffersAck({swap_time, swap_time}); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (needs_swap_size_notifications_) - client_->DidSwapWithSize(pixel_size); - #endif -@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat - return 0; - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications( - bool needs_swap_size_notifications) { - needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h deleted file mode 100644 index c4dc95cc995e..000000000000 --- a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/compositor/software_browser_compositor_output_surface.h.orig 2019-12-17 19:33:36 UTC -+++ content/browser/compositor/software_browser_compositor_output_surface.h -@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu - gfx::BufferFormat GetOverlayBufferFormat() const override; - uint32_t GetFramebufferCopyTextureFormat() override; - unsigned UpdateGpuFence() override; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - void SetNeedsSwapSizeNotifications( - bool needs_swap_size_notifications) override; - #endif -@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu - base::TimeDelta refresh_interval_; - ui::LatencyTracker latency_tracker_; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - bool needs_swap_size_notifications_ = false; - #endif - diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 23e758657ea9..78851da5e325 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1039,7 +1039,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1086,7 +1086,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else 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 c51ff3e2787d..1e117219d0e9 100644 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_internals.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/media/media_internals.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/media/media_internals.cc -@@ -512,7 +512,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -531,7 +531,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit device_dict->SetString("id", descriptor.device_id); device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", std::move(format_list)); diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index d0a2b43620e0..dd7271ca2db7 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2020-02-03 21:53:31 UTC +++ content/browser/ppapi_plugin_process_host.cc @@ -365,7 +365,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 07e640435561..7e10ee7c69a9 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc @@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -454,7 +454,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index e1168b851bdb..f27d90720f9b 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -243,7 +243,7 @@ +@@ -241,7 +241,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1170,7 +1170,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1176,7 +1176,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1181,7 +1181,7 @@ size_t GetPlatformProcessLimit() { +@@ -1187,7 +1187,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1229,7 +1229,7 @@ class RenderProcessHostImpl::IOThreadHostImpl +@@ -1256,7 +1256,7 @@ class RenderProcessHostImpl::IOThreadHostImpl return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1628,7 +1628,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); 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 87bdb4d49bb3..616427da0032 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 2020-03-03 18:53:54 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -473,10 +473,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -458,10 +458,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } 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 11e23249aa65..06332b50ef27 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 2020-03-03 18:53:54 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -209,7 +209,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -206,7 +206,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( 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 a36380410c53..99de1314b9ec 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 2020-03-03 18:53:54 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -116,7 +116,7 @@ +@@ -115,7 +115,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 -@@ -2180,7 +2180,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2171,7 +2171,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2349,7 +2349,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2340,7 +2340,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 9cc2bca9f71f..7321b9e2f949 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,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-02-03 21:53:31 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -611,7 +611,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc index c3b68cfa677c..68b512d069c4 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc @@ -1,4 +1,4 @@ ---- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-02-03 21:53:31 UTC +++ content/browser/scheduler/responsiveness/jank_monitor.cc @@ -321,7 +321,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv // in context menus, among others). Simply ignore the mismatches for now. diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc index cf3156047b28..ebeeac2a51c1 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc @@ -1,4 +1,4 @@ ---- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-03-03 18:53:07 UTC +--- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-02-03 21:52:46 UTC +++ content/browser/scheduler/responsiveness/watcher.cc @@ -101,7 +101,7 @@ void Watcher::DidRunTask(const base::PendingTask* task // in context menus, among others). Simply ignore the mismatches for now. diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index d0b26266bcf9..8360a7efdc5e 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,9 +1,9 @@ ---- content/browser/utility_process_host.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/utility_process_host.cc.orig 2020-03-16 18:40:32 UTC +++ content/browser/utility_process_host.cc -@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -210,7 +210,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) - : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), + : sandbox_type_(service_manager::SandboxType::kUtility), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc new file mode 100644 index 000000000000..a69a1ccfe8b3 --- /dev/null +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-02-26 13:18:37 UTC ++++ content/browser/utility_process_host_receiver_bindings.cc +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #endif +@@ -17,7 +17,7 @@ namespace content { + + void UtilityProcessHost::BindHostReceiver( + mojo::GenericPendingReceiver receiver) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc new file mode 100644 index 000000000000..957c743c222c --- /dev/null +++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -0,0 +1,11 @@ +--- content/browser/v8_snapshot_files.cc.orig 2020-02-24 18:39:15 UTC ++++ content/browser/v8_snapshot_files.cc +@@ -10,7 +10,7 @@ + namespace content { + + std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #if defined(USE_V8_CONTEXT_SNAPSHOT) + return {{kV8ContextSnapshotDataDescriptor, + base::FilePath(FILE_PATH_LITERAL("v8_context_snapshot.bin"))}}; 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 f468e7c7d363..cb181bd0c0b3 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,9 +1,9 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-03 18:53:54 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-16 18:39:50 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -127,12 +127,12 @@ const std::map<int, std::string> CreateMojoResourceIdT - "mojo/mojo/public/mojom/base/string16.mojom.html"}, - {IDR_MOJO_STRING16_MOJOM_LITE_JS, - "mojo/mojo/public/mojom/base/string16.mojom-lite.js"}, +@@ -131,12 +131,12 @@ const std::map<int, std::string> CreateMojoResourceIdT + "mojo/mojo/public/mojom/base/text_direction.mojom.html"}, + {IDR_MOJO_TEXT_DIRECTION_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {IDR_MOJO_TIME_MOJOM_HTML, diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 7852fb5e712d..3d0913b5242b 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 2020-03-03 18:53:54 UTC +--- content/common/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/common/BUILD.gn -@@ -363,6 +363,12 @@ source_set("common") { +@@ -356,6 +356,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index d4bcd918e54e..d842b3145b5d 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 2019-12-16 21:51:26 UTC +--- content/common/user_agent.cc.orig 2020-03-16 18:40:32 UTC +++ content/common/user_agent.cc -@@ -128,6 +128,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ +@@ -140,6 +140,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ #endif ); diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index afcf8717e50b..538b4bc2f7bc 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 2020-03-03 18:53:54 UTC +--- content/gpu/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/gpu/BUILD.gn -@@ -132,7 +132,7 @@ target(link_target_type, "gpu_sources") { +@@ -128,7 +128,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 0c5c883fa985..ba08acddf473 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,7 +1,7 @@ ---- content/gpu/gpu_main.cc.orig 2020-03-03 18:53:54 UTC +--- content/gpu/gpu_main.cc.orig 2020-03-16 18:40:32 UTC +++ content/gpu/gpu_main.cc -@@ -82,7 +82,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +@@ -84,7 +84,7 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) @@ -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" -@@ -106,7 +106,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -177,7 +177,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_); -@@ -298,7 +298,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) { main_thread_task_executor = std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif defined(OS_MACOSX) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -409,7 +409,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -442,7 +442,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -45,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -444,7 +444,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -479,7 +479,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 f84cd2b50156..55ec485ae8ec 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,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-10-21 19:06:32 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-03-16 18:39:50 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -96,8 +96,9 @@ static const char kLibV4lEncPluginPath[] = +@@ -97,8 +97,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -299,8 +300,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -333,8 +334,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -315,6 +318,7 @@ void LoadArmGpuLibraries() { +@@ -349,6 +352,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -370,6 +374,7 @@ bool LoadLibrariesForGpu( +@@ -404,6 +408,7 @@ bool LoadLibrariesForGpu( return true; } @@ -38,7 +38,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -390,13 +395,17 @@ bool BrokerProcessPreSandboxHook( +@@ -425,13 +430,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } 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 ad1bf261357d..8708f1d34421 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,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-03-03 18:53:07 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-02-03 21:52:46 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -19,7 +19,7 @@ diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc index 3ca404881fac..22a460c346ac 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.cc +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/public/app/content_main_delegate.cc.orig 2019-09-16 15:21:10 UTC +--- content/public/app/content_main_delegate.cc.orig 2020-03-16 18:40:32 UTC +++ content/public/app/content_main_delegate.cc -@@ -38,13 +38,13 @@ bool ContentMainDelegate::DelaySandboxInitialization( +@@ -39,13 +39,13 @@ bool ContentMainDelegate::DelaySandboxInitialization( return false; } diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h index 7039e037f355..06f339f70e30 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.h +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h @@ -1,6 +1,6 @@ ---- content/public/app/content_main_delegate.h.orig 2019-09-16 14:44:25 UTC +--- content/public/app/content_main_delegate.h.orig 2020-03-16 18:40:32 UTC +++ content/public/app/content_main_delegate.h -@@ -71,7 +71,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -72,7 +72,7 @@ class CONTENT_EXPORT ContentMainDelegate { // want it at all. virtual bool DelaySandboxInitialization(const std::string& process_type); @@ -9,12 +9,12 @@ // Tells the embedder that the zygote process is starting, and allows it to // specify one or more zygote delegates if it wishes by storing them in // |*delegates|. -@@ -81,7 +81,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -82,7 +82,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called every time the zygote process forks. virtual void ZygoteForked() {} -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - // Allows the embedder to prevent locking the scheme registry. The scheme - // registry is the list of URL schemes we recognize, with some additional + // Fatal errors during initialization are reported by this function, so that + // the embedder can implement graceful exit by displaying some message and 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 d36f993375e9..bf91f4c4d0d2 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,4 +1,4 @@ ---- content/public/common/child_process_host.h.orig 2020-03-03 18:53:07 UTC +--- content/public/common/child_process_host.h.orig 2020-02-03 21:52:46 UTC +++ content/public/common/child_process_host.h @@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. 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 750426134dc3..3fa7b395b5ef 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 2020-03-03 18:53:54 UTC +--- content/public/common/common_param_traits_macros.h.orig 2020-03-16 18:40:32 UTC +++ content/public/common/common_param_traits_macros.h -@@ -332,7 +332,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -326,7 +326,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index aa85ea8dec8e..ebaa5f3fdb2a 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2020-03-03 18:53:54 UTC +--- content/public/common/content_features.cc.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_features.cc @@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess{ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -622,7 +622,7 @@ const base::Feature kWebAssemblyThreads { +@@ -693,7 +693,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -18,7 +18,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -657,7 +657,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -723,7 +723,7 @@ const base::Feature kWebAuth{"WebAuthentication", // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", 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 b3773936ea5b..4f1ae111a366 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2020-03-03 18:53:54 UTC +--- content/public/common/content_switches.cc.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_switches.cc -@@ -981,7 +981,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -997,7 +997,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = // Enable indication that browser is controlled by automation. const char kEnableAutomation[] = "enable-automation"; 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 c552a5ffc51a..1a705f45ae7f 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2020-03-03 18:53:54 UTC +--- content/public/common/content_switches.h.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_switches.h -@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -278,7 +278,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif 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 c6f0b6c699eb..dd60982ba019 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,6 +1,15 @@ ---- content/public/test/browser_test_base.cc.orig 2020-03-03 18:53:54 UTC +--- content/public/test/browser_test_base.cc.orig 2020-04-03 04:11:32 UTC +++ content/public/test/browser_test_base.cc -@@ -96,6 +96,10 @@ +@@ -71,7 +71,7 @@ + #include "ui/gl/gl_implementation.h" + #include "ui/gl/gl_switches.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck + #endif + +@@ -98,6 +98,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif @@ -11,3 +20,12 @@ #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif +@@ -184,7 +188,7 @@ BrowserTestBase::BrowserTestBase() + "a new browser test suite that runs on Android, please add it to " + "//build/android/pylib/gtest/gtest_test_instance.py."; + g_instance_already_created = true; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + ui::test::EnableTestConfigForPlatformWindows(); + #endif + diff --git a/www/chromium/files/patch-content_public_test_content__browser__test.cc b/www/chromium/files/patch-content_public_test_content__browser__test.cc new file mode 100644 index 000000000000..cc6012d2f89e --- /dev/null +++ b/www/chromium/files/patch-content_public_test_content__browser__test.cc @@ -0,0 +1,29 @@ +--- content/public/test/content_browser_test.cc.orig 2020-04-06 08:25:58 UTC ++++ content/public/test/content_browser_test.cc +@@ -26,7 +26,7 @@ + #include "base/mac/foundation_util.h" + #endif + +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + #include "ui/base/ime/init/input_method_initializer.h" + #endif + +@@ -83,7 +83,7 @@ void ContentBrowserTest::SetUp() { + #endif + + // LinuxInputMethodContextFactory has to be initialized. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + ui::InitializeInputMethodForTesting(); + #endif + +@@ -96,7 +96,7 @@ void ContentBrowserTest::TearDown() { + BrowserTestBase::TearDown(); + + // LinuxInputMethodContextFactory has to be shutdown. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + ui::ShutdownInputMethodForTesting(); + #endif + } diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index efc61cde9ec7..c0badaab0886 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2019-10-21 19:06:33 UTC +--- content/renderer/render_process_impl.cc.orig 2020-03-16 18:40:32 UTC +++ content/renderer/render_process_impl.cc @@ -43,7 +43,7 @@ #if defined(OS_WIN) @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -158,7 +158,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); 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 d47db5e03123..c231b5944895 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 2020-03-03 18:53:54 UTC +--- content/renderer/render_thread_impl.cc.orig 2020-03-16 18:40:32 UTC +++ content/renderer/render_thread_impl.cc -@@ -173,12 +173,21 @@ +@@ -172,12 +172,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -735,7 +744,7 @@ void RenderThreadImpl::Init() { +@@ -731,7 +740,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( -@@ -758,7 +767,7 @@ void RenderThreadImpl::Init() { +@@ -754,7 +763,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -40,7 +40,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1128,7 +1137,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1136,7 +1145,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); 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 dfc9bcf44553..716ffe45a392 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,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2020-03-03 18:53:54 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-03-16 18:40:32 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -99,7 +99,7 @@ +@@ -98,7 +98,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -173,7 +173,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( if (RenderThreadImpl::current()) { io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -265,7 +265,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -36,7 +36,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -278,7 +278,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { 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 1744edc06672..5aa4c9e85488 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2020-03-03 18:53:54 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2020-02-03 21:53:31 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" 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 6ed0afba21b3..3c78e664138b 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,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2020-03-16 18:39:50 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } @@ -6,7 +6,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +#if !defined(OS_BSD) // 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 + // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md // @@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 6c05b238e528..6a640a666c6a 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2020-03-03 18:53:54 UTC +--- content/shell/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/shell/BUILD.gn -@@ -995,7 +995,7 @@ group("content_shell_crash_test") { +@@ -932,7 +932,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 4574abd3dab6..9e3e50211c22 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,15 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2019-12-16 21:50:48 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2020-03-16 18:40:32 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit - - v8_crashpad_support::SetUp(); - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); - #endif - #if defined(OS_MACOSX) -@@ -313,7 +313,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit +@@ -306,7 +306,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit } void ShellMainDelegate::PreSandboxStartup() { @@ -18,3 +9,12 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; +@@ -325,7 +325,7 @@ void ShellMainDelegate::PreSandboxStartup() { + // Reporting for sub-processes will be initialized in ZygoteForked. + if (process_type != service_manager::switches::kZygoteProcess) { + crash_reporter::InitializeCrashpad(process_type.empty(), process_type); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + crash_reporter::SetFirstChanceExceptionHandler( + v8::TryHandleWebAssemblyTrapPosix); + #endif diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc index d8e238acfb46..09235357330e 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-03-03 18:53:08 UTC +--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-02-03 21:52:46 UTC +++ content/shell/browser/web_test/web_test_browser_context.cc @@ -27,7 +27,7 @@ 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 index 50271b9aaf4c..c2e390ce3a41 100644 --- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc @@ -1,6 +1,6 @@ ---- content/shell/test_runner/test_runner.cc.orig 2020-03-03 18:53:54 UTC +--- content/shell/test_runner/test_runner.cc.orig 2020-03-16 18:40:32 UTC +++ content/shell/test_runner/test_runner.cc -@@ -64,7 +64,7 @@ +@@ -62,7 +62,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" @@ -9,7 +9,7 @@ #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1507,7 +1507,7 @@ void TestRunner::Reset() { +@@ -1532,7 +1532,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); @@ -18,7 +18,7 @@ blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2081,7 +2081,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2111,7 +2111,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn new file mode 100644 index 000000000000..6c7ec5a20c2c --- /dev/null +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -0,0 +1,11 @@ +--- content/utility/BUILD.gn.orig 2020-03-18 12:50:25 UTC ++++ content/utility/BUILD.gn +@@ -78,7 +78,7 @@ jumbo_source_set("utility") { + deps += [ "//services/proxy_resolver:lib" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ "//content/utility/soda:soda_sandbox_hook" ] + } + } diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index ee6969e5bdc2..222316adc8f5 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 2019-09-09 21:55:17 UTC +--- device/bluetooth/BUILD.gn.orig 2020-03-16 18:39:51 UTC +++ device/bluetooth/BUILD.gn -@@ -277,7 +277,7 @@ component("bluetooth") { +@@ -275,7 +275,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 3502ee247994..7c9a18a60c34 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 2020-03-03 18:53:55 UTC +--- device/gamepad/gamepad_provider.cc.orig 2020-03-16 18:39:51 UTC +++ device/gamepad/gamepad_provider.cc -@@ -157,7 +157,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -147,7 +147,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_.reset(new base::Thread("Gamepad polling thread")); 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 index 59c7f20882a0..7ded2d7c1140 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2020-03-03 18:53:08 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2020-02-03 21:52:46 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -61,7 +61,7 @@ namespace { 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 fb0b04d14d89..d640fe45fcf4 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,4 +1,4 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-03-03 18:53:08 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:46 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc @@ -71,7 +71,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() HidDeviceManager::GetFactoryInstance(); 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 3dc767c961de..554abd741ba8 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2020-03-03 18:53:55 UTC +--- extensions/common/api/_permission_features.json.orig 2020-02-03 21:53:31 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index 7b8cc46d1826..9d5dea52dcbc 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 2020-03-03 18:53:55 UTC +--- extensions/common/api/runtime.json.orig 2020-02-03 21:53:31 UTC +++ extensions/common/api/runtime.json @@ -68,7 +68,7 @@ "id": "PlatformOs", diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index d5302c08fa13..7048ea59ebd3 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- extensions/common/image_util.cc.orig 2020-03-03 18:53:08 UTC +--- extensions/common/image_util.cc.orig 2020-02-03 21:52:47 UTC +++ extensions/common/image_util.cc @@ -18,7 +18,11 @@ #include "base/strings/stringprintf.h" diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index b9bfb1b60e04..7a7e1a0192c2 100644 --- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,4 +1,4 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-10-21 19:06:34 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2020-03-16 18:39:51 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc @@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. @@ -17,8 +17,8 @@ } // namespace @@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() { - base::Bind(&HeartbeatManager::OnHeartbeatTriggered, - weak_ptr_factory_.GetWeakPtr())); + base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, + weak_ptr_factory_.GetWeakPtr())); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) 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 b9e6dc47874d..3756044745e9 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,4 +1,4 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-12-16 21:50:48 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -50,7 +50,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { @@ -9,3 +9,12 @@ return GL_TEXTURE_EXTERNAL_OES; #elif defined(OS_WIN) || defined(OS_FUCHSIA) return GL_TEXTURE_2D; +@@ -72,7 +72,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer + + GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( + gfx::BufferFormat format) { +-#if defined(USE_OZONE) || defined(OS_LINUX) ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD) + // Always use GL_TEXTURE_2D as the target for RGB textures. + // https://crbug.com/916728 + if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index c86eb5c2088a..04701c95d5c1 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "ui/gl/buildflags.h" #include "ui/gl/gl_context.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -18,7 +18,7 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -535,7 +535,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -630,7 +630,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -27,12 +27,12 @@ if (!wgpu_format_) { DLOG(ERROR) << "Format not supported for Dawn"; return nullptr; -@@ -558,14 +558,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -653,14 +653,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd, image_info.fAlloc.fSize, memory_type_index_.value()); -#else // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN) -+#else // !defined(OS_LINUX) || !defined(OS_BSD) || !BUILDFLAG(USE_DAWN) ++#else // (!defined(OS_LINUX) && !defined(OS_BSD)) || !BUILDFLAG(USE_DAWN) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif @@ -44,7 +44,16 @@ GrVkImageInfo image_info; bool result = backend_texture_.getVkImageInfo(&image_info); DCHECK(result); -@@ -629,7 +629,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -710,7 +710,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return 0; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -724,7 +724,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa return nullptr; } @@ -53,7 +62,16 @@ if (!texture_) { GLuint texture_service_id = ProduceGLTextureInternal(); if (!texture_service_id) -@@ -675,7 +675,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( +@@ -755,7 +755,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -770,7 +770,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( return nullptr; } @@ -62,7 +80,16 @@ if (!texture_passthrough_) { GLuint texture_service_id = ProduceGLTextureInternal(); if (!texture_service_id) -@@ -713,7 +713,7 @@ ExternalVkImageBacking::ProduceSkia( +@@ -790,7 +790,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -808,7 +808,7 @@ ExternalVkImageBacking::ProduceSkia( tracker); } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h index 047406322b18..38283056309d 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-03 18:53:55 UTC +--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-16 18:40:32 UTC +++ gpu/command_buffer/service/external_vk_image_backing.h -@@ -135,7 +135,7 @@ class ExternalVkImageBacking final : public SharedImag +@@ -132,7 +132,7 @@ class ExternalVkImageBacking final : public ClearTrack base::Optional<WGPUTextureFormat> wgpu_format, base::Optional<uint32_t> memory_type_index); diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc index 4c669846b2e6..b94f6df0650f 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-02-03 21:53:31 UTC +++ gpu/command_buffer/service/external_vk_image_gl_representation.cc @@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk #if defined(OS_FUCHSIA) 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 index d34142ecbd39..efb8db3c0dc3 100644 --- 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 @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-10-21 19:06:35 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-03-16 18:39:51 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc -@@ -638,7 +638,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -642,7 +642,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); 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 index b92c65d18c57..9867201456bf 100644 --- 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 @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-16 18:39:51 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -23,7 +23,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -446,7 +446,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -445,7 +445,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } 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 5ae7d1d3f275..e666e762ba6a 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/config/gpu_control_list.cc.orig 2020-02-03 21:52:47 UTC +++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" 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 5690afc6a34e..d06bde69aa2d 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,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-12-16 21:50:48 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -12,7 +12,7 @@ +@@ -14,7 +14,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -40,7 +40,7 @@ namespace gpu { +@@ -42,7 +42,7 @@ namespace gpu { GpuMemoryBufferSupport::GpuMemoryBufferSupport() { #if defined(USE_OZONE) client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); @@ -27,7 +27,7 @@ client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -54,7 +54,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; @@ -36,16 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo - #elif defined(USE_OZONE) - return ui::OzonePlatform::GetInstance()->IsNativePixmapConfigSupported(format, - usage); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - return false; // TODO(julian.isorce): Add linux support. - #elif defined(OS_WIN) - switch (usage) { -@@ -168,7 +168,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -181,7 +181,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif 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 90974f04783c..2dff9b7c455a 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,11 +1,11 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_init.cc @@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif } --#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) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, @@ -13,8 +13,8 @@ } return res; } --#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST -+#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD +-#endif // OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST) ++#endif // (OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) class GpuWatchdogInit { public: @@ -27,7 +27,16 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -254,7 +254,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -221,7 +221,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + delayed_watchdog_enable = true; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // PreSandbox is mainly for resource handling and not related to the GPU + // driver, it doesn't need the GPU watchdog. The loadLibrary may take long + // time that killing and restarting the GPU process will not help. +@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -36,7 +45,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -263,7 +263,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -45,7 +54,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -288,14 +288,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -299,14 +299,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && use_swiftshader && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -62,7 +71,16 @@ } if (!gl_initialized) { -@@ -340,7 +340,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -332,7 +332,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + // The ContentSandboxHelper is currently the only one implementation of + // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where + // VaapiWrapper checks the GL implementation to determine which display +@@ -370,7 +370,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (use_swiftshader) { @@ -71,7 +89,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -384,7 +384,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -80,7 +98,7 @@ } } else { // use_swiftshader == true switch (gpu_preferences_.use_vulkan) { -@@ -410,7 +410,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -89,7 +107,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -429,7 +429,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -98,7 +116,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -608,7 +608,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -637,7 +637,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -107,7 +125,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -657,7 +657,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } 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 9e3587c5b859..bcadfa7d9e7b 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,15 +1,15 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-03-03 18:53:55 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -41,7 +41,7 @@ const int kGpuTimeout = 15000; - const int kGpuTimeout = 10000; - #endif +@@ -63,7 +63,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve + base::UmaHistogramEnumeration("GPU.WatchdogThread.V1.Timeout", timeout_event); + } -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); #endif -@@ -60,7 +60,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -81,7 +81,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() arm_cpu_time_(), #endif suspension_counter_(this) @@ -18,16 +18,16 @@ , host_tty_(-1) #endif -@@ -77,7 +77,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -103,7 +103,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() DCHECK(result); #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); - host_tty_ = GetActiveTTY(); - #endif -@@ -223,7 +223,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { + UpdateActiveTTY(); + host_tty_ = active_tty_; +@@ -251,7 +251,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { base::PowerMonitor::RemoveObserver(this); @@ -36,21 +36,21 @@ if (tty_file_) fclose(tty_file_); #endif -@@ -380,7 +380,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR +@@ -434,7 +434,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) // 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) { -@@ -538,7 +538,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT + UpdateActiveTTY(); + if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) { +@@ -609,7 +609,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - int GpuWatchdogThreadImplV1::GetActiveTTY() const { - char tty_string[8] = {0}; - if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) && + void GpuWatchdogThreadImplV1::UpdateActiveTTY() { + last_active_tty_ = active_tty_; + 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 50aac7881244..e81e9e60d43d 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,15 +1,15 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-03 18:53:55 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -181,7 +181,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -207,7 +207,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 base::ThreadTicks GetWatchedThreadTime(); #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - int GetActiveTTY() const; + void UpdateActiveTTY(); #endif -@@ -232,7 +232,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -265,7 +265,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded. bool is_watchdog_start_histogram_recorded = false; @@ -17,4 +17,4 @@ +#if defined(USE_X11) && !defined(OS_BSD) FILE* tty_file_; int host_tty_; - #endif + int active_tty_ = -1; diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index ff5fd1185a79..a6794bea5437 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-12-16 21:50:48 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -772,7 +772,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -782,7 +782,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -791,9 +791,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -801,9 +801,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } @@ -21,7 +21,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -813,7 +813,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -823,7 +823,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index e5514a4712ac..5684a3f44924 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-12-16 21:50:48 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-03-16 18:40:32 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -178,15 +178,15 @@ struct VulkanFunctionPointers { +@@ -180,15 +180,15 @@ struct VulkanFunctionPointers { vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr; #endif // defined(OS_ANDROID) @@ -20,7 +20,7 @@ #if defined(OS_FUCHSIA) PFN_vkImportSemaphoreZirconHandleFUCHSIA -@@ -374,18 +374,18 @@ struct VulkanFunctionPointers { +@@ -378,18 +378,18 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif // defined(OS_ANDROID) 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 5d096c3693b6..86931c284dea 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,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2020-03-03 18:53:55 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-03-16 18:39:51 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -167,7 +167,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -157,7 +157,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } @@ -9,7 +9,7 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -178,7 +178,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -168,7 +168,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } @@ -18,3 +18,12 @@ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, +@@ -231,7 +231,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL + process_type, child_process_id); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (old_command_line.HasSwitch(::switches::kEnableThreadInstructionCount) && + old_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { 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 f567f0d622bc..f29e51b1a4f7 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,7 +1,7 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-12-16 21:51:26 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2020-03-16 18:39:51 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C - ::storage::OptionalQuotaSettingsCallback callback) override; +@@ -29,7 +29,7 @@ class HeadlessContentBrowserClient : public content::C + override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 60060b8cb5bc..b6d23a82eac8 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2020-03-03 18:53:55 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2020-03-16 18:39:51 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -401,7 +401,7 @@ int HeadlessContentMainDelegate::RunProcess( +@@ -405,7 +405,7 @@ int HeadlessContentMainDelegate::RunProcess( } #endif // !defined(CHROME_MULTIPLE_DLL_CHILD) @@ -9,7 +9,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -436,7 +436,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { +@@ -440,7 +440,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { breakpad::InitCrashReporter(process_type); #endif } diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h index a805eb5b8352..ea587103f60e 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.h.orig 2019-09-16 09:51:15 UTC +--- headless/lib/headless_content_main_delegate.h.orig 2020-03-16 18:39:51 UTC +++ headless/lib/headless_content_main_delegate.h -@@ -58,7 +58,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate +@@ -60,7 +60,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate HeadlessBrowserImpl* browser() const { return browser_.get(); } diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 69ca7a701911..81baee2eca8d 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,4 +1,4 @@ ---- ipc/ipc_channel.h.orig 2020-03-03 18:53:55 UTC +--- ipc/ipc_channel.h.orig 2020-02-03 21:53:32 UTC +++ ipc/ipc_channel.h @@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc index d072a49e94de..9a59e5cfaff6 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__common.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc @@ -1,4 +1,4 @@ ---- ipc/ipc_channel_common.cc.orig 2020-03-03 18:53:09 UTC +--- ipc/ipc_channel_common.cc.orig 2020-02-03 21:52:47 UTC +++ ipc/ipc_channel_common.cc @@ -10,7 +10,7 @@ diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index bd4e1c1e0669..54e779282f74 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,4 +1,4 @@ ---- ipc/ipc_channel_mojo.cc.orig 2020-03-03 18:53:09 UTC +--- ipc/ipc_channel_mojo.cc.orig 2020-02-03 21:52:47 UTC +++ ipc/ipc_channel_mojo.cc @@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory { }; diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index dbe1208a42bd..39fc150c1a08 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,4 +1,4 @@ ---- ipc/ipc_message_utils.h.orig 2020-03-03 18:53:55 UTC +--- ipc/ipc_message_utils.h.orig 2020-02-03 21:53:32 UTC +++ ipc/ipc_message_utils.h @@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 39b61db0c9b0..2e46acb021a0 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2019-10-21 19:06:36 UTC +--- media/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ media/BUILD.gn -@@ -62,6 +62,9 @@ config("media_config") { +@@ -63,6 +63,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 2e1945fd79d7..a37b99f54c9c 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2020-03-03 18:53:55 UTC +--- media/audio/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ media/audio/BUILD.gn -@@ -238,8 +238,18 @@ source_set("audio") { +@@ -232,8 +232,18 @@ source_set("audio") { ] } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc new file mode 100644 index 000000000000..ed61b97adc9d --- /dev/null +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -0,0 +1,11 @@ +--- media/base/media_switches.cc.orig 2020-03-17 10:01:08 UTC ++++ media/base/media_switches.cc +@@ -331,7 +331,7 @@ const base::Feature kFallbackAfterDecodeError{"Fallbac + const base::Feature kGlobalMediaControls { + "GlobalMediaControls", + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 3e67bea9ce3d..d37ffac67837 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2019-12-16 21:50:49 UTC +--- media/base/video_frame.h.orig 2020-03-16 18:40:33 UTC +++ media/base/video_frame.h @@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -30,7 +30,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 -@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -480,7 +480,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; diff --git a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc deleted file mode 100644 index 0615f3daefd8..000000000000 --- a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- media/gpu/chromeos/libyuv_image_processor.cc.orig 2020-03-03 18:53:55 UTC -+++ media/gpu/chromeos/libyuv_image_processor.cc -@@ -82,7 +82,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce - // LibYUVImageProcessor supports only memory-based video frame for input. - VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; - for (auto input_type : input_config.preferred_storage_types) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (input_type == VideoFrame::STORAGE_DMABUFS) { - video_frame_mapper = VideoFrameMapperFactory::CreateMapper( - input_config.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS, -@@ -92,7 +92,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce - break; - } - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - if (VideoFrame::IsStorageTypeMappable(input_type)) { - input_storage_type = input_type; -@@ -191,7 +191,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V - FrameReadyCB cb) { - DCHECK(process_thread_.task_runner()->BelongsToCurrentThread()); - DVLOGF(4); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { - DCHECK_NE(video_frame_mapper_.get(), nullptr); - input_frame = video_frame_mapper_->Map(std::move(input_frame)); -@@ -201,7 +201,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V - return; - } - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - int res = DoConversion(input_frame.get(), output_frame.get()); - if (res != 0) { diff --git a/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc deleted file mode 100644 index 239b614155f5..000000000000 --- a/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- media/gpu/linux/platform_video_frame_utils.cc.orig 2020-03-03 18:53:55 UTC -+++ media/gpu/linux/platform_video_frame_utils.cc -@@ -20,16 +20,16 @@ - #include "ui/gfx/linux/native_pixmap_dmabuf.h" - #include "ui/gfx/native_pixmap.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "gpu/ipc/common/gpu_client_ids.h" - #include "gpu/ipc/service/gpu_memory_buffer_factory.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - namespace media { - - namespace { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - scoped_refptr<VideoFrame> CreateVideoFrameGpu( - gpu::GpuMemoryBufferFactory* factory, -@@ -93,7 +93,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu( - gpu::kPlatformVideoFramePoolClientId)); - return frame; - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - } // namespace - -@@ -105,11 +105,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame( - const gfx::Size& natural_size, - base::TimeDelta timestamp, - gfx::BufferUsage buffer_usage) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return CreateVideoFrameGpu(gpu_memory_buffer_factory, pixel_format, - coded_size, visible_rect, natural_size, timestamp, - buffer_usage); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - NOTREACHED(); - return nullptr; - } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 1cc64ea23549..f2783c3581d2 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2020-03-03 18:53:55 UTC +--- media/media_options.gni.orig 2020-03-16 18:40:33 UTC +++ media/media_options.gni -@@ -114,6 +114,9 @@ declare_args() { +@@ -119,6 +119,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc index b081630dcb72..b208560a307d 100644 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -1,6 +1,6 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-03 18:53:55 UTC +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-16 18:40:33 UTC +++ media/mojo/clients/mojo_video_encode_accelerator.cc -@@ -125,7 +125,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< +@@ -132,7 +132,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< frame->layout().num_planes()); DCHECK(vea_.is_bound()); diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 4f312cd5d1f1..46396d067968 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,4 +1,4 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-03-03 18:53:55 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-02-24 18:39:18 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -20,9 +20,9 @@ #include "ui/gfx/mojom/buffer_types_mojom_traits.h" 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 index dad633c19ec8..ea181aa1b1f3 100644 --- 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 @@ -1,6 +1,6 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-03-03 18:53:55 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-03-16 18:40:33 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -65,7 +65,7 @@ namespace media { +@@ -64,7 +64,7 @@ namespace media { namespace { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ gpu::CommandBufferStub* GetCommandBufferStub( scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, -@@ -266,7 +266,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea +@@ -263,7 +263,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea command_buffer_id->route_id)); } 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 1ba6c08ab843..3941ed5af217 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,4 +1,4 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-03-03 18:53:55 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-02-03 21:53:32 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } diff --git a/www/chromium/files/patch-media_webrtc_webrtc__switches.cc b/www/chromium/files/patch-media_webrtc_webrtc__switches.cc index fe7ce64aa997..68078dc67afd 100644 --- a/www/chromium/files/patch-media_webrtc_webrtc__switches.cc +++ b/www/chromium/files/patch-media_webrtc_webrtc__switches.cc @@ -1,4 +1,4 @@ ---- media/webrtc/webrtc_switches.cc.orig 2020-03-03 18:53:10 UTC +--- media/webrtc/webrtc_switches.cc.orig 2020-02-03 21:52:48 UTC +++ media/webrtc/webrtc_switches.cc @@ -50,7 +50,7 @@ namespace media { 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 5ea2a402790f..dec03d588689 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,4 +1,4 @@ ---- mojo/public/c/system/thunks.cc.orig 2020-03-03 18:53:10 UTC +--- mojo/public/c/system/thunks.cc.orig 2020-02-03 21:52:48 UTC +++ mojo/public/c/system/thunks.cc @@ -15,7 +15,7 @@ #include "build/build_config.h" 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 0d14b7fefa78..b0970950923b 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,6 +1,6 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-07-24 18:58:31 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2020-03-16 18:39:53 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -60,7 +60,7 @@ +@@ -70,7 +70,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 5bcf6bd11e09..2696770beb1c 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2020-03-03 18:53:55 UTC +--- net/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ net/BUILD.gn @@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1834,6 +1834,17 @@ component("net") { +@@ -1247,6 +1247,16 @@ component("net") { ] } @@ -19,15 +19,14 @@ + "base/address_tracker_linux.h", + "base/network_change_notifier_linux.cc", + "base/network_change_notifier_linux.h", -+ "base/network_interfaces_linux.cc", -+ "base/network_interfaces_linux.h", ++ "base/network_interfaces_linux.cc" + ] + } + if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1960,7 +1971,7 @@ component("net") { +@@ -1373,7 +1383,7 @@ component("net") { } } @@ -36,7 +35,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1991,7 +2002,7 @@ component("net") { +@@ -1406,7 +1416,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc new file mode 100644 index 000000000000..306de5e6d980 --- /dev/null +++ b/www/chromium/files/patch-net_base_features.cc @@ -0,0 +1,11 @@ +--- net/base/features.cc.orig 2020-03-17 10:02:15 UTC ++++ net/base/features.cc +@@ -88,7 +88,7 @@ const base::FeatureParam<int> + #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + const base::Feature kCertVerifierBuiltinFeature { + "CertVerifierBuiltin", +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT 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 0ca035347120..b570610a6483 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2020-03-03 18:53:10 UTC +--- net/base/network_change_notifier.cc.orig 2020-02-03 21:52:49 UTC +++ net/base/network_change_notifier.cc @@ -35,7 +35,7 @@ #include "net/base/network_change_notifier_linux.h" 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 ed5556e0cdac..752211dde398 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,4 +1,4 @@ ---- net/dns/host_resolver_proc.cc.orig 2020-03-03 18:53:11 UTC +--- net/dns/host_resolver_proc.cc.orig 2020-02-03 21:52:49 UTC +++ net/dns/host_resolver_proc.cc @@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host, base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, 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 2f62f5a2fb54..f4c603544da0 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,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2020-03-03 18:53:11 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2020-02-03 21:52:49 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc index 8690e1d62050..e23051d78497 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator.cc.orig 2019-09-09 21:55:22 UTC +--- net/nqe/network_quality_estimator.cc.orig 2020-03-16 18:40:33 UTC +++ net/nqe/network_quality_estimator.cc -@@ -101,7 +101,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { +@@ -100,7 +100,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: 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 index e537d3a1a8a7..6851ab0d6bc3 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-03 18:53:55 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-16 18:39:54 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2146,7 +2146,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa +@@ -2107,7 +2107,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // enabled only on certain platforms. // ChromeOS is disabled due to crbug.com/986904 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 26e797554e92..cd644766442f 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,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2019-03-11 22:01:01 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2020-03-16 18:40:33 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -495,6 +497,7 @@ int StringToIntOrDefault(base::StringPiece value, int +@@ -511,6 +513,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. -@@ -986,6 +989,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1000,6 +1003,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1197,8 +1201,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1214,8 +1218,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 6e7336c7e7e9..ef8a51424888 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,4 +1,4 @@ ---- net/proxy_resolution/proxy_resolution_service.cc.orig 2020-03-03 18:53:55 UTC +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2020-02-03 21:52:49 UTC +++ net/proxy_resolution/proxy_resolution_service.cc @@ -49,7 +49,7 @@ #elif defined(OS_MACOSX) 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 4f85194037f2..3e87bd2fcfd9 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,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-12-16 21:51:27 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2020-03-16 18:39:54 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -50,7 +50,7 @@ void SetUpOnNetworkThread( +@@ -51,7 +51,7 @@ void SetUpOnNetworkThread( 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_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc index a36a1acb0dd7..fd2e091f9f61 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2020-03-03 18:53:55 UTC +--- net/url_request/url_request_context.cc.orig 2020-03-16 18:39:54 UTC +++ net/url_request/url_request_context.cc -@@ -90,7 +90,7 @@ const HttpNetworkSession::Context* URLRequestContext:: +@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext:: return &network_session->context(); } diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index 704db7f9e921..cc9af1e29180 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2020-03-03 18:53:55 UTC +--- net/url_request/url_request_context.h.orig 2020-03-16 18:40:33 UTC +++ net/url_request/url_request_context.h -@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext +@@ -82,7 +82,7 @@ class NET_EXPORT URLRequestContext // session. const HttpNetworkSession::Context* GetNetworkSessionContext() const; 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 a75586b2ba1b..0144efb4a529 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 2020-03-03 18:53:55 UTC +--- net/url_request/url_request_context_builder.cc.orig 2020-03-16 18:40:33 UTC +++ net/url_request/url_request_context_builder.cc -@@ -508,7 +508,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -507,7 +507,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ProxyResolutionService::CreateSystemProxyConfigService()'s signature // doesn't suck. -@@ -517,7 +517,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -516,7 +516,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index cf78d4fd225a..c1b3c3d2c8a3 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,4 +1,4 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2020-03-03 18:53:55 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2020-03-16 18:40:33 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -52,7 +52,7 @@ #include "ui/gfx/geometry/rect.h" @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2832,7 +2832,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2861,7 +2861,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); @@ -45,7 +45,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3326,7 +3326,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3357,7 +3357,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 17531b7125b1..bd63ba366842 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,6 +1,6 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2019-03-11 22:01:01 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2020-03-16 18:39:54 UTC +++ ppapi/proxy/file_io_resource.cc -@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; @@ -24,7 +24,7 @@ } if (increase > 0) { -@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -318,7 +320,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else @@ -33,7 +33,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( +@@ -594,9 +596,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); 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 index 8f0959c6de4e..ca1e5dce0129 100644 --- 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 @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-03-03 18:53:11 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-02-03 21:52:49 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -29,12 +29,12 @@ #include "remoting/host/switches.h" 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 a32651ac406f..4773f4846b88 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2020-03-03 18:53:55 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2020-03-16 18:40:33 UTC +++ remoting/host/remoting_me2me_host.cc @@ -118,13 +118,13 @@ #include "remoting/host/mac/permission_utils.h" @@ -30,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -356,7 +356,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -357,7 +357,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 -@@ -586,10 +586,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -582,10 +582,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; -@@ -784,7 +784,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -780,7 +780,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), -@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() { +@@ -866,7 +866,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()-> -@@ -879,7 +879,7 @@ void HostProcess::StartOnUiThread() { +@@ -875,7 +875,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 = -@@ -934,7 +934,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -930,7 +930,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. -@@ -1538,7 +1538,7 @@ void HostProcess::StartHost() { +@@ -1529,7 +1529,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 -@@ -1708,7 +1708,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1698,7 +1698,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_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index 8c0b8bbe8274..34c07b2c400d 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,4 +1,4 @@ ---- remoting/resources/remoting_strings.grd.orig 2020-03-03 18:53:55 UTC +--- remoting/resources/remoting_strings.grd.orig 2020-02-03 21:53:32 UTC +++ remoting/resources/remoting_strings.grd @@ -1393,7 +1393,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. Open Screen Recording Preferences diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni index 896bf2107142..b5a277f82178 100644 --- a/www/chromium/files/patch-sandbox_features.gni +++ b/www/chromium/files/patch-sandbox_features.gni @@ -1,10 +1,11 @@ ---- sandbox/features.gni.orig 2019-03-11 22:01:01 UTC +--- sandbox/features.gni.orig 2020-03-16 18:39:54 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" || -- current_cpu == "mips64el") -+ current_cpu == "mips64el") && !is_bsd - - use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi +@@ -8,7 +8,7 @@ import("//build/config/nacl/config.gni") + # currently. + # Do not disable seccomp_bpf anywhere without talking to + # security@chromium.org! +-use_seccomp_bpf = (is_linux || is_android) && ++use_seccomp_bpf = (is_linux || is_android) && !is_bsd && + (current_cpu == "x86" || current_cpu == "x64" || + current_cpu == "arm" || current_cpu == "arm64" || + current_cpu == "mipsel" || current_cpu == "mips64el") diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index bc35eec1057d..3b9d933a14cd 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- sandbox/linux/BUILD.gn.orig 2020-03-16 18:39:54 UTC +++ sandbox/linux/BUILD.gn @@ -12,12 +12,12 @@ if (is_android) { } @@ -16,7 +16,7 @@ } if (is_nacl_nonsfi) { -@@ -379,7 +379,7 @@ component("sandbox_services") { +@@ -370,7 +370,7 @@ component("sandbox_services") { public_deps += [ ":sandbox_services_headers" ] } @@ -25,7 +25,7 @@ cflags = [ "-fgnu-inline-asm" ] sources -= [ -@@ -387,6 +387,8 @@ component("sandbox_services") { +@@ -378,6 +378,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", -@@ -405,6 +407,10 @@ component("sandbox_services") { +@@ -396,6 +398,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_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index 26ae997cccd8..6046b28b1771 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2020-03-03 18:53:55 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2020-03-16 18:39:54 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -93,7 +95,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -92,7 +94,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 e89839210f01..32423e1a0600 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,7 +1,7 @@ ---- services/audio/BUILD.gn.orig 2019-04-30 22:22:56 UTC +--- services/audio/BUILD.gn.orig 2020-03-16 18:39:54 UTC +++ services/audio/BUILD.gn -@@ -99,7 +99,7 @@ source_set("lib") { - "//services/service_manager/sandbox:sandbox", +@@ -82,7 +82,7 @@ source_set("audio") { + "//services/service_manager/sandbox", ] - if (is_linux) { 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 0a25ec923dd0..17db61b295df 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,4 +1,4 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2020-03-03 18:53:55 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2020-02-03 21:53:32 UTC +++ services/device/geolocation/location_arbitrator.cc @@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider( diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc index 243b64d68e0e..1ede85233d94 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2019-12-17 20:07:49 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2020-03-17 15:11:01 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,375 @@ +@@ -0,0 +1,383 @@ +// Copyright 2014 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. @@ -19,6 +19,7 @@ +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" ++#include "base/files/file_util.h" +#include "base/files/file.h" +#include "base/location.h" +#include "base/logging.h" @@ -42,9 +43,9 @@ + +struct HidServiceFreeBSD::ConnectParams { + ConnectParams(scoped_refptr<HidDeviceInfo> device_info, -+ const ConnectCallback& callback) ++ ConnectCallback callback) + : device_info(std::move(device_info)), -+ callback(callback), ++ callback(std::move(callback)), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( + base::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} @@ -162,9 +163,15 @@ + } + + scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( -+ device_id, vendor_id, product_id, product_name, serial_number, ++ device_id, ++ /*physical_device_id*/"", ++ vendor_id, ++ product_id, ++ product_name, ++ serial_number, + device::mojom::HidBusType::kHIDBusTypeUSB, -+ report_descriptor, device_node)); ++ report_descriptor, ++ device_node)); + + task_runner_->PostTask(FROM_HERE, base::Bind(&HidServiceFreeBSD::AddDevice, + service_, device_info)); @@ -329,50 +336,51 @@ + HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() + << "': " + << base::File::ErrorToString(device_file.error_details()); -+ task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr)); ++ task_runner->PostTask(FROM_HERE, ++ base::BindOnce(std::move(params->callback), nullptr)); + return; + } + params->fd.reset(device_file.TakePlatformFile()); -+ FinishOpen(std::move(params)); ++ task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::FinishOpen, ++ std::move(params))); +} + +void HidServiceFreeBSD::Connect(const std::string& device_guid, -+ const ConnectCallback& callback) { ++ ConnectCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { + base::ThreadTaskRunnerHandle::Get()->PostTask( -+ FROM_HERE, base::Bind(callback, nullptr)); ++ FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } + + scoped_refptr<HidDeviceInfo> device_info = map_entry->second; + -+ auto params = std::make_unique<ConnectParams>(device_info, callback); -+ ++ auto params = std::make_unique<ConnectParams>(device_info, std::move(callback)); + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = + params->blocking_task_runner; ++ + blocking_task_runner->PostTask( -+ FROM_HERE, base::Bind(&HidServiceFreeBSD::OpenOnBlockingThread, -+ base::Passed(¶ms))); ++ FROM_HERE, base::BindOnce(&HidServiceFreeBSD::OpenOnBlockingThread, ++ std::move(params))); +} + +// static +void HidServiceFreeBSD::FinishOpen(std::unique_ptr<ConnectParams> params) { -+ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; ++ DCHECK(params->fd.is_valid()); + -+ task_runner->PostTask( -+ FROM_HERE, -+ base::Bind(&HidServiceFreeBSD::CreateConnection, base::Passed(¶ms))); -+} ++ if (!base::SetNonBlocking(params->fd.get())) { ++ HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd"; ++ std::move(params->callback).Run(nullptr); ++ } + -+// static -+void HidServiceFreeBSD::CreateConnection(std::unique_ptr<ConnectParams> params) { -+ DCHECK(params->fd.is_valid()); -+ params->callback.Run(base::MakeRefCounted<HidConnectionFreeBSD>( -+ std::move(params->device_info), std::move(params->fd), -+ std::move(params->blocking_task_runner))); ++ std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFreeBSD>( ++ std::move(params->device_info), ++ std::move(params->fd), ++ std::move(params->blocking_task_runner) ++ )); +} + +} // namespace device 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 2c515c6ba632..593c762ba5a1 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,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2019-03-17 01:47:14 UTC +--- services/device/hid/hid_service_freebsd.h.orig 2020-03-17 15:11:01 UTC +++ services/device/hid/hid_service_freebsd.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,47 @@ +// Copyright 2014 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. @@ -25,7 +25,7 @@ + ~HidServiceFreeBSD() override; + + void Connect(const std::string& device_guid, -+ const ConnectCallback& connect) override; ++ ConnectCallback connect) override; + base::WeakPtr<HidService> GetWeakPtr() override; + + private: @@ -34,7 +34,6 @@ + + static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); + static void FinishOpen(std::unique_ptr<ConnectParams> params); -+ static void CreateConnection(std::unique_ptr<ConnectParams> params); + + const scoped_refptr<base::SequencedTaskRunner> task_runner_; + const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; 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 2d81f2fea172..cff5f136f844 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 2020-03-03 18:53:55 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-03-16 18:39:54 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -126,7 +126,11 @@ class TimeZoneMonitorLinuxImpl +@@ -127,7 +127,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index e88a98800004..be4d33bb2644 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 2020-03-03 18:53:56 UTC +--- services/network/BUILD.gn.orig 2020-03-16 18:40:34 UTC +++ services/network/BUILD.gn -@@ -256,7 +256,6 @@ jumbo_component("network_service") { +@@ -260,7 +260,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 624fff97c379..888674c04595 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,11 +1,11 @@ ---- services/network/network_context.cc.orig 2020-03-03 18:53:56 UTC +--- services/network/network_context.cc.orig 2020-03-16 18:40:34 UTC +++ services/network/network_context.cc -@@ -1738,7 +1738,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -1758,7 +1758,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 6874115bce9d..1e69f01166a8 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2020-03-03 18:53:56 UTC +--- services/network/network_service.cc.orig 2020-03-16 18:40:34 UTC +++ services/network/network_service.cc -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#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) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -613,7 +613,7 @@ void NetworkService::OnCertDBChanged() { +@@ -627,7 +627,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { - #if !defined(IS_CHROMECAST) + #if !BUILDFLAG(IS_CHROMECAST) DCHECK(!os_crypt_config_set_); diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 51afcfcd83e0..5f21c0217c3a 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,8 +1,8 @@ ---- services/network/network_service.h.orig 2020-03-03 18:53:56 UTC +--- services/network/network_service.h.orig 2020-03-16 18:40:34 UTC +++ services/network/network_service.h -@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - mojom::NetworkService::GetNetworkListCallback callback) override; - void UpdateCRLSet(base::span<const uint8_t> crl_set) override; +@@ -150,7 +150,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + base::span<const uint8_t> config, + mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; void OnCertDBChanged() override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) 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 edfc14f60d03..79967079b24d 100644 --- a/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/sandbox/BUILD.gn.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/sandbox/BUILD.gn.orig 2020-03-16 18:40:34 UTC +++ services/service_manager/sandbox/BUILD.gn -@@ -28,7 +28,7 @@ component("sandbox") { +@@ -26,7 +26,7 @@ component("sandbox") { "//base", "//sandbox:common", ] 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 86ee061a6eff..c1871f137977 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,4 +1,4 @@ ---- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-03-03 18:53:56 UTC +--- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-02-03 21:53:32 UTC +++ services/service_manager/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc deleted file mode 100644 index 470cfc51ecb7..000000000000 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2020-03-03 18:53:56 UTC -+++ services/tracing/public/cpp/perfetto/trace_event_data_source.cc -@@ -101,7 +101,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata - #endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD) - } - --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 - // about efforts to unify base::TimeTicks across all platforms. - constexpr perfetto::protos::pbzero::ClockSnapshot::Clock::BuiltinClocks diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc new file mode 100644 index 000000000000..61e7cb3830ad --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc @@ -0,0 +1,23 @@ +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-03-17 10:13:47 UTC ++++ services/tracing/public/cpp/perfetto/trace_time.cc +@@ -13,13 +13,17 @@ namespace tracing { + + int64_t TraceBootTicksNow() { + // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + struct timespec ts; ++#if defined(OS_BSD) ++ int res = clock_gettime(CLOCK_UPTIME, &ts); ++#else + int res = clock_gettime(CLOCK_BOOTTIME, &ts); ++#endif + if (res != -1) + return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); + #endif + return TRACE_TIME_TICKS_NOW().since_origin().InNanoseconds(); + } + +-} // namespace tracing +\ No newline at end of file ++} // namespace tracing diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc new file mode 100644 index 000000000000..06d34c96b6cd --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-03-17 10:16:22 UTC ++++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +@@ -362,7 +362,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall + } + #endif + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // Linux ELF module IDs are 160bit integers, which we need to mangle + // down to 128bit integers to match the id that Breakpad outputs. + // Example on version '66.0.3359.170' x64: diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 5283b4987da8..330949cb3773 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 2020-03-03 18:55:22 UTC +--- third_party/angle/BUILD.gn.orig 2020-03-16 18:42:05 UTC +++ third_party/angle/BUILD.gn -@@ -389,6 +389,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -384,6 +384,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,14 +8,3 @@ ] } } -@@ -1107,10 +1108,6 @@ foreach(is_shared_library, - - if (is_linux) { - sources += util_linux_sources -- libs += [ -- "rt", -- "dl", -- ] - } - - if (is_mac) { 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 7cbf867a8e51..48998ce95915 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 2020-03-03 18:55:22 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-03-16 18:42:05 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib +@@ -286,7 +286,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di { impl = rx::CreateVulkanWin32Display(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 index 4e76dec713f3..380c2f0a1a4f 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-12-16 21:56:11 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-03-16 18:42:06 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -115,7 +115,7 @@ inline bool IsWindows() +@@ -122,7 +122,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index 9f44317c8cd6..aa021274cc80 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-03-03 18:55:22 UTC +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-02-03 21:54:48 UTC +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h -@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable(); +@@ -19,10 +19,10 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); #endif // defined(ANGLE_PLATFORM_WINDOWS) @@ -8,4 +8,8 @@ +#if defined(ANGLE_PLATFORM_POSIX) bool IsVulkanXcbDisplayAvailable(); DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); - #endif // defined(ANGLE_PLATFORM_LINUX) +-#endif // defined(ANGLE_PLATFORM_LINUX) ++#endif // defined(ANGLE_PLATFORM_POSIX) + + #if defined(ANGLE_PLATFORM_ANDROID) + bool IsVulkanAndroidDisplayAvailable(); 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 c2966002e5db..c03540dc02ea 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,4 +1,4 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-03-03 18:55:32 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-02-03 21:54:58 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c @@ -238,7 +238,7 @@ void *loader_device_heap_realloc(const struct loader_d } diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn index aa5fb90a1b0d..3ee19aa5429f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/BUILD.gn.orig 2019-07-29 20:47:32 UTC +--- third_party/blink/renderer/BUILD.gn.orig 2020-03-16 18:40:34 UTC +++ third_party/blink/renderer/BUILD.gn @@ -45,8 +45,8 @@ config("inside_blink") { "-Wconversion", @@ -9,5 +9,5 @@ +# "-Wno-implicit-float-conversion", +# "-Wno-implicit-int-conversion", ] - } - } + + if (!is_chromeos || default_toolchain != "//build/toolchain/cros:target") { diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc new file mode 100644 index 000000000000..f2b1624738c8 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-03-17 10:17:22 UTC ++++ third_party/blink/renderer/controller/blink_initializer.cc +@@ -69,7 +69,7 @@ + #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) + #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" + #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" +@@ -146,7 +146,7 @@ void InitializeCommon(Platform* platform, mojo::Binder + CrashMemoryMetricsReporterImpl::Instance(); + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) + // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. + if (UserLevelMemoryPressureSignalGenerator::Enabled()) diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h new file mode 100644 index 000000000000..0c30711ac49d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h @@ -0,0 +1,47 @@ +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-03-17 10:18:29 UTC ++++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h +@@ -12,7 +12,7 @@ + #include "third_party/blink/renderer/controller/controller_export.h" + #include "third_party/blink/renderer/controller/memory_usage_monitor.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h" + #endif + +@@ -21,7 +21,7 @@ namespace blink { + // MemoryUsageMonitor implementation for Android and Linux. + class CONTROLLER_EXPORT MemoryUsageMonitorPosix + : public MemoryUsageMonitor +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + public mojom::blink::MemoryUsageMonitorLinux + #endif +@@ -29,7 +29,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + public: + MemoryUsageMonitorPosix() = default; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static void Bind( + mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver); + #endif +@@ -47,7 +47,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + uint64_t* vm_size, + uint64_t* vm_hwm_size); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // mojom::MemoryUsageMonitorLinux implementations: + void SetProcFiles(base::File statm_file, base::File status_file) override; + #endif +@@ -65,7 +65,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + base::ScopedFD statm_fd_; + base::ScopedFD status_fd_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this}; + #endif + }; 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 f57e563f421d..1ba55b799c74 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 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2020-03-16 18:39:56 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -270,7 +270,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -274,7 +274,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 535d1aa384a8..af22ef50a74c 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,4 +1,4 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-03-03 18:53:56 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-02-03 21:52:51 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -41,7 +41,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin base::TimeDelta::FromMicroseconds(100); 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 671f2bbd9987..d05dcc105788 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 2019-10-21 19:06:43 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -121,7 +121,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -122,7 +122,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); 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 index 5e753b6d6dc4..eb2c92cf0610 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-09-09 21:55:24 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() { +@@ -326,7 +326,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); 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 26c4d8eda76a..8414327a53f4 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 2020-03-03 18:53:56 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -105,7 +105,7 @@ namespace { +@@ -106,7 +106,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 9e4133bfb5ec..2d02c5dfa4c2 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,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-03 18:53:56 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-16 18:39:56 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop @@ -9,7 +9,7 @@ return false; #endif -@@ -312,7 +312,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT +@@ -301,7 +301,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc index 62e7b64416f3..14dc2ef5bb1a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2019-12-16 21:51:29 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-03-16 18:39:56 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -421,7 +421,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -444,7 +444,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-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 9c1dab685e23..6c239154d0c0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-12-16 21:51:29 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -106,6 +106,7 @@ executable("character_data_generator") { +@@ -100,6 +100,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] 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 f96e232e52d8..086b16ed616f 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-03-03 18:53:14 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-02-03 21:52:52 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; 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 ba3281904051..ea74c8b323ef 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-03-03 18:53:57 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-02-03 21:52:52 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" 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 e1d4836d47ba..97991dfed588 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,4 +1,4 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-03-03 18:54:05 UTC +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-02-03 21:53:08 UTC +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni @@ -38,7 +38,7 @@ if (crashpad_is_in_chromium) { crashpad_is_mac = is_mac 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 3f024ae50bdd..ba45bf4dc184 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 2019-04-30 22:25:52 UTC +--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2020-03-16 18:42:08 UTC +++ third_party/googletest/src/googletest/src/gtest-port.cc -@@ -63,6 +63,11 @@ +@@ -64,6 +64,11 @@ # endif #endif @@ -12,7 +12,7 @@ #if GTEST_OS_QNX # include <devctl.h> # include <fcntl.h> -@@ -137,6 +142,28 @@ size_t GetThreadCount() { +@@ -138,6 +143,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 baa7c326c7b9..e56b6079f8f5 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 2019-03-11 22:08:00 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-03-16 18:42:08 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -114,6 +114,7 @@ +@@ -118,6 +118,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT 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 5d8251542cbf..74a2d6efc9a1 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,4 +1,4 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2019-06-04 18:55:45 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2020-03-16 18:40:42 UTC +++ third_party/leveldatabase/env_chromium.cc @@ -40,7 +40,11 @@ #include "third_party/leveldatabase/leveldb_chrome.h" @@ -10,5 +10,5 @@ #include "third_party/re2/src/re2/re2.h" +#endif - #if defined(OS_WIN) - #undef DeleteFile + using base::FilePath; + using base::trace_event::MemoryAllocatorDump; 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 e0a802df2fbb..272bf7a50bf9 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 2019-07-24 19:03:29 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-03-16 18:42:12 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -151,9 +151,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa +@@ -155,9 +155,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_third__party_base_allocator_partition__allocator_page__allocator.cc b/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc deleted file mode 100644 index 11fd9fb5076a..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc.orig 2019-06-04 18:58:01 UTC -+++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc -@@ -117,7 +117,7 @@ void* AllocPages(void* address, - uintptr_t align_base_mask = ~align_offset_mask; - DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS) - // On 64 bit Linux, we may need to adjust the address space limit for - // guarded allocations. - if (length >= kMinimumGuardedMemorySize) { 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 7091bf7ec791..02a9c66ed8e5 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,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-12-16 21:56:17 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h @@ -28,6 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 @@ -8,7 +8,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -35,13 +36,15 @@ +@@ -37,6 +38,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -16,16 +16,27 @@ #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__) +@@ -50,15 +52,27 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 ++#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 -@@ -49,6 +52,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 ++#elif defined(__FreeBSD__) ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 + #elif defined(_WIN32) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -33,7 +44,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -56,6 +60,7 @@ +@@ -68,6 +82,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 @@ -41,7 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -63,6 +68,7 @@ +@@ -77,6 +92,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 @@ -49,3 +60,11 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 +@@ -86,6 +102,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() 0 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index 929f374fb5fe..c8947d13ecbf 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,5 +1,5 @@ ---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2019-09-09 21:57:00 UTC -+++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-03-16 18:42:11 UTC ++++ third_party/perfetto/include/perfetto/base/thread_utils.h @@ -33,6 +33,9 @@ #include <sys/types.h> #include <unistd.h> @@ -11,14 +11,14 @@ namespace perfetto { namespace base { @@ -41,6 +44,11 @@ namespace base { - using PlatformThreadID = pid_t; - inline PlatformThreadID GetThreadId() { + using PlatformThreadId = pid_t; + inline PlatformThreadId GetThreadId() { return gettid(); +} +#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) -+using PlatformThreadID = int; -+inline PlatformThreadID GetThreadId() { ++using PlatformThreadId = pid_t; ++inline PlatformThreadId GetThreadId() { + return pthread_getthreadid_np(); } #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) - using PlatformThreadID = pid_t; + using PlatformThreadId = pid_t; 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 73d6520cda68..7750793e8235 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 2019-10-21 19:09:14 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -141,6 +141,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 @@ inline TimeNanos GetBootTimeNs() { +@@ -148,6 +151,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc new file mode 100644 index 000000000000..1196437c938c --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc @@ -0,0 +1,20 @@ +--- third_party/perfetto/src/base/thread_task_runner.cc.orig 2020-03-19 11:48:14 UTC ++++ third_party/perfetto/src/base/thread_task_runner.cc +@@ -27,7 +27,7 @@ + #include "perfetto/base/logging.h" + #include "perfetto/ext/base/unix_task_runner.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) + #include <sys/prctl.h> + #endif +@@ -84,6 +84,8 @@ void ThreadTaskRunner::RunTaskThread( + if (!name_.empty()) { + #if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + pthread_setname_np(name_.c_str()); ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) ++ pthread_set_name_np(pthread_self(), name_.c_str()); + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) + prctl(PR_SET_NAME, name_.c_str()); 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 e7d37cb1bbb9..f14075502887 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,12 +1,20 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-03 18:55:28 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -593,7 +593,8 @@ void UnixSocket::ReadPeerCredentials() { +@@ -37,7 +37,7 @@ + #include "perfetto/ext/base/string_utils.h" + #include "perfetto/ext/base/utils.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + #include <sys/ucred.h> + #endif + +@@ -601,7 +601,7 @@ void UnixSocket::ReadPeerCredentials() { + if (sock_raw_.family() != SockFamily::kUnix) return; - #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) struct ucred user_cred; socklen_t len = sizeof(user_cred); - 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 a2057531c814..f778d36188f5 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,12 +1,10 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-03-03 18:55:28 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-03-16 18:42:12 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2193,7 +2193,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr - auto* clock_snapshot = packet->set_clock_snapshot(); +@@ -2306,6 +2306,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) struct { clockid_t id; - protos::pbzero::ClockSnapshot::Clock::BuiltinClocks type; 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 9b26c9eb7c2d..ce10a392a3de 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,4 +1,4 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-03-03 18:55:29 UTC +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-02-03 21:54:56 UTC +++ third_party/skia/src/ports/SkOSFile_stdio.cpp @@ -132,7 +132,7 @@ void sk_fflush(FILE* f) { diff --git a/www/chromium/files/patch-third__party_snappy_src_snappy.h b/www/chromium/files/patch-third__party_snappy_src_snappy.h deleted file mode 100644 index 824b209ee23c..000000000000 --- a/www/chromium/files/patch-third__party_snappy_src_snappy.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/snappy/src/snappy.h.orig 2020-01-22 18:43:16 UTC -+++ third_party/snappy/src/snappy.h -@@ -73,7 +73,7 @@ namespace snappy { - // Original contents of *output are lost. - // - // REQUIRES: "input[]" is not an alias of "*output". -- size_t Compress(const char* input, size_t input_length, string* output); -+ size_t Compress(const char* input, size_t input_length, std::string* output); - - // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed". - // Original contents of "*uncompressed" are lost. -@@ -82,7 +82,7 @@ namespace snappy { - // - // returns false if the message is corrupted and could not be decompressed - bool Uncompress(const char* compressed, size_t compressed_length, -- string* uncompressed); -+ std::string* uncompressed); - - // Decompresses "compressed" to "*uncompressed". - // diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn index 578678f40ae8..7869c319cc9c 100644 --- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn +++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/swiftshader/BUILD.gn.orig 2020-03-03 18:55:29 UTC +--- third_party/swiftshader/BUILD.gn.orig 2020-03-16 18:42:12 UTC +++ third_party/swiftshader/BUILD.gn -@@ -135,9 +135,6 @@ config("swiftshader_config") { +@@ -136,9 +136,6 @@ config("swiftshader_config") { ldflags = [ "-Wl,--gc-sections" ] if (target_cpu == "mipsel") { @@ -10,7 +10,7 @@ if (mips_arch_variant == "r1") { ldflags += [ "-mips32", -@@ -149,11 +146,8 @@ config("swiftshader_config") { +@@ -150,11 +147,8 @@ config("swiftshader_config") { } } else if (target_cpu == "mips64el") { ldflags += [ 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 296c1a3ab39f..3ca2cc4d69af 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,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-03-03 18:55:29 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-02-03 21:54:55 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp @@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType // FIXME: Check if display_id is the default display diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp index 269b0271959c..c4eeb77baf0d 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp @@ -1,18 +1,16 @@ ---- third_party/swiftshader/src/Vulkan/VkDebug.cpp.orig 2020-03-05 18:26:16 UTC +--- third_party/swiftshader/src/Vulkan/VkDebug.cpp.orig 2020-04-03 04:13:08 UTC +++ third_party/swiftshader/src/Vulkan/VkDebug.cpp -@@ -22,6 +22,11 @@ - #define PTRACE - #include <sys/types.h> - #include <sys/ptrace.h> -+# if defined(__FreeBSD__) -+# include <sys/sysctl.h> -+# include <sys/user.h> -+# include <unistd.h> -+# endif - #elif defined(_WIN32) || defined(_WIN64) - #include <windows.h> - #elif defined(__APPLE__) || defined(__MACH__) -@@ -33,7 +38,7 @@ namespace { +@@ -29,12 +29,17 @@ + # include <sys/sysctl.h> + # include <unistd.h> + #endif ++#if defined(__FreeBSD__) ++# include <sys/sysctl.h> ++# include <sys/user.h> ++# include <unistd.h> ++#endif + + namespace { bool IsUnderDebugger() { @@ -21,7 +19,7 @@ static bool checked = false; static bool res = false; -@@ -55,7 +60,7 @@ bool IsUnderDebugger() +@@ -56,7 +61,7 @@ bool IsUnderDebugger() return res; #elif defined(_WIN32) || defined(_WIN64) return IsDebuggerPresent() != 0; @@ -30,26 +28,26 @@ // Code comes from the Apple Technical Q&A QA1361 // Tell sysctl what info we're requestion. Specifically we're asking for -@@ -70,14 +75,22 @@ bool IsUnderDebugger() +@@ -71,14 +76,22 @@ bool IsUnderDebugger() struct kinfo_proc info; size_t size = sizeof(info); -+# if defined(__FreeBSD__) ++# if defined(__FreeBSD__) + info.ki_flag = 0; -+# else ++# else info.kp_proc.p_flag = 0; -+# endif ++# endif // Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0. res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0); ASSERT_MSG(res == 0, "syscl returned %d", res); // We're being debugged if the P_TRACED flag is set -+# if defined(__FreeBSD__) ++# if defined(__FreeBSD__) + return ((info.ki_flag & P_TRACED) != 0); -+# else ++# else return ((info.kp_proc.p_flag & P_TRACED) != 0); -+# endif ++# endif #else return false; #endif diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h index f15230997555..32c68edfca31 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h @@ -1,19 +1,19 @@ ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-09 21:57:03 UTC +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2020-03-16 18:42:15 UTC +++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h @@ -8,15 +8,15 @@ #define BUG_REPORT_URL "https://bugs.llvm.org/" /* Define to 1 to enable backtraces, and to 0 otherwise. */ --/* #undef ENABLE_BACKTRACES */ +-#define ENABLE_BACKTRACES 0 +#define ENABLE_BACKTRACES 1 /* Define to 1 to enable crash overrides, and to 0 otherwise. */ --/* #undef ENABLE_CRASH_OVERRIDES */ +-#define ENABLE_CRASH_OVERRIDES 0 +#define ENABLE_CRASH_OVERRIDES 1 /* Define to 1 if you have the `backtrace' function. */ -/* #undef HAVE_BACKTRACE */ -+#define HAVE_BACKTRACE TRUE ++#define HAVE_BACKTRACE 1 -/* #undef BACKTRACE_HEADER */ +#define BACKTRACE_HEADER <execinfo.h> diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 56b4edcc2068..431b2f75d72c 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 2020-03-03 18:55:30 UTC +--- third_party/webrtc/BUILD.gn.orig 2020-03-16 18:42:13 UTC +++ third_party/webrtc/BUILD.gn -@@ -170,6 +170,9 @@ config("common_inherited_config") { +@@ -171,6 +171,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 65ab904aec36..a9fe31ec37b8 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 2019-12-16 21:56:20 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2020-03-16 18:42:14 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -263,7 +263,7 @@ rtc_source_set("audio_device_impl") { +@@ -259,7 +259,7 @@ rtc_library("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_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index 126a1b8f615e..939381fc9f1a 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-07-24 19:03:36 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-03-16 18:42:14 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc @@ -51,7 +51,7 @@ #include "rtc_base/null_socket_server.h" @@ -36,24 +36,6 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -313,7 +313,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), --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - // 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 -@@ -342,7 +342,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), --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - // Suppress SIGPIPE. See above for explanation. - MSG_NOSIGNAL, - #else @@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; diff --git a/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni b/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni index 2ae6310b09d0..a54244fd5e3e 100644 --- a/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni +++ b/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni @@ -1,4 +1,4 @@ ---- third_party/yasm/yasm_assemble.gni.orig 2019-03-18 08:59:45 UTC +--- third_party/yasm/yasm_assemble.gni.orig 2020-03-16 18:40:14 UTC +++ third_party/yasm/yasm_assemble.gni @@ -1,105 +1,23 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. @@ -120,7 +120,7 @@ action_name = "${target_name}_action" source_set_name = target_name -@@ -114,24 +32,12 @@ template("yasm_assemble") { +@@ -114,22 +32,12 @@ template("yasm_assemble") { inputs = invoker.inputs } @@ -133,9 +133,7 @@ - root_build_dir) ] - - # Deps. -- deps = [ -- yasm_label, -- ] +- deps = [ yasm_label ] + deps = [] if (defined(invoker.deps)) { deps += invoker.deps @@ -147,7 +145,7 @@ if (defined(invoker.yasm_flags)) { args += invoker.yasm_flags } -@@ -188,9 +94,6 @@ template("yasm_assemble") { +@@ -184,9 +92,6 @@ template("yasm_assemble") { } sources = get_target_outputs(":$action_name") @@ -155,5 +153,5 @@ - # Do not publicize any header to remove build dependency. - public = [] - deps = [ - ":$action_name", + deps = [ ":$action_name" ] + } diff --git a/www/chromium/files/patch-third__party_zlib_arm__features.c b/www/chromium/files/patch-third__party_zlib_arm__features.c deleted file mode 100644 index b010b9740d02..000000000000 --- a/www/chromium/files/patch-third__party_zlib_arm__features.c +++ /dev/null @@ -1,60 +0,0 @@ ---- third_party/zlib/arm_features.c.orig 2020-03-03 18:54:06 UTC -+++ third_party/zlib/arm_features.c -@@ -12,10 +12,24 @@ - int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0; - int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; - -+/* -+ * FreeBSD: we implicitly inherit ARMV8_OS_LINUX via zlib/BUILD.gn and -+ * "is_linux," which is true for FreeBSD builds. -+ */ - #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) - #include <pthread.h> - #endif - -+#if defined(__FreeBSD__) -+#include <sys/types.h> -+#include <machine/armreg.h> -+#ifndef ID_AA64ISAR0_AES_VAL -+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES -+#endif -+#ifndef ID_AA64ISAR0_CRC32_VAL -+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+#endif -+#else /* !__FreeBSD__ */ - #if defined(ARMV8_OS_ANDROID) - #include <cpu-features.h> - #elif defined(ARMV8_OS_LINUX) -@@ -30,6 +44,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; - #else - #error arm_features.c ARM feature detection in not defined for your platform - #endif -+#endif /* __FreeBSD__ */ - - static void _arm_check_features(void); - -@@ -68,14 +83,24 @@ static void _arm_check_features(void) - arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32); - arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL); - #elif defined(ARMV8_OS_LINUX) && defined(__aarch64__) -+#if defined(__FreeBSD__) -+ uint64_t id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ arm_cpu_enable_pmull = -+ (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL); -+ arm_cpu_enable_crc32 = -+ (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE); -+#else - unsigned long features = getauxval(AT_HWCAP); - arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32); - arm_cpu_enable_pmull = !!(features & HWCAP_PMULL); -+#endif /* __FreeBSD__ */ - #elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__)) -+#if !defined(__FreeBSD__) - /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */ - unsigned long features = getauxval(AT_HWCAP2); - arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); - arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); -+#endif - #elif defined(ARMV8_OS_FUCHSIA) - uint32_t features; - zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features); diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 725f8e87f00b..1461138a4fd5 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,24 +1,24 @@ ---- tools/gn/build/gen.py.orig 2019-12-16 21:58:04 UTC +--- tools/gn/build/gen.py.orig 2020-03-16 18:48:21 UTC +++ tools/gn/build/gen.py -@@ -69,6 +69,9 @@ class Platform(object): - def is_aix(self): - return self._platform == 'aix' +@@ -73,6 +73,9 @@ class Platform(object): + def is_haiku(self): + return self._platform == 'haiku' + def is_freebsd(self): + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku'] -@@ -341,6 +344,11 @@ def WriteGNNinja(path, platform, host, options): - elif platform.is_aix(): - cflags_cc.append('-maix64') - ldflags.append('-maix64') +@@ -351,6 +354,11 @@ def WriteGNNinja(path, platform, host, options): + elif platform.is_haiku(): + cflags.append('-fPIC') + cflags.extend(['-D_BSD_SOURCE']) + elif platform.is_freebsd(): + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + ldflags.extend(['-pthread']) + libs.extend(['-lexecinfo', '-lkvm', '-lutil']) + include_dirs += ['/usr/local/include'] - if platform.is_posix(): + if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc index fbc622d301be..26958b7bf8f1 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_posix.cc.orig 2019-12-16 21:58:04 UTC -+++ tools/gn/base/files/file_posix.cc -@@ -409,7 +409,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +--- tools/gn/src/base/files/file_posix.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_posix.cc +@@ -372,7 +372,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util.h b/www/chromium/files/patch-tools_gn_src_base_files_file__util.h index f7fcdd6e92f3..910d80aa09c6 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__util.h +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__util.h @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_util.h.orig 2019-12-16 21:58:04 UTC -+++ tools/gn/base/files/file_util.h -@@ -360,7 +360,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& +--- tools/gn/src/base/files/file_util.h.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_util.h +@@ -325,7 +325,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& // the directory |path|, in the number of FilePath::CharType, or -1 on failure. int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc index b8972e166d3b..b5476cba713c 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_util_posix.cc.orig 2019-12-16 21:58:04 UTC -+++ tools/gn/base/files/file_util_posix.cc -@@ -250,7 +250,7 @@ bool ReplaceFile(const FilePath& from_path, +--- tools/gn/src/base/files/file_util_posix.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_util_posix.cc +@@ -210,7 +210,7 @@ bool ReplaceFile(const FilePath& from_path, } bool CreateLocalNonBlockingPipe(int fds[2]) { diff --git a/www/chromium/files/patch-tools_gn_base_files_scoped__file.cc b/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc index 8364317cad57..acc59789e438 100644 --- a/www/chromium/files/patch-tools_gn_base_files_scoped__file.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc @@ -1,5 +1,5 @@ ---- tools/gn/base/files/scoped_file.cc.orig 2019-06-04 19:02:25 UTC -+++ tools/gn/base/files/scoped_file.cc +--- tools/gn/src/base/files/scoped_file.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/scoped_file.cc @@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { // a single open directory would bypass the entire security model. int ret = IGNORE_EINTR(close(fd)); diff --git a/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc index fa20ffb97735..761ee60ca826 100644 --- a/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc +++ b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc @@ -1,5 +1,5 @@ ---- tools/gn/tools/gn/exec_process.cc.orig 2019-12-16 21:58:04 UTC -+++ tools/gn/tools/gn/exec_process.cc +--- tools/gn/src/gn/exec_process.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/gn/exec_process.cc @@ -30,6 +30,10 @@ #include "base/posix/file_descriptor_shuffle.h" #endif diff --git a/www/chromium/files/patch-tools_gn_util_sys__info.cc b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc index fdc4849fc8da..8b5fbb9cdb14 100644 --- a/www/chromium/files/patch-tools_gn_util_sys__info.cc +++ b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc @@ -1,5 +1,5 @@ ---- tools/gn/util/sys_info.cc.orig 2019-04-30 22:29:37 UTC -+++ tools/gn/util/sys_info.cc +--- tools/gn/src/util/sys_info.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/util/sys_info.cc @@ -28,6 +28,8 @@ std::string OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { 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 7d40dc338995..fda74ee7deec 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,4 +1,4 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2020-03-03 18:54:06 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2020-02-03 21:53:12 UTC +++ tools/json_schema_compiler/feature_compiler.py @@ -218,6 +218,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 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 89aa046b3a0b..ac82f274b479 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,11 +1,11 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-03-03 18:54:06 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -44,7 +44,7 @@ group("telemetry_chrome_test") { +@@ -46,7 +46,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - + data_deps += [ + "//third_party/breakpad:dump_syms($host_toolchain)", + "//third_party/crashpad/crashpad/tools:crashpad_database_util", 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 feeb6cb934a0..940d72d03d24 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,10 +1,10 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-07-24 18:59:17 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2020-03-16 18:40:14 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -33,6 +33,7 @@ finally: - _platforms = [ - 'android', - 'android_webview', -+ 'freebsd', - 'chromeos', - 'fuchsia', - 'ios', +@@ -35,6 +35,7 @@ _platforms = [ + 'android_weblayer', + 'android_webview', + 'chromeos', ++ 'freebsd', + 'fuchsia', + 'ios', + 'linux', 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 994b7d680b2e..91e1320a26f5 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 2020-03-03 18:54:06 UTC +--- ui/base/resource/resource_bundle.cc.orig 2020-03-16 18:40:15 UTC +++ ui/base/resource/resource_bundle.cc -@@ -819,7 +819,7 @@ void ResourceBundle::ReloadFonts() { +@@ -822,7 +822,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -872,7 +872,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -875,7 +875,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_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index ede1ae2d8c80..aa850d8e1146 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2020-03-03 18:54:06 UTC +--- ui/base/ui_base_features.cc.orig 2020-03-16 18:40:43 UTC +++ ui/base/ui_base_features.cc -@@ -122,7 +122,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo +@@ -113,7 +113,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) @@ -9,12 +9,12 @@ // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -132,7 +132,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -123,7 +123,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - const base::Feature kFormControlsRefresh = {"FormControlsRefresh", - base::FEATURE_DISABLED_BY_DEFAULT}; + // Disable the FormControlsRefresh feature for all platforms. See + // crbug.com/1057669. 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 52a283a567df..d86c205b8c2e 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.h.orig 2020-03-03 18:54:06 UTC +--- ui/base/ui_base_features.h.orig 2020-03-16 18:40:43 UTC +++ ui/base/ui_base_features.h -@@ -65,10 +65,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) +@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) 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 4e5091a81eaa..422ea71485b9 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 2020-03-03 18:54:06 UTC +--- ui/base/webui/web_ui_util.cc.orig 2020-03-16 18:40:15 UTC +++ ui/base/webui/web_ui_util.cc -@@ -237,7 +237,7 @@ std::string GetFontFamily() { +@@ -236,7 +236,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_base_x_x11__shm__image__pool__base.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc index ce8b89394918..7546426f2036 100644 --- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc +++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_shm_image_pool_base.cc.orig 2020-03-03 18:54:06 UTC +--- ui/base/x/x11_shm_image_pool_base.cc.orig 2020-03-16 18:40:43 UTC +++ ui/base/x/x11_shm_image_pool_base.cc @@ -16,6 +16,7 @@ #include "base/environment.h" @@ -7,8 +7,8 @@ +#include "base/system/sys_info.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" - #include "ui/events/platform/platform_event_dispatcher.h" -@@ -43,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold = + #include "net/base/url_util.h" +@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshold = 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { @@ -23,8 +23,8 @@ } std::size_t MaxShmSegmentSize() { -@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ - shmctl(state.shminfo_.shmid, IPC_RMID, 0); +@@ -199,7 +204,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + shmctl(state.shminfo_.shmid, IPC_RMID, nullptr); return false; } -#if defined(OS_LINUX) @@ -32,7 +32,7 @@ // On Linux, a shmid can still be attached after IPC_RMID if otherwise // kept alive. Detach before XShmAttach to prevent a memory leak in case // the process dies. -@@ -182,7 +187,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ +@@ -209,7 +214,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ if (!XShmAttach(display_, &state.shminfo_)) return false; state.shmem_attached_to_server_ = true; diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 6766154b2f5f..f89ddbcf2b9f 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2020-03-03 18:54:06 UTC +--- ui/compositor/compositor.cc.orig 2020-03-16 18:40:43 UTC +++ ui/compositor/compositor.cc -@@ -677,7 +677,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to +@@ -669,7 +669,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to NOTREACHED(); } diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 90b1ac52b7a2..89e662bc3e66 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2020-03-03 18:54:06 UTC +--- ui/compositor/compositor.h.orig 2020-03-16 18:40:43 UTC +++ ui/compositor/compositor.h -@@ -417,7 +417,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT +@@ -380,7 +380,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override; void OnFrameTokenChanged(uint32_t frame_token) override; diff --git a/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc b/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc index 56faf7a75d9f..b7be4b020629 100644 --- a/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc +++ b/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc @@ -1,6 +1,6 @@ ---- ui/compositor/host/host_context_factory_private.cc.orig 2020-03-03 18:54:06 UTC +--- ui/compositor/host/host_context_factory_private.cc.orig 2020-03-16 18:40:43 UTC +++ ui/compositor/host/host_context_factory_private.cc -@@ -30,7 +30,7 @@ namespace { +@@ -29,7 +29,7 @@ namespace { static const char* kBrowser = "Browser"; 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 ae795aaebad6..2bae1687515b 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,11 +1,11 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2019-03-11 22:01:19 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2020-03-16 18:40:15 UTC +++ ui/events/keycodes/dom/keycode_converter.cc -@@ -19,7 +19,7 @@ namespace { - // and DOM Level 3 |code| strings. +@@ -20,7 +20,7 @@ namespace { #if defined(OS_WIN) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code} + #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ + { usb, win, code } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code} + #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ + { usb, xkb, code } #elif defined(OS_MACOSX) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code} diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 5a82d2fb911f..be500c1b94d5 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2020-03-03 18:54:06 UTC +--- ui/gfx/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/BUILD.gn -@@ -597,7 +597,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -578,7 +578,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 1e410155f7b1..5d99916e4eb1 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,4 +1,4 @@ ---- ui/gfx/canvas_skia.cc.orig 2020-03-03 18:53:32 UTC +--- ui/gfx/canvas_skia.cc.orig 2020-02-03 21:53:13 UTC +++ ui/gfx/canvas_skia.cc @@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); diff --git a/www/chromium/files/patch-ui_gfx_font__names__testing.cc b/www/chromium/files/patch-ui_gfx_font__names__testing.cc new file mode 100644 index 000000000000..2c268488ae30 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_font__names__testing.cc @@ -0,0 +1,29 @@ +--- ui/gfx/font_names_testing.cc.orig 2020-04-06 08:38:05 UTC ++++ ui/gfx/font_names_testing.cc +@@ -22,7 +22,7 @@ Note that we have to support the full range from Jelly + dessert. + */ + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kTestFontName[] = "Arimo"; + #elif defined(OS_ANDROID) + const char kTestFontName[] = "sans-serif"; +@@ -30,7 +30,7 @@ const char kTestFontName[] = "sans-serif"; + const char kTestFontName[] = "Arial"; + #endif + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kSymbolFontName[] = "DejaVu Sans"; + #elif defined(OS_ANDROID) + const char kSymbolFontName[] = "monospace"; +@@ -40,7 +40,7 @@ const char kSymbolFontName[] = "Segoe UI Symbol"; + const char kSymbolFontName[] = "Symbol"; + #endif + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kCJKFontName[] = "Noto Sans CJK JP"; + #elif defined(OS_ANDROID) + const char kCJKFontName[] = "serif"; 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 7f11a7cd6e6c..a05a77674080 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2020-03-03 18:54:06 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2020-02-03 21:53:13 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" 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 9ee674c3c2d9..1741c4d863e8 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,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-12-16 21:51:34 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,7 +10,7 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -25,11 +27,7 @@ +@@ -26,11 +28,7 @@ #include "ui/gfx/buffer_format_util.h" #include "ui/gfx/switches.h" 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 e776e76aed58..20952718c93d 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2020-03-03 18:53:32 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -8,11 +8,15 @@ diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index a73fbe066d05..446317a3101a 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 2020-03-03 18:54:06 UTC +--- ui/gfx/render_text.cc.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/render_text.cc -@@ -1147,32 +1147,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -1169,32 +1169,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 9f25aec5c2a8..39f08eacf39a 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 2020-03-03 18:54:06 UTC +--- ui/gl/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ ui/gl/BUILD.gn -@@ -232,7 +232,7 @@ jumbo_component("gl") { +@@ -233,7 +233,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 16e5791b315f..c3ea0a6c23a3 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 2020-03-03 18:54:06 UTC +--- ui/gl/generate_bindings.py.orig 2020-03-16 18:40:43 UTC +++ ui/gl/generate_bindings.py -@@ -2766,6 +2766,9 @@ GLX_FUNCTIONS = [ +@@ -2777,6 +2777,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__autogen__glx.cc b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc index a1d3e4ed0763..4aeda03a0414 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,4 +1,4 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-03-03 18:53:32 UTC +--- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-02-24 18:39:44 UTC +++ ui/gl/gl_bindings_autogen_glx.cc @@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { 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 cdfdb9c6cd9a..96f69fe1f796 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 2020-03-03 18:54:07 UTC +--- ui/native_theme/native_theme_base.cc.orig 2020-03-16 18:40:43 UTC +++ ui/native_theme/native_theme_base.cc -@@ -230,7 +230,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -256,7 +256,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: PaintCheckbox(canvas, state, rect, extra.button, color_scheme); break; diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h index 00ca17ffaf1a..78b9f0444781 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2020-03-03 18:54:07 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2020-02-24 18:40:16 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -41,7 +41,7 @@ enum class PlatformWindowOpacity { 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 85b2669a3adb..9341a0bc5305 100644 --- a/www/chromium/files/patch-ui_strings_app__locale__settings.grd +++ b/www/chromium/files/patch-ui_strings_app__locale__settings.grd @@ -1,6 +1,6 @@ ---- ui/strings/app_locale_settings.grd.orig 2019-03-11 22:01:19 UTC +--- ui/strings/app_locale_settings.grd.orig 2020-03-16 18:40:15 UTC +++ ui/strings/app_locale_settings.grd -@@ -187,7 +187,7 @@ +@@ -216,7 +216,7 @@ 75% </message> </if> 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 b787b1f991ae..4cdcd2b4bfd1 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 2020-03-03 18:54:07 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -134,7 +134,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( +@@ -174,7 +174,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 c7d73670f738..f6f9790bdbae 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/label.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/controls/label.cc.orig 2020-02-03 21:53:40 UTC +++ ui/views/controls/label.cc @@ -695,7 +695,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); 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 15076b13a8f7..f22c358d52d8 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/controls/textfield/textfield.cc @@ -60,7 +60,7 @@ #include "base/win/win_util.h" @@ -9,10 +9,10 @@ #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" -@@ -178,14 +178,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke - case ui::VKEY_BACK: - if (!control) +@@ -183,14 +183,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke + #endif return ui::TextEditCommand::DELETE_BACKWARD; + } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -253,7 +253,7 @@ bool IsControlKeyModifier(int flags) { +@@ -258,7 +258,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,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -725,7 +725,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -730,7 +730,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -771,7 +771,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -776,7 +776,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; -@@ -918,7 +918,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -923,7 +923,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(); -@@ -2173,7 +2173,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { 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 db2d77d88767..ae3eee7d03ac 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,4 +1,4 @@ ---- ui/views/examples/widget_example.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/examples/widget_example.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/examples/widget_example.cc @@ -70,7 +70,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); 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 099e62d73df4..28a000e3e6de 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/style/platform_style.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/style/platform_style.cc @@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const #endif // OS_MACOSX -#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !defined(OS_LINUX) -+#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !(defined(OS_LINUX) || defined(OS_BSD)) ++#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || (!defined(OS_LINUX) && !defined(OS_BSD)) // static std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( LabelButton* button) { diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index 06d398d10ee8..6ed6c077584f 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/views_delegate.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/views_delegate.cc @@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 0f212e23ce6a..b5bdee958617 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.h.orig 2020-03-03 18:54:07 UTC +--- ui/views/views_delegate.h.orig 2020-02-03 21:53:14 UTC +++ ui/views/views_delegate.h @@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro 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 index ebddcc30c07a..ab44393b52fb 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -751,7 +751,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP +@@ -747,7 +747,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc index 7fa8449fd858..61706964d7c0 100644 --- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc +++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/widget/native_widget_aura.cc @@ -64,7 +64,7 @@ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif -@@ -1095,13 +1095,13 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1099,13 +1099,13 @@ void Widget::CloseAllSecondaryWidgets() { EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0); #endif 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 d4cb2c611428..b92881838304 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/window/dialog_delegate.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/window/dialog_delegate.cc.orig 2020-02-03 21:53:40 UTC +++ ui/views/window/dialog_delegate.cc @@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg 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 1f7c46e1a10c..18a363a65e8f 100644 --- a/www/chromium/files/patch-ui_views_window_frame__background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,4 +1,4 @@ ---- ui/views/window/frame_background.cc.orig 2020-03-03 18:54:07 UTC +--- ui/views/window/frame_background.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/window/frame_background.cc @@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv const View* view) const { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 6d6059b3c6b4..0fe25aa48094 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 2020-03-03 18:55:34 UTC +--- v8/BUILD.gn.orig 2020-03-16 18:42:16 UTC +++ v8/BUILD.gn -@@ -3561,7 +3561,7 @@ v8_component("v8_libbase") { +@@ -3616,7 +3616,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3581,6 +3581,12 @@ v8_component("v8_libbase") { +@@ -3636,6 +3636,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3840,6 +3846,7 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -3891,6 +3897,7 @@ if (current_toolchain == v8_snapshot_toolchain) { "src/snapshot/mksnapshot.cc", "src/snapshot/snapshot-empty.cc", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index faf9880d2637..f32636389a90 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2020-03-03 18:55:34 UTC +--- v8/src/api/api.cc.orig 2020-03-16 18:42:16 UTC +++ v8/src/api/api.cc -@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() { +@@ -5657,7 +5657,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc new file mode 100644 index 000000000000..14e3ac15e039 --- /dev/null +++ b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -0,0 +1,13 @@ +--- v8/src/base/platform/platform-freebsd.cc.orig 2020-03-24 16:12:11 UTC ++++ v8/src/base/platform/platform-freebsd.cc +@@ -81,8 +81,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib + lib_name = std::string(path); + } + result.push_back(SharedLibraryAddress( +- lib_name, reinterpret_cast<uintptr_t>(map->kve_start), +- reinterpret_cast<uintptr_t>(map->kve_end))); ++ lib_name, static_cast<uintptr_t>(map->kve_start), ++ static_cast<uintptr_t>(map->kve_end))); + } + + start += ssize; 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 2435d7cedfe5..e60a94f246f1 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,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2020-03-03 18:55:34 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2020-02-03 21:55:00 UTC +++ v8/src/base/platform/platform-posix.cc @@ -427,7 +427,7 @@ bool OS::DiscardSystemPages(void* address, size_t size diff --git a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc new file mode 100644 index 000000000000..ef8149182926 --- /dev/null +++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc @@ -0,0 +1,11 @@ +--- weblayer/app/content_main_delegate_impl.cc.orig 2020-03-17 10:35:42 UTC ++++ weblayer/app/content_main_delegate_impl.cc +@@ -146,7 +146,7 @@ bool ContentMainDelegateImpl::BasicStartupComplete(int + } + + void ContentMainDelegateImpl::PreSandboxStartup() { +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index c7d5f488a366..ca6a91a131c6 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2020-03-03 18:54:07 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-03-16 18:40:43 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,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/init/input_method_initializer.h" #endif -@@ -90,7 +90,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -109,7 +109,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index 88a23cf660b5..cdb4c7b0f2a0 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2020-03-03 18:54:07 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-03-16 18:40:43 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -65,7 +65,7 @@ +@@ -72,7 +72,7 @@ #include "weblayer/browser/safe_browsing/safe_browsing_service.h" #endif @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -232,7 +232,7 @@ ContentBrowserClientImpl::CreateNetworkContext( +@@ -247,7 +247,7 @@ ContentBrowserClientImpl::CreateNetworkContext( void ContentBrowserClientImpl::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) { @@ -18,7 +18,7 @@ network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); content::GetNetworkService()->SetCryptConfig(std::move(config)); #endif -@@ -371,7 +371,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -426,7 +426,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe } #endif @@ -27,7 +27,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -405,7 +405,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -460,7 +460,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index 9610755a3b77..41c6b7a9b08d 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,7 +1,7 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2020-01-07 21:53:35 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2020-03-16 18:40:43 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -80,12 +80,12 @@ class ContentBrowserClientImpl : public content::Conte - base::OnceCallback<void(base::Optional<storage::QuotaSettings>)> callback) +@@ -85,12 +85,12 @@ class ContentBrowserClientImpl : public content::Conte + service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) override; -#if defined(OS_LINUX) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc new file mode 100644 index 000000000000..4ac2c36b5362 --- /dev/null +++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc @@ -0,0 +1,11 @@ +--- weblayer/browser/system_network_context_manager.cc.orig 2020-03-17 10:36:11 UTC ++++ weblayer/browser/system_network_context_manager.cc +@@ -102,7 +102,7 @@ SystemNetworkContextManager::CreateSystemNetworkContex + + network_context_params->context_name = std::string("system"); + network_context_params->primary_network_context = true; +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + // We're not configuring the cookie encryption on these platforms yet. + network_context_params->enable_encrypted_cookies = false; + #endif diff --git a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc index 11beec6736d7..54019d8cc261 100644 --- a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc +++ b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc @@ -1,6 +1,6 @@ ---- weblayer/common/weblayer_paths.cc.orig 2019-12-17 20:03:36 UTC +--- weblayer/common/weblayer_paths.cc.orig 2020-03-16 18:40:15 UTC +++ weblayer/common/weblayer_paths.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -39,7 +39,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul +@@ -35,7 +35,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul return false; *result = result->AppendASCII("weblayer"); return true; diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 874bc49439db..a59b9349613b 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -1,7 +1,4 @@ bin/chrome -%%DRIVER%%bin/chromedriver -man/man1/chrome.1.gz -share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak @@ -11,7 +8,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libVkICD_mock_icd.so -%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak @@ -156,6 +152,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png +%%DATADIR%%/resources/inspector/Images/radioDot-dark-theme.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal.png @@ -180,28 +177,33 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg %%DATADIR%%/resources/inspector/Images/whatsnew.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js -%%DATADIR%%/resources/inspector/Runtime.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js -%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js -%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js -%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js -%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js +%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js +%%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js +%%DATADIR%%/resources/inspector/accessibility/accessibility.js %%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js %%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js %%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js %%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js -%%DATADIR%%/resources/inspector/accessibility/accessibility.js -%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js +%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js +%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js +%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js +%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js +%%DATADIR%%/resources/inspector/animation/animation_module.js +%%DATADIR%%/resources/inspector/animation/animation-legacy.js +%%DATADIR%%/resources/inspector/animation/animation.js %%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js %%DATADIR%%/resources/inspector/animation/AnimationModel.js %%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js %%DATADIR%%/resources/inspector/animation/AnimationTimeline.js %%DATADIR%%/resources/inspector/animation/AnimationUI.js -%%DATADIR%%/resources/inspector/animation/animation.js -%%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js +%%DATADIR%%/resources/inspector/audits/audits_module.js +%%DATADIR%%/resources/inspector/audits/audits-legacy.js +%%DATADIR%%/resources/inspector/audits/audits.js %%DATADIR%%/resources/inspector/audits/AuditsController.js %%DATADIR%%/resources/inspector/audits/AuditsPanel.js %%DATADIR%%/resources/inspector/audits/AuditsProtocolService.js @@ -209,11 +211,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/audits/AuditsReportSelector.js %%DATADIR%%/resources/inspector/audits/AuditsStartView.js %%DATADIR%%/resources/inspector/audits/AuditsStatusView.js -%%DATADIR%%/resources/inspector/audits/RadioSetting.js -%%DATADIR%%/resources/inspector/audits/audits.js -%%DATADIR%%/resources/inspector/audits/audits_module.js %%DATADIR%%/resources/inspector/audits/lighthouse/report-generator.js %%DATADIR%%/resources/inspector/audits/lighthouse/report.js +%%DATADIR%%/resources/inspector/audits/RadioSetting.js %%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js %%DATADIR%%/resources/inspector/audits_worker.js %%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js @@ -266,11 +266,15 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json %%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json %%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings/bindings.js +%%DATADIR%%/resources/inspector/bindings/bindings-legacy.js %%DATADIR%%/resources/inspector/bindings/BlackboxManager.js %%DATADIR%%/resources/inspector/bindings/BreakpointManager.js -%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js %%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js %%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js +%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js +%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js %%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js %%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js %%DATADIR%%/resources/inspector/bindings/FileUtils.js @@ -283,26 +287,33 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js %%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js %%DATADIR%%/resources/inspector/bindings/TempFile.js -%%DATADIR%%/resources/inspector/bindings/bindings.js -%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings/language_plugins/CXXDWARFLanguagePlugin.js +%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js +%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js +%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js %%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js %%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js %%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js %%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js -%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js +%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-legacy.js +%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js +%%DATADIR%%/resources/inspector/changes/changes_module.js +%%DATADIR%%/resources/inspector/changes/changes-legacy.js +%%DATADIR%%/resources/inspector/changes/changes.js %%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js %%DATADIR%%/resources/inspector/changes/ChangesSidebar.js +%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js %%DATADIR%%/resources/inspector/changes/ChangesView.js -%%DATADIR%%/resources/inspector/changes/changes.js -%%DATADIR%%/resources/inspector/changes/changes_module.js +%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js +%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js +%%DATADIR%%/resources/inspector/cm_modes/clike.js +%%DATADIR%%/resources/inspector/cm_modes/clojure.js +%%DATADIR%%/resources/inspector/cm/cm_module.js %%DATADIR%%/resources/inspector/cm/active-line.js %%DATADIR%%/resources/inspector/cm/brace-fold.js %%DATADIR%%/resources/inspector/cm/closebrackets.js %%DATADIR%%/resources/inspector/cm/cm.js -%%DATADIR%%/resources/inspector/cm/cm_module.js %%DATADIR%%/resources/inspector/cm/codemirror.js %%DATADIR%%/resources/inspector/cm/comment.js %%DATADIR%%/resources/inspector/cm/foldcode.js @@ -311,39 +322,38 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/cm/matchbrackets.js %%DATADIR%%/resources/inspector/cm/multiplex.js %%DATADIR%%/resources/inspector/cm/overlay.js -%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js -%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js -%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js -%%DATADIR%%/resources/inspector/cm_modes/clike.js -%%DATADIR%%/resources/inspector/cm_modes/clojure.js -%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js +%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js %%DATADIR%%/resources/inspector/cm_modes/coffeescript.js +%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js %%DATADIR%%/resources/inspector/cm_modes/jsx.js %%DATADIR%%/resources/inspector/cm_modes/livescript.js %%DATADIR%%/resources/inspector/cm_modes/markdown.js %%DATADIR%%/resources/inspector/cm_modes/php.js %%DATADIR%%/resources/inspector/cm_modes/python.js %%DATADIR%%/resources/inspector/cm_modes/shell.js -%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js %%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js %%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js %%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_module.js +%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js %%DATADIR%%/resources/inspector/cm_web_modes/css.js %%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js %%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js %%DATADIR%%/resources/inspector/cm_web_modes/javascript.js %%DATADIR%%/resources/inspector/cm_web_modes/xml.js +%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js +%%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js +%%DATADIR%%/resources/inspector/color_picker/color_picker.js %%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js %%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js %%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js %%DATADIR%%/resources/inspector/color_picker/Spectrum.js -%%DATADIR%%/resources/inspector/color_picker/color_picker.js -%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js %%DATADIR%%/resources/inspector/common/App.js %%DATADIR%%/resources/inspector/common/AppProvider.js %%DATADIR%%/resources/inspector/common/CharacterIdMap.js %%DATADIR%%/resources/inspector/common/Color.js +%%DATADIR%%/resources/inspector/common/common.js +%%DATADIR%%/resources/inspector/common/common-legacy.js %%DATADIR%%/resources/inspector/common/Console.js %%DATADIR%%/resources/inspector/common/ContentProvider.js %%DATADIR%%/resources/inspector/common/EventTarget.js @@ -365,15 +375,20 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/common/Trie.js %%DATADIR%%/resources/inspector/common/UIString.js %%DATADIR%%/resources/inspector/common/Worker.js -%%DATADIR%%/resources/inspector/common/common-legacy.js -%%DATADIR%%/resources/inspector/common/common.js +%%DATADIR%%/resources/inspector/components/components.js +%%DATADIR%%/resources/inspector/components/components-legacy.js %%DATADIR%%/resources/inspector/components/DockController.js %%DATADIR%%/resources/inspector/components/ImagePreview.js %%DATADIR%%/resources/inspector/components/JSPresentationUtils.js %%DATADIR%%/resources/inspector/components/Linkifier.js %%DATADIR%%/resources/inspector/components/Reload.js %%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js -%%DATADIR%%/resources/inspector/components/components.js +%%DATADIR%%/resources/inspector/console_counters/console_counters.js +%%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js +%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js +%%DATADIR%%/resources/inspector/console/console_module.js +%%DATADIR%%/resources/inspector/console/console-legacy.js +%%DATADIR%%/resources/inspector/console/console.js %%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js %%DATADIR%%/resources/inspector/console/ConsoleFilter.js %%DATADIR%%/resources/inspector/console/ConsolePanel.js @@ -383,22 +398,23 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/console/ConsoleView.js %%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js %%DATADIR%%/resources/inspector/console/ConsoleViewport.js -%%DATADIR%%/resources/inspector/console/console.js -%%DATADIR%%/resources/inspector/console/console_module.js -%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js -%%DATADIR%%/resources/inspector/console_counters/console_counters.js %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js -%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js -%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js +%%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js +%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js +%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js +%%DATADIR%%/resources/inspector/coverage/coverage_module.js +%%DATADIR%%/resources/inspector/coverage/coverage-legacy.js +%%DATADIR%%/resources/inspector/coverage/coverage.js %%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js %%DATADIR%%/resources/inspector/coverage/CoverageListView.js %%DATADIR%%/resources/inspector/coverage/CoverageModel.js %%DATADIR%%/resources/inspector/coverage/CoverageView.js -%%DATADIR%%/resources/inspector/coverage/coverage.js -%%DATADIR%%/resources/inspector/coverage/coverage_module.js %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js +%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js +%%DATADIR%%/resources/inspector/css_overview/css_overview-legacy.js +%%DATADIR%%/resources/inspector/css_overview/css_overview.js %%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js %%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js %%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js @@ -407,15 +423,14 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js %%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js %%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js -%%DATADIR%%/resources/inspector/css_overview/css_overview.js -%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js %%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js +%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js +%%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js +%%DATADIR%%/resources/inspector/data_grid/data_grid.js %%DATADIR%%/resources/inspector/data_grid/DataGrid.js %%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js %%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js %%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js -%%DATADIR%%/resources/inspector/data_grid/data_grid.js -%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js %%DATADIR%%/resources/inspector/devices/devices_module.js @@ -423,22 +438,26 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/devtools_app.js %%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/diff/DiffWrapper.js -%%DATADIR%%/resources/inspector/diff/diff.js %%DATADIR%%/resources/inspector/diff/diff_match_patch.js %%DATADIR%%/resources/inspector/diff/diff_module.js -%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js +%%DATADIR%%/resources/inspector/diff/diff-legacy.js +%%DATADIR%%/resources/inspector/diff/diff.js +%%DATADIR%%/resources/inspector/diff/DiffWrapper.js %%DATADIR%%/resources/inspector/dom_extension/dom_extension.js +%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js +%%DATADIR%%/resources/inspector/elements/elements_module.js +%%DATADIR%%/resources/inspector/elements/elements-legacy.js +%%DATADIR%%/resources/inspector/elements/elements.js %%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js %%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js %%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js %%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js %%DATADIR%%/resources/inspector/elements/DOMLinkifier.js %%DATADIR%%/resources/inspector/elements/DOMPath.js -%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js %%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js %%DATADIR%%/resources/inspector/elements/ElementsPanel.js %%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js +%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js %%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js %%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js %%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js @@ -452,9 +471,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js %%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js %%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js -%%DATADIR%%/resources/inspector/elements/elements.js -%%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js +%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg @@ -492,128 +511,214 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js +%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js +%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js +%%DATADIR%%/resources/inspector/emulation/emulation-legacy.js +%%DATADIR%%/resources/inspector/emulation/emulation.js +%%DATADIR%%/resources/inspector/emulation/GeolocationsSettingsTab.js +%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js +%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js +%%DATADIR%%/resources/inspector/emulation/SensorsView.js +%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js +%%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js +%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js %%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js %%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js -%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js -%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js +%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js %%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js %%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js +%%DATADIR%%/resources/inspector/extensions/extensions-legacy.js +%%DATADIR%%/resources/inspector/extensions/extensions.js %%DATADIR%%/resources/inspector/extensions/ExtensionServer.js %%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js %%DATADIR%%/resources/inspector/extensions/ExtensionView.js -%%DATADIR%%/resources/inspector/extensions/extensions.js -%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js -%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js -%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js -%%DATADIR%%/resources/inspector/formatter/formatter.js -%%DATADIR%%/resources/inspector/formatter/formatter_module.js -%%DATADIR%%/resources/inspector/formatter_worker.js -%%DATADIR%%/resources/inspector/formatter_worker.unbundled.js +%%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js +%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn.js +%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js %%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js %%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js %%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js %%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js %%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js +%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js +%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-legacy.js %%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js %%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js %%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js %%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js %%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js %%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js -%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js +%%DATADIR%%/resources/inspector/formatter/formatter_module.js +%%DATADIR%%/resources/inspector/formatter/formatter-legacy.js +%%DATADIR%%/resources/inspector/formatter/formatter.js +%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js +%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js +%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js +%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js +%%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js +%%DATADIR%%/resources/inspector/har_importer/har_importer.js %%DATADIR%%/resources/inspector/har_importer/HARFormat.js %%DATADIR%%/resources/inspector/har_importer/HARImporter.js -%%DATADIR%%/resources/inspector/har_importer/har_importer.js -%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js -%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js -%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker.unbundled.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker_entrypoint.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js +%%DATADIR%%/resources/inspector/help/help_module.js +%%DATADIR%%/resources/inspector/help/help-legacy.js +%%DATADIR%%/resources/inspector/help/help.js %%DATADIR%%/resources/inspector/help/HelpImpl.js %%DATADIR%%/resources/inspector/help/ReleaseNoteText.js %%DATADIR%%/resources/inspector/help/ReleaseNoteView.js -%%DATADIR%%/resources/inspector/help/help.js -%%DATADIR%%/resources/inspector/help/help_module.js +%%DATADIR%%/resources/inspector/host/host.js +%%DATADIR%%/resources/inspector/host/host-legacy.js %%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js %%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js %%DATADIR%%/resources/inspector/host/Platform.js %%DATADIR%%/resources/inspector/host/ResourceLoader.js %%DATADIR%%/resources/inspector/host/UserMetrics.js -%%DATADIR%%/resources/inspector/host/host.js %%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js %%DATADIR%%/resources/inspector/inline_editor/BezierUI.js +%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js %%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js %%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js -%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js -%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js -%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js -%%DATADIR%%/resources/inspector/inspector.html -%%DATADIR%%/resources/inspector/inspector.js +%%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js +%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js +%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js +%%DATADIR%%/resources/inspector/input/input_module.js +%%DATADIR%%/resources/inspector/input/input-legacy.js +%%DATADIR%%/resources/inspector/input/input.js +%%DATADIR%%/resources/inspector/input/InputModel.js +%%DATADIR%%/resources/inspector/input/InputTimeline.js +%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js +%%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js %%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js %%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js -%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js +%%DATADIR%%/resources/inspector/inspector.html +%%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/integration_test_runner.html %%DATADIR%%/resources/inspector/integration_test_runner.js +%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js +%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js +%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js %%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js %%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js -%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js -%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js %%DATADIR%%/resources/inspector/js_app.html %%DATADIR%%/resources/inspector/js_app.js -%%DATADIR%%/resources/inspector/js_main/JsMain.js %%DATADIR%%/resources/inspector/js_main/js_main.js +%%DATADIR%%/resources/inspector/js_main/js_main-legacy.js +%%DATADIR%%/resources/inspector/js_main/JsMain.js %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js +%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js +%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js +%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js %%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js +%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js %%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js %%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js -%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js %%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js %%DATADIR%%/resources/inspector/layer_viewer/TransformController.js -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js +%%DATADIR%%/resources/inspector/layers/layers_module.js +%%DATADIR%%/resources/inspector/layers/layers-legacy.js +%%DATADIR%%/resources/inspector/layers/layers.js %%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js -%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js %%DATADIR%%/resources/inspector/layers/LayersPanel.js -%%DATADIR%%/resources/inspector/layers/layers.js -%%DATADIR%%/resources/inspector/layers/layers_module.js +%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js +%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js +%%DATADIR%%/resources/inspector/main/main-legacy.js +%%DATADIR%%/resources/inspector/main/main.js +%%DATADIR%%/resources/inspector/main/MainImpl.js +%%DATADIR%%/resources/inspector/main/SimpleApp.js %%DATADIR%%/resources/inspector/media/media_module.js +%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js +%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js %%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js %%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js %%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js %%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js %%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js %%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js -%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js %%DATADIR%%/resources/inspector/ndb_app.html %%DATADIR%%/resources/inspector/ndb_app.js %%DATADIR%%/resources/inspector/network/network_module.js +%%DATADIR%%/resources/inspector/network/network-legacy.js +%%DATADIR%%/resources/inspector/network/network.js +%%DATADIR%%/resources/inspector/network/BinaryResourceView.js +%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js +%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js +%%DATADIR%%/resources/inspector/network/HARWriter.js +%%DATADIR%%/resources/inspector/network/NetworkConfigView.js +%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js +%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js +%%DATADIR%%/resources/inspector/network/NetworkItemView.js +%%DATADIR%%/resources/inspector/network/NetworkLogView.js +%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js +%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js +%%DATADIR%%/resources/inspector/network/NetworkOverview.js +%%DATADIR%%/resources/inspector/network/NetworkPanel.js +%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js +%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js +%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js +%%DATADIR%%/resources/inspector/network/RequestCookiesView.js +%%DATADIR%%/resources/inspector/network/RequestHeadersView.js +%%DATADIR%%/resources/inspector/network/RequestHTMLView.js +%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js +%%DATADIR%%/resources/inspector/network/RequestPreviewView.js +%%DATADIR%%/resources/inspector/network/RequestResponseView.js +%%DATADIR%%/resources/inspector/network/RequestTimingView.js +%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js +%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js %%DATADIR%%/resources/inspector/node_app.html %%DATADIR%%/resources/inspector/node_app.js %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js +%%DATADIR%%/resources/inspector/node_main/node_main-legacy.js +%%DATADIR%%/resources/inspector/node_main/node_main.js +%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js +%%DATADIR%%/resources/inspector/node_main/NodeMain.js +%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js +%%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js +%%DATADIR%%/resources/inspector/object_ui/object_ui.js %%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js %%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js -%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js %%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js %%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js %%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js -%%DATADIR%%/resources/inspector/object_ui/object_ui.js -%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js +%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js -%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js -%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js +%%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js +%%DATADIR%%/resources/inspector/perf_ui/perf_ui.js +%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js +%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js +%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js +%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js +%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js +%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js +%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js +%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js +%%DATADIR%%/resources/inspector/perf_ui/PieChart.js +%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js +%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js +%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js +%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js +%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js %%DATADIR%%/resources/inspector/persistence/Automapping.js %%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js @@ -621,33 +726,91 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js %%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js %%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js +%%DATADIR%%/resources/inspector/persistence/persistence.js +%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js %%DATADIR%%/resources/inspector/persistence/PersistenceActions.js %%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js %%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js %%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js %%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js -%%DATADIR%%/resources/inspector/persistence/persistence.js %%DATADIR%%/resources/inspector/platform/platform.js %%DATADIR%%/resources/inspector/platform/utilities.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js +%%DATADIR%%/resources/inspector/profiler/profiler-legacy.js +%%DATADIR%%/resources/inspector/profiler/profiler.js +%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js +%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js +%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js +%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js +%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js +%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js +%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js +%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js +%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js +%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js +%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js +%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js +%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js +%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js +%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js +%%DATADIR%%/resources/inspector/profiler/ProfileView.js +%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js +%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js +%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js +%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js +%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js %%DATADIR%%/resources/inspector/protocol/InspectorBackend.js %%DATADIR%%/resources/inspector/protocol/NodeURL.js %%DATADIR%%/resources/inspector/protocol/protocol.js -%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js +%%DATADIR%%/resources/inspector/protocol/protocol-legacy.js +%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js +%%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js +%%DATADIR%%/resources/inspector/quick_open/quick_open.js %%DATADIR%%/resources/inspector/quick_open/CommandMenu.js %%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js %%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js %%DATADIR%%/resources/inspector/quick_open/QuickOpen.js -%%DATADIR%%/resources/inspector/quick_open/quick_open.js -%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js %%DATADIR%%/resources/inspector/resources/resources_module.js +%%DATADIR%%/resources/inspector/resources/resources-legacy.js +%%DATADIR%%/resources/inspector/resources/resources.js +%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js +%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js +%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js +%%DATADIR%%/resources/inspector/resources/AppManifestView.js +%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js +%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js +%%DATADIR%%/resources/inspector/resources/ClearStorageView.js +%%DATADIR%%/resources/inspector/resources/CookieItemsView.js +%%DATADIR%%/resources/inspector/resources/DatabaseModel.js +%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js +%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js +%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js +%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js +%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js +%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js +%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js +%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js +%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js +%%DATADIR%%/resources/inspector/resources/StorageItemsView.js %%DATADIR%%/resources/inspector/root.js +%%DATADIR%%/resources/inspector/Runtime.js %%DATADIR%%/resources/inspector/screencast/InputModel.js +%%DATADIR%%/resources/inspector/screencast/screencast.js +%%DATADIR%%/resources/inspector/screencast/screencast-legacy.js %%DATADIR%%/resources/inspector/screencast/ScreencastApp.js %%DATADIR%%/resources/inspector/screencast/ScreencastView.js -%%DATADIR%%/resources/inspector/screencast/screencast.js +%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js +%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js +%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js +%%DATADIR%%/resources/inspector/sdk/Connections.js +%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js +%%DATADIR%%/resources/inspector/sdk/Cookie.js +%%DATADIR%%/resources/inspector/sdk/CookieModel.js +%%DATADIR%%/resources/inspector/sdk/CookieParser.js %%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js %%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js %%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js @@ -658,15 +821,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/sdk/CSSRule.js %%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js %%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js -%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js -%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js -%%DATADIR%%/resources/inspector/sdk/Connections.js -%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js -%%DATADIR%%/resources/inspector/sdk/CookieModel.js -%%DATADIR%%/resources/inspector/sdk/CookieParser.js +%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js %%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js %%DATADIR%%/resources/inspector/sdk/DOMModel.js -%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js %%DATADIR%%/resources/inspector/sdk/EmulationModel.js %%DATADIR%%/resources/inspector/sdk/FilmStripModel.js %%DATADIR%%/resources/inspector/sdk/HARLog.js @@ -686,44 +843,50 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/sdk/Resource.js %%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js %%DATADIR%%/resources/inspector/sdk/RuntimeModel.js -%%DATADIR%%/resources/inspector/sdk/SDKModel.js %%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js %%DATADIR%%/resources/inspector/sdk/Script.js +%%DATADIR%%/resources/inspector/sdk/sdk.js +%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js +%%DATADIR%%/resources/inspector/sdk/SDKModel.js %%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js %%DATADIR%%/resources/inspector/sdk/ServerTiming.js %%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js %%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js %%DATADIR%%/resources/inspector/sdk/SourceMap.js %%DATADIR%%/resources/inspector/sdk/SourceMapManager.js -%%DATADIR%%/resources/inspector/sdk/Target.js -%%DATADIR%%/resources/inspector/sdk/TargetManager.js %%DATADIR%%/resources/inspector/sdk/TracingManager.js %%DATADIR%%/resources/inspector/sdk/TracingModel.js -%%DATADIR%%/resources/inspector/sdk/sdk.js -%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js %%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm -%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js +%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js +%%DATADIR%%/resources/inspector/search/search_module.js +%%DATADIR%%/resources/inspector/search/search-legacy.js +%%DATADIR%%/resources/inspector/search/search.js %%DATADIR%%/resources/inspector/search/SearchConfig.js %%DATADIR%%/resources/inspector/search/SearchResultsPane.js %%DATADIR%%/resources/inspector/search/SearchView.js -%%DATADIR%%/resources/inspector/search/search.js -%%DATADIR%%/resources/inspector/search/search_module.js +%%DATADIR%%/resources/inspector/security/security_module.js +%%DATADIR%%/resources/inspector/security/security-legacy.js +%%DATADIR%%/resources/inspector/security/security.js %%DATADIR%%/resources/inspector/security/SecurityModel.js %%DATADIR%%/resources/inspector/security/SecurityPanel.js -%%DATADIR%%/resources/inspector/security/security.js -%%DATADIR%%/resources/inspector/security/security_module.js %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js %%DATADIR%%/resources/inspector/services/ServiceManager.js %%DATADIR%%/resources/inspector/services/services.js +%%DATADIR%%/resources/inspector/services/services-legacy.js +%%DATADIR%%/resources/inspector/settings/settings_module.js +%%DATADIR%%/resources/inspector/settings/settings-legacy.js +%%DATADIR%%/resources/inspector/settings/settings.js %%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js %%DATADIR%%/resources/inspector/settings/SettingsScreen.js -%%DATADIR%%/resources/inspector/settings/settings.js -%%DATADIR%%/resources/inspector/settings/settings_module.js %%DATADIR%%/resources/inspector/shell.js +%%DATADIR%%/resources/inspector/snippets/snippets_module.js +%%DATADIR%%/resources/inspector/snippets/snippets-legacy.js +%%DATADIR%%/resources/inspector/snippets/snippets.js %%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js %%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js -%%DATADIR%%/resources/inspector/snippets/snippets.js -%%DATADIR%%/resources/inspector/snippets/snippets_module.js +%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js +%%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js +%%DATADIR%%/resources/inspector/source_frame/source_frame.js %%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js %%DATADIR%%/resources/inspector/source_frame/FontView.js %%DATADIR%%/resources/inspector/source_frame/ImageView.js @@ -734,20 +897,63 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/source_frame/SourceFrame.js %%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js %%DATADIR%%/resources/inspector/source_frame/XMLView.js -%%DATADIR%%/resources/inspector/source_frame/source_frame.js -%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js %%DATADIR%%/resources/inspector/sources/sources_module.js +%%DATADIR%%/resources/inspector/sources/sources-legacy.js +%%DATADIR%%/resources/inspector/sources/sources.js +%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js +%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js +%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js +%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js +%%DATADIR%%/resources/inspector/sources/CSSPlugin.js +%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js +%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js +%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js +%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js +%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js +%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js +%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js +%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js +%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js +%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js +%%DATADIR%%/resources/inspector/sources/NavigatorView.js +%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js +%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js +%%DATADIR%%/resources/inspector/sources/Plugin.js +%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js +%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js +%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js +%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js +%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js +%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js +%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js +%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js +%%DATADIR%%/resources/inspector/sources/SourcesPanel.js +%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js +%%DATADIR%%/resources/inspector/sources/SourcesView.js +%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js +%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js +%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js +%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js +%%DATADIR%%/resources/inspector/test_runner/test_runner.js +%%DATADIR%%/resources/inspector/test_runner/TestRunner.js +%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js %%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js %%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js -%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js %%DATADIR%%/resources/inspector/text_editor/text_editor.js -%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js +%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js +%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js +%%DATADIR%%/resources/inspector/text_utils/text_utils.js +%%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js %%DATADIR%%/resources/inspector/text_utils/Text.js +%%DATADIR%%/resources/inspector/text_utils/TextCursor.js %%DATADIR%%/resources/inspector/text_utils/TextRange.js %%DATADIR%%/resources/inspector/text_utils/TextUtils.js -%%DATADIR%%/resources/inspector/text_utils/text_utils.js -%%DATADIR%%/resources/inspector/timeline/timeline_module.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmDis.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmParser.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js %%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js %%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js %%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js @@ -755,14 +961,36 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js %%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js %%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js -%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js -%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js +%%DATADIR%%/resources/inspector/timeline/timeline_module.js +%%DATADIR%%/resources/inspector/timeline/timeline-legacy.js +%%DATADIR%%/resources/inspector/timeline/timeline.js +%%DATADIR%%/resources/inspector/timeline/CountersGraph.js +%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js +%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js +%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js +%%DATADIR%%/resources/inspector/timeline/TimelineController.js +%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js +%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js +%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js +%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js +%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js +%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js +%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js +%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js +%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js +%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js +%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js +%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js +%%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js -%%DATADIR%%/resources/inspector/ui/ARIAUtils.js %%DATADIR%%/resources/inspector/ui/Action.js %%DATADIR%%/resources/inspector/ui/ActionDelegate.js %%DATADIR%%/resources/inspector/ui/ActionRegistry.js +%%DATADIR%%/resources/inspector/ui/ARIAUtils.js %%DATADIR%%/resources/inspector/ui/Context.js %%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js %%DATADIR%%/resources/inspector/ui/ContextMenu.js @@ -809,6 +1037,8 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/ui/Toolbar.js %%DATADIR%%/resources/inspector/ui/Tooltip.js %%DATADIR%%/resources/inspector/ui/Treeoutline.js +%%DATADIR%%/resources/inspector/ui/ui.js +%%DATADIR%%/resources/inspector/ui/ui-legacy.js %%DATADIR%%/resources/inspector/ui/UIUtils.js %%DATADIR%%/resources/inspector/ui/View.js %%DATADIR%%/resources/inspector/ui/ViewManager.js @@ -817,30 +1047,45 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/ui/XLink.js %%DATADIR%%/resources/inspector/ui/XWidget.js %%DATADIR%%/resources/inspector/ui/ZoomManager.js -%%DATADIR%%/resources/inspector/ui/ui.js +%%DATADIR%%/resources/inspector/ui/utils/append-style.js +%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js +%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js +%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js +%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js +%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js +%%DATADIR%%/resources/inspector/ui/utils/utils.js +%%DATADIR%%/resources/inspector/wasmparser_worker_entrypoint.js +%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js +%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js +%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js +%%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js +%%DATADIR%%/resources/inspector/web_audio/web_audio.js %%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js %%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js -%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js -%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js %%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js -%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/Types.js -%%DATADIR%%/resources/inspector/web_audio/web_audio.js -%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js +%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js +%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js +%%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js +%%DATADIR%%/resources/inspector/worker_main/worker_main.js +%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js +%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js %%DATADIR%%/resources/inspector/workspace/FileManager.js %%DATADIR%%/resources/inspector/workspace/UISourceCode.js -%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js %%DATADIR%%/resources/inspector/workspace/workspace.js -%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js -%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js -%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js +%%DATADIR%%/resources/inspector/workspace/workspace-legacy.js +%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js %%DATADIR%%/snapshot_blob.bin +%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin @@ -849,6 +1094,10 @@ share/applications/chromium-browser.desktop %%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so +%%DEBUG%%%%DATADIR%%/libvulkan.so +%%DRIVER%%bin/chromedriver +man/man1/chrome.1.gz +share/applications/chromium-browser.desktop share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png |