diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
| commit | 2dd4dd29c063a32031fb5549616ba28e76310f0a (patch) | |
| tree | 0427b26fe2d2bae71ff47102b5e646fdf927c022 | |
| parent | b18acf6f2cf8fce61ca3d5f1d5c3be5f62b810e7 (diff) | |
| download | ports-2dd4dd29c063a32031fb5549616ba28e76310f0a.tar.gz ports-2dd4dd29c063a32031fb5549616ba28e76310f0a.zip | |
Notes
335 files changed, 1790 insertions, 2000 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 74143db8aa0d..0cf732ded20c 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 83.0.4103.116 -PORTREVISION= 1 +PORTVERSION= 84.0.4147.105 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -21,10 +20,10 @@ BUILD_DEPENDS= bash:shells/bash \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ - yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ + xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ @@ -255,7 +254,15 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + + # We need the site package from xcbgen, which installs as python3.7 (really: default version), while the chromium + # build still needs to use python2.7. It works, because xcbgen can run with both versions, but we want to avoid + # having the pre-compiled pyc files from 2.7 in the 3.7 site packages + # Remove this as soon as chromium uses python3.x as well + @${MKDIR} ${WRKDIR}/site-packages/xcbgen + ${CP} ${PYTHONBASE}/lib/python3.7/site-packages/xcbgen/*.py \ + ${WRKDIR}/site-packages/xcbgen .endif do-configure: diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 09c40cf1a44d..23944d305307 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1593564988 -SHA256 (chromium-83.0.4103.116.tar.xz) = bb0c7e8dfee9f3a5e30eca7f34fc9f21caefa82a86c058c552f52b1ae2da2ac3 -SIZE (chromium-83.0.4103.116.tar.xz) = 802626772 -SHA256 (chromium-83.0.4103.116-testdata.tar.xz) = 0b999ed70e758e18229ff01c7d0bdea83aedc9f6e0ac56d78d4e46120f8d6a2c -SIZE (chromium-83.0.4103.116-testdata.tar.xz) = 257103056 +TIMESTAMP = 1595931907 +SHA256 (chromium-84.0.4147.105.tar.xz) = caf4ebeb2a2333454c3067a2534aeecaab5029aa78fc0d8b27f79ad3b9c5ccac +SIZE (chromium-84.0.4147.105.tar.xz) = 845167500 +SHA256 (chromium-84.0.4147.105-testdata.tar.xz) = 571cfaa82ea28413b22e65907d0ecdb055e02142f8e1b86f3fe2f1bb9557ac03 +SIZE (chromium-84.0.4147.105-testdata.tar.xz) = 257190208 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 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 990d14c63379..0a68f59a615e 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,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-18 18:42:41 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-07-07 22:03:25 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 3c0c75115693..0b6c77a3ab72 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2020-06-03 18:40:09 UTC +--- BUILD.gn.orig 2020-07-07 21:58:11 UTC +++ BUILD.gn -@@ -418,7 +418,7 @@ group("gn_all") { +@@ -417,7 +417,7 @@ group("gn_all") { ] } @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -579,10 +573,6 @@ group("gn_all") { +@@ -578,10 +572,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -656,7 +646,7 @@ group("gn_all") { +@@ -655,7 +645,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)" ] } -@@ -789,7 +779,6 @@ group("gn_all") { +@@ -788,7 +778,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" ] -@@ -1072,7 +1061,7 @@ if (!is_ios) { +@@ -1074,7 +1063,7 @@ if (!is_ios) { ] } @@ -66,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1081,7 +1070,7 @@ if (!is_ios) { +@@ -1083,7 +1072,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1274,9 +1263,6 @@ group("chromium_builder_perf") { +@@ -1276,9 +1265,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 index dc9a47b7323a..44a112bec769 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,6 +1,6 @@ ---- apps/app_restore_service_browsertest.cc.orig 2020-03-23 15:18:04 UTC +--- apps/app_restore_service_browsertest.cc.orig 2020-07-07 21:57:29 UTC +++ apps/app_restore_service_browsertest.cc -@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc +@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } // Flaky: crbug.com/269613 diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index a4d2485d983f..15bb859a84f8 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2020-05-13 18:40:16 UTC +--- base/BUILD.gn.orig 2020-07-07 21:58:11 UTC +++ base/BUILD.gn -@@ -59,7 +59,7 @@ declare_args() { +@@ -60,7 +60,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds # for testing purposes. # TODO(https://crbug.com/974061): remove this eventually. @@ -9,7 +9,7 @@ # Unsafe developer build. Has developer-friendly features that may weaken or # disable security measures like sandboxing or ASLR. -@@ -929,7 +929,7 @@ jumbo_component("base") { +@@ -936,7 +936,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +18,7 @@ sources += [ "profiler/stack_copier_signal.cc", "profiler/stack_copier_signal.h", -@@ -938,6 +938,12 @@ jumbo_component("base") { +@@ -945,6 +945,12 @@ jumbo_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -31,7 +31,7 @@ } if (is_win) { -@@ -1321,7 +1327,7 @@ jumbo_component("base") { +@@ -1329,7 +1335,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. @@ -40,7 +40,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1347,7 +1353,7 @@ jumbo_component("base") { +@@ -1355,7 +1361,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -49,7 +49,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1942,6 +1948,33 @@ jumbo_component("base") { +@@ -1952,6 +1958,33 @@ jumbo_component("base") { } } @@ -83,7 +83,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2898,7 +2931,7 @@ test("base_unittests") { +@@ -2946,7 +2979,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -92,7 +92,7 @@ sources += [ "profiler/stack_copier_signal_unittest.cc" ] } } -@@ -3087,6 +3120,12 @@ test("base_unittests") { +@@ -3154,6 +3187,12 @@ test("base_unittests") { manifest = "//build/config/fuchsia/tests.cmx" } 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 1f7664842a07..9b1fc5b916e6 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2020-07-07 21:57:30 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -355,7 +355,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); #endif // !OS_WIN @@ -9,7 +9,7 @@ void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); -@@ -361,7 +361,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -368,7 +368,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); @@ -18,7 +18,7 @@ char* realloc_ptr = static_cast<char*>(malloc(10)); strcpy(realloc_ptr, "foobar"); -@@ -377,13 +377,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -384,13 +384,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); @@ -34,7 +34,7 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -550,7 +550,7 @@ static size_t GetAllocatedSize(void* ptr) { +@@ -557,7 +557,7 @@ static size_t GetAllocatedSize(void* ptr) { static size_t GetAllocatedSize(void* ptr) { return malloc_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 index 12143fe54c50..fdfc9604fefd 100644 --- 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 @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-03-23 15:20:45 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-07-07 21:58:11 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -314,9 +314,13 @@ void FreeFullPage(PartitionPage* page) { +@@ -307,9 +307,13 @@ void FreeFullPage(PartitionRoot* root, PartitionRoot:: } } diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index 231561a3a542..ac9765934a12 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,6 +1,6 @@ ---- base/cpu.cc.orig 2019-10-21 19:06:18 UTC +--- base/cpu.cc.orig 2020-07-07 21:57:30 UTC +++ base/cpu.cc -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #include "base/stl_util.h" @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #endif -@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) { +@@ -136,7 +136,7 @@ uint64_t xgetbv(uint32_t xcr) { #endif // ARCH_CPU_X86_FAMILY @@ -18,7 +18,7 @@ std::string* CpuInfoBrand() { static std::string* brand = []() { // This function finds the value from /proc/cpuinfo under the key "model -@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() { +@@ -166,7 +166,7 @@ std::string* CpuInfoBrand() { return brand; } #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || @@ -27,7 +27,7 @@ } // namespace -@@ -287,7 +287,7 @@ void CPU::Initialize() { +@@ -288,7 +288,7 @@ void CPU::Initialize() { } } #elif defined(ARCH_CPU_ARM_FAMILY) diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 2632ef5f664f..dd1e1658fd34 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2020-05-13 18:40:16 UTC +--- base/debug/debugger_posix.cc.orig 2020-07-07 21:58:11 UTC +++ base/debug/debugger_posix.cc -@@ -95,7 +95,7 @@ bool BeingDebugged() { +@@ -98,7 +98,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -103,33 +103,35 @@ bool BeingDebugged() { +@@ -106,33 +106,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 8eca61e3c66e..706190c26d34 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2020-02-24 18:39:05 UTC +--- base/debug/elf_reader.cc.orig 2020-07-07 21:57:30 UTC +++ base/debug/elf_reader.cc -@@ -35,7 +35,9 @@ using Nhdr = Elf64_Nhdr; +@@ -36,7 +36,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; #endif @@ -10,7 +10,7 @@ // 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, +@@ -99,6 +101,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); @@ -18,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 +110,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -108,6 +111,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 21024cb210a8..69cc11ea867b 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,6 +1,6 @@ ---- base/debug/proc_maps_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/debug/proc_maps_linux.cc.orig 2020-07-07 21:57:30 UTC +++ base/debug/proc_maps_linux.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include <inttypes.h> #endif -@@ -28,6 +28,11 @@ +@@ -29,6 +29,11 @@ namespace base { namespace debug { @@ -21,7 +21,7 @@ // 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 +@@ -44,15 +49,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si return false; #endif } @@ -40,7 +40,7 @@ return false; } proc_maps->clear(); -@@ -65,7 +71,7 @@ bool ReadProcMaps(std::string* proc_maps) { +@@ -66,7 +72,7 @@ bool ReadProcMaps(std::string* proc_maps) { ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize)); if (bytes_read < 0) { @@ -49,7 +49,7 @@ proc_maps->clear(); return false; } -@@ -76,6 +82,7 @@ bool ReadProcMaps(std::string* proc_maps) { +@@ -77,6 +83,7 @@ bool ReadProcMaps(std::string* proc_maps) { if (bytes_read == 0) break; @@ -57,7 +57,7 @@ // 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) { +@@ -87,6 +94,7 @@ bool ReadProcMaps(std::string* proc_maps) { // Avoid this by searching for the gate VMA and breaking early. if (ContainsGateVMA(proc_maps, pos)) break; @@ -65,7 +65,7 @@ } return true; -@@ -114,10 +122,32 @@ bool ParseProcMaps(const std::string& input, +@@ -115,10 +123,32 @@ bool ParseProcMaps(const std::string& input, MappedMemoryRegion region; const char* line = lines[i].c_str(); char permissions[5] = {'\0'}; // Ensure NUL-terminated string. @@ -99,7 +99,7 @@ // Sample format from man 5 proc: // -@@ -133,6 +163,7 @@ bool ParseProcMaps(const std::string& input, +@@ -134,6 +164,7 @@ bool ParseProcMaps(const std::string& input, DPLOG(WARNING) << "sscanf failed for line: " << line; return false; } @@ -107,7 +107,7 @@ region.permissions = 0; -@@ -151,14 +182,31 @@ bool ParseProcMaps(const std::string& input, +@@ -152,14 +183,31 @@ bool ParseProcMaps(const std::string& input, else if (permissions[2] != '-') return false; 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 0faed44d1bb6..ba8a788b98a9 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-05-13 18:40:16 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-07-07 21:58:11 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -430,7 +430,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -424,7 +424,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -803,7 +803,7 @@ enum Permission { +@@ -797,7 +797,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -832,9 +832,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -826,9 +826,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -30,7 +30,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -869,7 +869,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -863,7 +863,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 65171a867e06..7b393a0021a0 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 2020-03-16 18:39:41 UTC +--- base/files/file_util.h.orig 2020-07-07 21:58:11 UTC +++ base/files/file_util.h -@@ -519,7 +519,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -552,7 +552,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__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 5ddff833acb1..8b5814ae79df 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2020-03-23 13:34:59 UTC +--- base/files/file_util_unittest.cc.orig 2020-07-07 21:58:11 UTC +++ base/files/file_util_unittest.cc -@@ -3434,7 +3434,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3465,7 +3465,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3452,7 +3452,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3483,7 +3483,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 2e9496b55220..3dfe829adc81 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2019-12-16 21:51:21 UTC +--- base/logging_unittest.cc.orig 2020-07-07 21:58:11 UTC +++ base/logging_unittest.cc -@@ -591,7 +591,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -552,7 +552,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; 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 3cc2144905a4..0e287f7202b7 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,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-05-13 18:40:16 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-07-07 21:57:30 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -69,7 +69,7 @@ FDPair ScopedFDPair::get() const { +@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -78,7 +78,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: +@@ -79,7 +79,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: return region.PassPlatformHandle().fd; return ScopedFD(); } @@ -18,7 +18,7 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -203,7 +203,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -27,7 +27,7 @@ , bool executable #endif -@@ -232,7 +232,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index 20ffac278abc..1a1b1bef1ebb 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,6 +1,6 @@ ---- base/path_service_unittest.cc.orig 2020-03-23 15:23:42 UTC +--- base/path_service_unittest.cc.orig 2020-07-07 21:57:30 UTC +++ base/path_service_unittest.cc -@@ -36,7 +36,7 @@ bool ReturnsValidPath(int dir_type) { +@@ -37,7 +37,7 @@ bool ReturnsValidPath(int dir_type) { if (dir_type == DIR_CACHE) check_path_exists = false; #endif diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index ff61c2e5408b..050320e9d7dc 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/memory.cc.orig 2020-07-07 21:57:30 UTC +++ base/process/memory.cc -@@ -42,7 +42,7 @@ void OnNoMemoryInternal(size_t size) { +@@ -44,7 +44,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal // Defined in memory_win.cc for Windows. @@ -9,7 +9,7 @@ namespace { -@@ -61,7 +61,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +@@ -63,7 +63,7 @@ void TerminateBecauseOutOfMemory(size_t size) { #endif // !defined(OS_WIN) // Defined in memory_mac.mm for Mac. diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index 2ec55582fbfa..3d7fab63a87b 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,6 +1,6 @@ ---- base/process/process_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/process_linux.cc.orig 2020-07-07 21:57:30 UTC +++ base/process/process_linux.cc -@@ -79,6 +79,9 @@ Time Process::CreationTime() const { +@@ -80,6 +80,9 @@ Time Process::CreationTime() const { internal::VM_STARTTIME) : internal::ReadProcStatsAndGetFieldAsInt64( Pid(), internal::VM_STARTTIME); @@ -10,7 +10,7 @@ if (!start_ticks) return Time(); TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); -@@ -86,8 +89,10 @@ Time Process::CreationTime() const { +@@ -87,8 +90,10 @@ Time Process::CreationTime() const { if (boot_time.is_null()) return Time(); return Time(boot_time + start_offset); @@ -21,7 +21,7 @@ // static bool Process::CanBackgroundProcesses() { #if defined(OS_CHROMEOS) -@@ -139,6 +144,7 @@ bool Process::SetProcessBackgrounded(bool background) +@@ -140,6 +145,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 8e47c5106248..489d846f2778 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +--- base/process/process_metrics.cc.orig 2020-07-07 21:57:30 UTC +++ base/process/process_metrics.cc -@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -58,7 +58,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -9,7 +9,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -75,7 +75,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const +@@ -76,7 +76,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const std::unique_ptr<DictionaryValue> res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -18,7 +18,7 @@ std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -127,7 +127,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif @@ -27,7 +27,7 @@ int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { return CalculateEventsPerSecond(absolute_idle_wakeups, -@@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -139,7 +139,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index e909eeec959b..04d68b92dcf2 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2019-10-21 19:06:18 UTC +--- base/process/process_metrics_posix.cc.orig 2020-07-07 21:57:30 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -117,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -126,7 +128,7 @@ size_t ProcessMetrics::GetMallocUsage() { #else return minfo.hblkhd + minfo.arena; #endif diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc new file mode 100644 index 000000000000..5547d3a09a32 --- /dev/null +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -0,0 +1,11 @@ +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-07-13 13:09:53 UTC ++++ base/profiler/stack_sampling_profiler_test_util.cc +@@ -23,7 +23,7 @@ + // Fortunately, it provides _alloca, which functions identically. + #include <malloc.h> + #define alloca _alloca +-#else ++#elif !defined(OS_BSD) + #include <alloca.h> + #endif + diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index b71975a9d083..19b34c4fe031 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-05-13 18:40:16 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-07-07 21:58:11 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -43,7 +43,7 @@ +@@ -41,7 +41,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index c46d71f83add..7db1096b3d49 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2019-04-30 22:22:28 UTC +--- base/security_unittest.cc.orig 2020-07-07 21:57:30 UTC +++ base/security_unittest.cc -@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu +@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index fb3737a27ea9..0b0f9b3ce953 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2020-03-08 08:35:16 UTC +--- base/synchronization/lock_impl.h.orig 2020-07-07 21:58:11 UTC +++ base/synchronization/lock_impl.h -@@ -67,10 +67,13 @@ void LockImpl::Unlock() { +@@ -69,10 +69,13 @@ void LockImpl::Unlock() { ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_)); } #elif defined(OS_POSIX) || defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index 9a5dd310f92a..fa607f36fcfb 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,9 +1,9 @@ ---- base/system/sys_info_freebsd.cc.orig 2020-06-15 18:59:42 UTC +--- base/system/sys_info_freebsd.cc.orig 2020-07-07 21:57:30 UTC +++ base/system/sys_info_freebsd.cc -@@ -9,30 +9,76 @@ +@@ -9,30 +9,86 @@ #include <sys/sysctl.h> - #include "base/logging.h" + #include "base/notreached.h" +#include "base/strings/string_util.h" namespace base { @@ -15,34 +15,40 @@ - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); - sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); - if (pages == -1 || page_size == -1) { -+ if(r == 0) ++ ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); -+ if(r == 0) -+ r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -+ if(r == -1) { ++ if (r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ ++ if (r == -1) { NOTREACHED(); return 0; } ++ return static_cast<int64_t>(pages) * page_size; } +int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; -+ unsigned pgfree, pginact, pgcache; ++ unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); + size_t szpg = sizeof(pgfree); -+ if(r == 0) ++ ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -+ if(r == 0) ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); -+ if(r == 0) ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); -+ if(r == 0) ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); -+ if(r == -1) { ++ ++ if (r == -1) { + NOTREACHED(); + return 0; + } ++ + return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); +} + @@ -51,8 +57,11 @@ + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; + size_t size = base::size(name); -+ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) ++ ++ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) { + return name; ++ } ++ + return std::string(); +} + @@ -71,12 +80,13 @@ + +SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { + HardwareInfo info; -+ // Set the manufacturer to "FreeBSD" and the model to -+ // an empty string. ++ + info.manufacturer = "FreeBSD"; + info.model = HardwareModelName(); ++ + DCHECK(IsStringUTF8(info.manufacturer)); + DCHECK(IsStringUTF8(info.model)); ++ + return info; } diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn new file mode 100644 index 000000000000..c2b8e3134a48 --- /dev/null +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -0,0 +1,15 @@ +--- base/test/BUILD.gn.orig 2020-07-13 15:42:25 UTC ++++ base/test/BUILD.gn +@@ -408,7 +408,11 @@ if (is_linux) { + + copy("fonts_conf") { + sources = [ "fonts.conf" ] +- outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] ++ if (is_bsd) { ++ outputs = [ "${root_build_dir}/usr/local/etc/fonts/{{source_file_part}}" ] ++ } else { ++ outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] ++ } + } + + if (current_toolchain == host_toolchain) { diff --git a/www/chromium/files/patch-base_test_fontconfig__util__linux.cc b/www/chromium/files/patch-base_test_fontconfig__util__linux.cc deleted file mode 100644 index eb6ff5024c46..000000000000 --- a/www/chromium/files/patch-base_test_fontconfig__util__linux.cc +++ /dev/null @@ -1,406 +0,0 @@ ---- base/test/fontconfig_util_linux.cc.orig 2020-02-03 21:52:37 UTC -+++ base/test/fontconfig_util_linux.cc -@@ -6,22 +6,397 @@ - - #include <fontconfig/fontconfig.h> - --#include <memory> -- - #include "base/base_paths.h" - #include "base/environment.h" - #include "base/files/file_path.h" -+#include "base/files/file_util.h" - #include "base/logging.h" -+#include "base/macros.h" - #include "base/path_service.h" -+#include "base/strings/string_util.h" - - namespace base { - -+namespace { -+ -+const char kFontsConfTemplate[] = R"(<?xml version="1.0"?> -+<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -+<fontconfig> -+ -+ <!-- Cache location. --> -+ <cachedir>$1</cachedir> -+ -+ <!-- GCS-synced fonts. --> -+ <dir>$2</dir> -+ -+ <!-- Default properties. --> -+ <match target="font"> -+ <edit name="embeddedbitmap" mode="append_last"> -+ <bool>false</bool> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Times</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>sans</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>DejaVu Sans</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>sans serif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ </match> -+ -+ <!-- Some layout tests specify Helvetica as a family and we need to make sure -+ that we don't fallback to Tinos for them --> -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Helvetica</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>sans-serif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>serif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>mono</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Cousine</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>monospace</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Cousine</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Courier</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Cousine</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>cursive</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Comic Sans MS</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>fantasy</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Impact</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Monaco</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Arial</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Courier New</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Cousine</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Georgia</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Gelasio</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Times New Roman</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test qual="any" name="family"> -+ <string>Verdana</string> -+ </test> -+ <!-- NOT metrically compatible! --> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ </match> -+ -+ <!-- TODO(thomasanderson): Move these configs to be test-specific. --> -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>NonAntiAliasedSans</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="antialias" mode="assign"> -+ <bool>false</bool> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>SlightHintedGeorgia</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Gelasio</string> -+ </edit> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintslight</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>NonHintedSans</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <!-- These deliberately contradict each other. The 'hinting' preference -+ should take priority --> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintfull</const> -+ </edit> -+ <edit name="hinting" mode="assign"> -+ <bool>false</bool> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>AutohintedSerif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="autohint" mode="assign"> -+ <bool>true</bool> -+ </edit> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintmedium</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>HintedSerif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="autohint" mode="assign"> -+ <bool>false</bool> -+ </edit> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintmedium</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>FullAndAutoHintedSerif</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="autohint" mode="assign"> -+ <bool>true</bool> -+ </edit> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintfull</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>SubpixelEnabledArial</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="rgba" mode="assign"> -+ <const>rgb</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>SubpixelDisabledArial</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Arimo</string> -+ </edit> -+ <edit name="rgba" mode="assign"> -+ <const>none</const> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <!-- FontConfig doesn't currently provide a well-defined way to turn on -+ subpixel positioning. This is just an arbitrary pattern to use after -+ turning subpixel positioning on globally to ensure that we don't have -+ issues with our style getting cached for other tests. --> -+ <test name="family" compare="eq"> -+ <string>SubpixelPositioning</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <!-- See comments above --> -+ <test name="family" compare="eq"> -+ <string>SubpixelPositioningAhem</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>ahem</string> -+ </edit> -+ </match> -+ -+ <match target="pattern"> -+ <test name="family" compare="eq"> -+ <string>SlightHintedTimesNewRoman</string> -+ </test> -+ <edit name="family" mode="assign"> -+ <string>Tinos</string> -+ </edit> -+ <edit name="hintstyle" mode="assign"> -+ <const>hintslight</const> -+ </edit> -+ </match> -+ -+ <!-- When we encounter a character that the current font doesn't -+ support, gfx::GetFallbackFontForChar() returns the first font -+ that does have a glyph for the character. The list of fonts is -+ sorted by a pattern that includes the current locale, but doesn't -+ include a font family (which means that the fallback font depends -+ on the locale but not on the current font). -+ -+ DejaVu Sans is commonly the only font that supports some -+ characters, such as "⇧", and even when other candidates are -+ available, DejaVu Sans is commonly first among them, because of -+ the way Fontconfig is ordinarily configured. For example, the -+ configuration in the Fonconfig source lists DejaVu Sans under the -+ sans-serif generic family, and appends sans-serif to patterns -+ that don't already include a generic family (such as the pattern -+ in gfx::GetFallbackFontForChar()). -+ -+ To get the same fallback font in the layout tests, we could -+ duplicate this configuration here, or more directly, simply -+ append DejaVu Sans to all patterns. --> -+ <match target="pattern"> -+ <edit name="family" mode="append_last"> -+ <string>DejaVu Sans</string> -+ </edit> -+ </match> -+ -+</fontconfig> -+)"; -+ -+} // namespace -+ - void SetUpFontconfig() { -- FilePath dir_module; -- CHECK(PathService::Get(DIR_MODULE, &dir_module)); -+ std::unique_ptr<Environment> env = Environment::Create(); -+ if (!env->HasVar("FONTCONFIG_FILE")) { -+ // fonts.conf must be generated on-the-fly since it contains absolute paths -+ // which may be different if -+ // 1. The user moves/renames their build directory (or any parent dirs). -+ // 2. The build directory is mapped on a swarming bot at a location -+ // different from the one the buildbot used. -+ FilePath dir_module; -+ PathService::Get(DIR_MODULE, &dir_module); -+ FilePath font_cache = dir_module.Append("fontconfig_caches"); -+ FilePath test_fonts = dir_module.Append("test_fonts"); -+ std::string fonts_conf = ReplaceStringPlaceholders( -+ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr); - -- std::unique_ptr<Environment> env(Environment::Create()); -- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str())); -+ // Write the data to a different file and then atomically rename it to -+ // fonts.conf. This avoids the file being in a bad state when different -+ // parallel tests call this function at the same time. -+ FilePath fonts_conf_file_temp; -+ if(!CreateTemporaryFileInDir(dir_module, &fonts_conf_file_temp)) -+ CHECK(CreateTemporaryFile(&fonts_conf_file_temp)); -+ CHECK( -+ WriteFile(fonts_conf_file_temp, fonts_conf.c_str(), fonts_conf.size())); -+ FilePath fonts_conf_file = dir_module.Append("fonts.conf"); -+ if (ReplaceFile(fonts_conf_file_temp, fonts_conf_file, nullptr)) -+ env->SetVar("FONTCONFIG_FILE", fonts_conf_file.value()); -+ else -+ env->SetVar("FONTCONFIG_FILE", fonts_conf_file_temp.value()); -+ } - } - - } // namespace base diff --git a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc deleted file mode 100644 index 60cb0527b5f4..000000000000 --- a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- base/test/generate_fontconfig_caches.cc.orig 2019-12-16 21:51:21 UTC -+++ base/test/generate_fontconfig_caches.cc -@@ -59,7 +59,14 @@ int main() { - FcFini(); - - // Check existence of intended fontconfig cache file. -+#if defined(OS_BSD) -+ // Our version of fontconfig is too old to respect .uuid files in font directories, -+ // so we check for the CACHEDIR.TAG file instead - CHECK(base::PathExists( -+ fontconfig_caches.Append("CACHEDIR.TAG"))); -+#else -+ CHECK(base::PathExists( - fontconfig_caches.Append(base::StrCat({uuid, "-le64.cache-7"})))); -+#endif - return 0; - } 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 4ec5e581d6b6..e205455fbc37 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2020-03-16 18:40:27 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-07-07 21:58:11 UTC +++ base/test/launcher/test_launcher.cc @@ -55,6 +55,7 @@ #include "testing/gtest/include/gtest/gtest.h" @@ -8,7 +8,7 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" -@@ -551,7 +552,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -557,7 +558,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif 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 a65fcc61d56b..c48082540b08 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,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/test/test_file_util_posix.cc.orig 2020-07-07 21:57:30 UTC +++ base/test/test_file_util_posix.cc -@@ -84,7 +84,7 @@ void SyncPageCacheToDisk() { +@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() { sync(); } diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc new file mode 100644 index 000000000000..43c62689cd83 --- /dev/null +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -0,0 +1,11 @@ +--- base/threading/scoped_blocking_call_unittest.cc.orig 2020-07-13 13:43:07 UTC ++++ base/threading/scoped_blocking_call_unittest.cc +@@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA + } + + TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { +- constexpr auto kJankTiming = ++ auto kJankTiming = + internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + + internal::IOJankMonitoringWindow::kIOJankInterval * 5; + diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index bdafc95fd2e2..65da82eaa5d9 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,12 +1,12 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2019-12-16 21:50:40 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2020-07-07 21:57:30 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/callback_helpers.h" + #include "base/check_op.h" #include "base/lazy_instance.h" - #include "base/logging.h" #include "base/run_loop.h" @@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() { return !!thread_task_runner_tls.Pointer()->Get(); diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 1b96d312f328..732c4ac683d7 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2020-06-03 18:40:10 UTC +--- build/config/compiler/BUILD.gn.orig 2020-07-07 21:58:11 UTC +++ build/config/compiler/BUILD.gn -@@ -138,7 +138,7 @@ declare_args() { +@@ -133,7 +133,7 @@ declare_args() { # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. # 'use_xcode_clang' may call old clang. init_stack_vars = @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -307,7 +307,7 @@ config("compiler") { +@@ -287,7 +287,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && (is_mac || is_ios)) { -@@ -401,7 +401,7 @@ config("compiler") { +@@ -381,7 +381,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", -@@ -500,7 +500,7 @@ config("compiler") { +@@ -472,7 +472,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -770,7 +770,7 @@ config("compiler_cpu_abi") { +@@ -735,7 +735,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" ] } -@@ -1120,7 +1120,7 @@ config("compiler_deterministic") { +@@ -1085,7 +1085,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,8 +54,8 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1503,7 +1503,7 @@ config("default_warnings") { - cflags += [ "-Wno-nonportable-include-path" ] +@@ -1476,7 +1476,7 @@ config("default_warnings") { + cflags += [ "-Wno-max-tokens" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -63,7 +63,16 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1753,7 +1753,7 @@ config("thin_archive") { +@@ -1638,7 +1638,7 @@ config("no_chromium_code") { + # suppressing them individually, we just blanket suppress them here. + "-Wno-unused-variable", + ] +- if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) { ++ if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { + cflags += [ + # TODO(https://crbug.com/1031169): Clean up and enable. + "-Wno-misleading-indentation", +@@ -1716,7 +1716,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 +81,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2277,7 +2277,7 @@ config("symbols") { +@@ -2246,7 +2246,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 +90,7 @@ } if (is_clang && !is_nacl && !use_xcode_clang) { -@@ -2305,7 +2305,7 @@ config("symbols") { +@@ -2274,7 +2274,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 a1d68d448cca..32358d823ffa 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,15 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2020-05-13 18:40:16 UTC +--- build/config/compiler/compiler.gni.orig 2020-07-07 21:58:11 UTC +++ build/config/compiler/compiler.gni -@@ -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) -@@ -190,7 +190,7 @@ declare_args() { +@@ -176,7 +176,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-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 865dd3526bf5..4678bfd491de 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2020-05-13 18:40:16 UTC +--- cc/BUILD.gn.orig 2020-07-07 21:58:11 UTC +++ cc/BUILD.gn -@@ -589,7 +589,7 @@ cc_test_static_library("test_support") { +@@ -599,7 +599,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -790,7 +790,6 @@ cc_test("cc_unittests") { +@@ -801,7 +801,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index b412aea9e22b..f1df08621e85 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-12-16 21:50:40 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2020-07-07 21:58:11 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -220,8 +220,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect +@@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc new file mode 100644 index 000000000000..d3df654755cb --- /dev/null +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -0,0 +1,11 @@ +--- cc/test/layer_tree_test.cc.orig 2020-07-13 09:14:49 UTC ++++ cc/test/layer_tree_test.cc +@@ -645,7 +645,7 @@ LayerTreeTest::LayerTreeTest(LayerTreeTest::RendererTy + init_vulkan = true; + } else if (renderer_type_ == RENDERER_SKIA_DAWN) { + scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + init_vulkan = true; + #elif defined(OS_WIN) + // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc new file mode 100644 index 000000000000..2412d1a501d7 --- /dev/null +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -0,0 +1,11 @@ +--- cc/test/pixel_test.cc.orig 2020-07-13 09:15:14 UTC ++++ cc/test/pixel_test.cc +@@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend) + init_vulkan = true; + } else if (backend == kSkiaDawn) { + scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + init_vulkan = true; + #elif defined(OS_WIN) + // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc new file mode 100644 index 000000000000..71229ec3ab6f --- /dev/null +++ b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc @@ -0,0 +1,11 @@ +--- cc/trees/frame_rate_estimator.cc.orig 2020-07-13 17:25:44 UTC ++++ cc/trees/frame_rate_estimator.cc +@@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now) + // frequency is lower than that, then using a lower frame rate is permitted. + // The delta below is to account for minor offsets in frame times. + constexpr auto kFudgeDelta = base::TimeDelta::FromMilliseconds(1); +- constexpr auto kMinDelta = ++ auto kMinDelta = + (viz::BeginFrameArgs::DefaultInterval() * 2) + kFudgeDelta; + if (draw_delta < kMinDelta) + num_of_consecutive_frames_with_min_delta_++; diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 038910a7b63b..19a809976d50 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-05-13 18:40:17 UTC +--- cc/trees/property_tree.cc.orig 2020-07-07 21:58:11 UTC +++ cc/trees/property_tree.cc -@@ -1241,13 +1241,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1245,13 +1245,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_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 3c86ba8309e7..40561b36dbe4 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/app/BUILD.gn.orig 2020-05-18 10:34:00 UTC +--- chrome/app/BUILD.gn.orig 2020-07-07 21:58:12 UTC +++ chrome/app/BUILD.gn -@@ -138,7 +138,7 @@ static_library("test_support") { +@@ -139,7 +139,7 @@ static_library("test_support") { "//v8:v8_headers", ] 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 774d4feeafec..aa0cbdac9e82 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-05-13 18:40:17 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-07-07 21:58:12 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -102,7 +102,7 @@ +@@ -107,7 +107,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -145,12 +145,12 @@ +@@ -144,12 +144,12 @@ #include "v8/include/v8.h" #endif @@ -24,7 +24,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -276,7 +276,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -266,7 +266,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -33,7 +33,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -316,13 +316,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -306,13 +306,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -49,7 +49,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -361,7 +361,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +58,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -371,7 +371,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -361,7 +361,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -425,7 +425,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +76,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -437,7 +437,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -427,7 +427,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,7 +85,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -509,7 +509,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -94,7 +94,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -701,7 +701,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -691,7 +691,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -103,7 +103,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -702,7 +702,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,7 +112,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -726,7 +726,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -121,7 +121,7 @@ nacl::RegisterPathProvider(); #endif -@@ -916,7 +916,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -906,7 +906,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,7 +130,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -918,7 +918,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -139,7 +139,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1037,7 +1037,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -148,7 +148,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1068,7 +1068,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -157,7 +157,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1082,7 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1072,7 +1072,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. @@ -166,16 +166,16 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1128,7 +1128,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1114,7 +1114,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) +-#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) ++#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_BSD) {switches::kNaClLoaderProcess, NaClMain}, #else - {"<invalid>", NULL}, // To avoid constant array of size 0 -@@ -1156,7 +1156,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str + {"<invalid>", nullptr}, // To avoid constant array of size 0 +@@ -1142,7 +1142,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -184,7 +184,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* delegates) { -@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1180,7 +1180,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index cb5d74e9cf99..6793780fc70e 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2020-05-13 18:40:17 UTC +--- chrome/app/chromium_strings.grd.orig 2020-07-07 21:58:12 UTC +++ chrome/app/chromium_strings.grd -@@ -680,7 +680,7 @@ Chromium is unable to recover your settings. +@@ -681,7 +681,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <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> -@@ -781,7 +781,7 @@ Chromium is unable to recover your settings. +@@ -782,7 +782,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> -@@ -1003,7 +1003,7 @@ Chromium is unable to recover your settings. +@@ -1004,7 +1004,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 8b57ac697694..4e2871b96ffb 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2020-05-13 18:40:17 UTC +--- chrome/app/generated_resources.grd.orig 2020-07-07 21:58:12 UTC +++ chrome/app/generated_resources.grd -@@ -5137,7 +5137,7 @@ Keep your key file in a safe place. You will need it t +@@ -5181,7 +5181,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -6880,7 +6880,7 @@ the Bookmarks menu."> +@@ -6928,7 +6928,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> -@@ -7806,7 +7806,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7854,7 +7854,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 87f5ea15d159..0f869c267011 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2020-05-13 18:40:17 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-07-07 21:58:12 UTC +++ chrome/app/google_chrome_strings.grd -@@ -692,7 +692,7 @@ Google Chrome is unable to recover your settings. +@@ -688,7 +688,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <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> -@@ -793,7 +793,7 @@ Google Chrome is unable to recover your settings. +@@ -789,7 +789,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> -@@ -1022,7 +1022,7 @@ Google Chrome is unable to recover your settings. +@@ -1018,7 +1018,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 73c0d4e40cc8..bed697f91496 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-05-13 18:40:22 UTC +--- chrome/app/settings_strings.grdp.orig 2020-07-07 21:58:13 UTC +++ chrome/app/settings_strings.grdp -@@ -111,7 +111,7 @@ +@@ -83,7 +83,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> -@@ -125,7 +125,7 @@ +@@ -97,7 +97,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index a4c329d585b8..69f475ebc373 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/BUILD.gn.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/BUILD.gn.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/BUILD.gn -@@ -4195,7 +4195,9 @@ jumbo_static_library("browser") { - configs += [ "//build/config/linux:x11" ] +@@ -4209,7 +4209,9 @@ static_library("browser") { + if (use_x11) { deps += [ "//ui/gfx/x" ] } - deps += [ "//services/service_manager/zygote" ] @@ -11,7 +11,7 @@ if (use_allocator == "tcmalloc") { deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -4408,7 +4410,7 @@ jumbo_static_library("browser") { +@@ -4424,7 +4426,7 @@ static_library("browser") { ] } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 68863a9468ba..734b8c074466 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-05-13 18:40:22 UTC +--- chrome/browser/about_flags.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/about_flags.cc -@@ -173,7 +173,7 @@ +@@ -179,7 +179,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 -@@ -873,7 +873,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -879,7 +879,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +18,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -1038,7 +1038,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc +@@ -1044,7 +1044,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc nullptr, }}; @@ -26,25 +26,8 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { - {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}}; -@@ -1154,14 +1154,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat - {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), - nullptr}}; - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = { - {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}}; - - 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, -@@ -2264,13 +2264,13 @@ const FeatureEntry kFeatureEntries[] = { + {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}, +@@ -2485,13 +2485,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -60,24 +43,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2307,14 +2307,14 @@ const FeatureEntry kFeatureEntries[] = { - "OverrideTranslateTriggerInIndia")}, - #endif // OS_ANDROID - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, - flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, - FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi, - kTranslateBubbleUIVariations, - "UseButtonTranslateBubbleUI")}, --#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS -+#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD - - #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) - {"enable-native-notifications", -@@ -2404,13 +2404,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2614,13 +2614,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, #endif // OS_CHROMEOS @@ -93,16 +59,25 @@ #if defined(OS_ANDROID) {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2475,7 +2475,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, - FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, +@@ -2675,7 +2675,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, - flag_descriptions::kEnableSaveDataDescription, kOsCrOS, + flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableNavigationPredictorDescription, + kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, +-#endif // OS_CHROMEOS || OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX || OS_BSD + {"enable-preconnect-to-search", + flag_descriptions::kEnablePreconnectToSearchName, + flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, +@@ -3399,7 +3399,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, @@ -111,7 +86,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3204,7 +3204,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3454,7 +3454,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, kOmniboxRichAutocompletionVariations, "OmniboxBundledExperimentV1")}, @@ -120,7 +95,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3416,13 +3416,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3670,13 +3670,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -136,7 +111,7 @@ #if !defined(OS_ANDROID) {"ntp-confirm-suggestion-removals", -@@ -4052,7 +4052,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4361,7 +4361,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -145,7 +120,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4065,7 +4065,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4378,7 +4378,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -154,25 +129,25 @@ // defined(OS_CHROMEOS) {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSharingDeriveVapidKeyDescription, kOsAll, - FEATURE_VALUE_TYPE(kSharingDeriveVapidKey)}, +@@ -4404,7 +4404,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, -#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, -@@ -4118,7 +4118,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4415,7 +4415,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) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) // defined(OS_CHROMEOS) - {"sharing-qr-code-generator", -@@ -4193,13 +4193,13 @@ const FeatureEntry kFeatureEntries[] = { + {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, +@@ -4490,13 +4490,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -188,7 +163,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4654,7 +4654,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4937,7 +4937,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -197,7 +172,7 @@ {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, -@@ -4671,7 +4671,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4954,7 +4954,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, 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 3aa2fe1a3c84..b9d9a0b171a8 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,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2020-02-03 21:52:39 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -797,7 +797,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -849,7 +849,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 3c536250c00d..b8411abaa1cd 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/browser_resources.grd.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/browser_resources.grd -@@ -63,7 +63,7 @@ +@@ -64,7 +64,7 @@ <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.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> 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 index b39fb96034c4..fd63dec830de 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,7 +1,7 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -109,7 +109,7 @@ - #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h" +@@ -113,7 +113,7 @@ + #include "media/mojo/mojom/speech_recognition_service.mojom.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -532,7 +532,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -551,7 +551,7 @@ void PopulateChromeWebUIFrameBinders( media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map); #endif 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 7f7a4d71321f..7c8276fc2158 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-05-13 18:40:22 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -208,11 +208,11 @@ +@@ -207,11 +207,11 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -15,7 +15,7 @@ #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -246,7 +246,7 @@ +@@ -245,7 +245,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif -@@ -919,7 +919,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -918,7 +918,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -33,7 +33,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 . -@@ -928,7 +928,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -927,7 +927,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -42,8 +42,8 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -966,7 +966,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - } +@@ -954,7 +954,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #endif // BUILDFLAG(ENABLE_VR) && OS_WIN #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -51,7 +51,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1119,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1107,6 +1107,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -59,7 +59,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1127,6 +1128,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1115,6 +1116,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index d217745edf63..e2a0324ea2d0 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -71,7 +71,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa // ExitHandler takes care of deleting itself. new ExitHandler(); } else { @@ -9,7 +9,7 @@ switch (signal) { case SIGINT: case SIGHUP: -@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 0eed600fa6d3..f4725b2779ae 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-05-13 18:40:22 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -396,7 +396,7 @@ +@@ -407,7 +407,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" -@@ -450,12 +450,12 @@ +@@ -460,12 +460,12 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -483,7 +483,7 @@ +@@ -493,7 +493,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -789,11 +789,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -801,11 +801,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -47,7 +47,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1230,7 +1232,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1311,7 +1313,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -56,7 +56,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1256,7 +1258,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1337,7 +1339,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -65,7 +65,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1979,7 +1981,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2082,7 +2084,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -74,7 +74,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2256,7 +2258,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2377,7 +2379,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -83,7 +83,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)) { -@@ -3546,7 +3548,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3638,7 +3640,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -92,8 +92,8 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3681,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager - } +@@ -3758,7 +3760,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri + #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -101,7 +101,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { const base::Value* audio_sandbox_enabled_policy_value = policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3699,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& +@@ -3776,7 +3778,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -110,12 +110,12 @@ if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -3984,7 +3986,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4043,7 +4045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - MaybeAddThrottle(&throttles, - browser_switcher::BrowserSwitcherNavigationThrottle:: - MaybeCreateThrottleFor(handle)); + MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: + MaybeCreateThrottleFor(handle), + &throttles); 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 0f1e2915cb69..289d5a459dee 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-05-13 18:40:22 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -369,12 +369,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -377,12 +377,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 b1db05585e76..91fecdcbc11b 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,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-02-03 21:52:39 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler( +@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { 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 e44deb129a08..77a0fc6ac2ed 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 2020-03-16 18:40:29 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1249,7 +1249,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1266,7 +1266,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 -@@ -1273,7 +1273,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1290,7 +1290,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { 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 cc795d2eeee2..ff25c7af87ec 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 2020-05-13 18:40:22 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/download/download_item_model.cc -@@ -595,7 +595,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -599,7 +599,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(); -@@ -635,7 +635,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -639,7 +639,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 ddf30c396fc6..d25ba4cc5354 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2020-02-03 21:52:39 UTC +--- chrome/browser/download/download_prefs.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/download/download_prefs.cc -@@ -63,7 +63,7 @@ namespace { +@@ -66,7 +66,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -159,7 +159,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -171,7 +171,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -261,7 +261,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -291,7 +291,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,16 +27,16 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) -@@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -391,7 +391,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } - bool DownloadPrefs::IsAutoOpenUsed() const { + bool DownloadPrefs::IsAutoOpenByUserUsed() const { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -405,7 +405,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( +@@ -455,7 +455,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens SaveAutoOpenState(); } @@ -54,12 +54,12 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -476,7 +476,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif - void DownloadPrefs::ResetAutoOpen() { + void DownloadPrefs::ResetAutoOpenByUser() { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) SetShouldOpenPdfInSystemReader(false); #endif - auto_open_.clear(); + auto_open_by_user_.clear(); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index 702f54b47279..d95f14067c16 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,17 +1,17 @@ ---- chrome/browser/download/download_prefs.h.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/download/download_prefs.h.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/download/download_prefs.h -@@ -102,7 +102,7 @@ class DownloadPrefs { +@@ -110,7 +110,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. - void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); + void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -150,7 +150,7 @@ class DownloadPrefs { - AutoOpenCompareFunctor> AutoOpenSet; - AutoOpenSet auto_open_; +@@ -167,7 +167,7 @@ class DownloadPrefs { + + std::unique_ptr<policy::URLBlacklist> auto_open_allowed_by_urls_; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index be6e0537adfc..5e2c66298677 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_query.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_query.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/download/download_query.cc -@@ -27,7 +27,11 @@ +@@ -28,7 +28,11 @@ #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 71f0ca430012..0eed36ca0a25 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-16 18:39:43 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -147,7 +147,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -149,7 +149,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 e3fe049c897a..ef846d58e94b 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-05-13 18:40:22 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1185,6 +1185,12 @@ jumbo_static_library("extensions") { +@@ -1186,6 +1186,12 @@ 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 index 591517203deb..79b4d7d9c89a 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc -@@ -11,7 +11,7 @@ +@@ -10,7 +10,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" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.h" #endif -@@ -58,7 +58,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -57,7 +57,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherMac>(); #elif defined(OS_WIN) return std::make_unique<DeviceInfoFetcherWin>(); 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 index 8b9aeec97746..d51374308ff4 100644 --- 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 @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-05-18 18:39:09 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -40,7 +40,7 @@ #include "base/win/registry.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc new file mode 100644 index 000000000000..6875245ca282 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2020-07-13 09:17:42 UTC ++++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T + frame_observer.Wait(); + // Non-Aura Linux uses a singleton for the popup, so it looks like all windows + // have popups if there is any popup open. +-#if !(defined(OS_LINUX) && !defined(USE_AURA)) ++#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_AURA)) + // Starting window does not have a popup. + EXPECT_FALSE(ExtensionActionTestHelper::Create(browser())->HasPopup()); + #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index d8b93a7a1069..060655cdaed2 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -299,6 +299,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -292,6 +292,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 2080e8e75364..a1ca40c84375 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" @@ -9,7 +9,7 @@ #include "extensions/common/permissions/permissions_data.h" #endif -@@ -38,7 +38,7 @@ namespace { +@@ -39,7 +39,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -569,7 +569,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -570,7 +570,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { @@ -27,7 +27,7 @@ // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -592,9 +592,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -593,9 +593,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); 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 1afd5afa82c4..70190902f4bb 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 2020-05-13 18:40:22 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -96,7 +96,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() extensions::IdentityAPI::GetFactoryInstance(); extensions::InstallTrackerFactory::GetInstance(); extensions::InstallVerifierFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc b/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc deleted file mode 100644 index 831136e37584..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- chrome/browser/extensions/install_signer.cc.orig 2020-03-16 18:39:44 UTC -+++ chrome/browser/extensions/install_signer.cc -@@ -294,13 +294,13 @@ void LogRequestStartHistograms() { - DCHECK(g_single_thread_checker.Get().CalledOnValidThread()); - - // Process::Current().CreationTime is only defined on some platforms. --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - const base::Time process_creation_time = - base::Process::Current().CreationTime(); - UMA_HISTOGRAM_COUNTS_1M( - "ExtensionInstallSigner.UptimeAtTimeOfRequest", - (base::Time::Now() - process_creation_time).InSeconds()); --#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - base::TimeDelta delta; - base::TimeTicks now = base::TimeTicks::Now(); diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index a852eb590b63..1f4374448fb3 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3723,7 +3723,7 @@ const char kZeroStateFilesDescription[] = +@@ -3923,7 +3923,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #if BUILDFLAG(USE_TCMALLOC) const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3732,7 +3732,7 @@ const char kDynamicTcmallocDescription[] = +@@ -3932,7 +3932,7 @@ const char kDynamicTcmallocDescription[] = "utilization."; #endif // BUILDFLAG(USE_TCMALLOC) @@ -18,7 +18,7 @@ // All views-based platforms -------------------------------------------------- -@@ -3757,13 +3757,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -3962,13 +3962,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -34,7 +34,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -3775,7 +3775,7 @@ const char kClickToCallUIDescription[] = +@@ -3980,7 +3980,7 @@ const char kClickToCallUIDescription[] = #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -42,8 +42,8 @@ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const char kRemoteCopyReceiverName[] = -@@ -3796,16 +3796,16 @@ const char kRemoteCopyProgressNotificationDescription[ + const char kEnableMediaFeedsName[] = "Enables Media Feeds"; +@@ -4012,16 +4012,16 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index a51623b6f6ea..d8966ae52a20 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-05-13 18:40:22 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/flag_descriptions.h -@@ -18,9 +18,9 @@ +@@ -19,9 +19,9 @@ #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2167,14 +2167,14 @@ extern const char kZeroStateFilesDescription[]; +@@ -2303,14 +2303,14 @@ extern const char kZeroStateFilesDescription[]; #endif // #if defined(OS_CHROMEOS) @@ -29,7 +29,7 @@ // All views-based platforms -------------------------------------------------- -@@ -2193,12 +2193,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2332,12 +2332,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -44,7 +44,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -2207,7 +2207,7 @@ extern const char kClickToCallUIDescription[]; +@@ -2346,7 +2346,7 @@ extern const char kClickToCallUIDescription[]; #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -52,8 +52,8 @@ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - extern const char kRemoteCopyReceiverName[]; -@@ -2219,15 +2219,15 @@ extern const char kRemoteCopyImageNotificationDescript + extern const char kEnableMediaFeedsName[]; +@@ -2364,15 +2364,15 @@ extern const char kRemoteCopyPersistentNotificationDes extern const char kRemoteCopyProgressNotificationName[]; extern const char kRemoteCopyProgressNotificationDescription[]; diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 922d7c8beb61..a390dbde142e 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -732,7 +732,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index 23a0d4544e24..7a5b02c15f9d 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,15 +1,18 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc -@@ -9,8 +9,6 @@ +@@ -9,7 +9,11 @@ #include <sys/socket.h> #include <sys/types.h> --#include <linux/wireless.h> -- ++#include "build/build_config.h" ++ ++#if !defined(OS_BSD) + #include <linux/wireless.h> ++#endif + + #include "base/check.h" #include "base/files/scoped_file.h" - #include "base/logging.h" - #include "net/base/network_interfaces_linux.h" -@@ -20,6 +18,7 @@ namespace media_router { +@@ -20,6 +24,7 @@ namespace media_router { bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); @@ -17,7 +20,7 @@ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); if (!ioctl_socket.is_valid()) { // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there -@@ -41,6 +40,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: +@@ -41,6 +46,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: ssid_out->assign(ssid); return true; } 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 981d24078676..942756201d7b 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,8 +1,8 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-03-16 18:39:44 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -24,10 +24,10 @@ +@@ -23,10 +23,10 @@ + #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" - #include "services/service_manager/public/cpp/connector.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -270,7 +270,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -269,7 +269,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -315,7 +315,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -314,7 +314,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_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index e64374c89640..d482b53d7d5e 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/memory_details.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/memory_details.cc @@ -39,7 +39,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" @@ -9,7 +9,7 @@ #include "services/service_manager/zygote/zygote_host_linux.h" #endif -@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -340,7 +340,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index dd487ab9da88..8ea61636f679 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-09-09 21:55:09 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -47,7 +47,9 @@ +@@ -51,7 +51,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -55,7 +57,7 @@ +@@ -59,7 +61,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif 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 94ff3ea4dd21..33a03a24cd15 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-05-13 18:40:22 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -679,11 +679,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -680,11 +680,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); -@@ -941,7 +941,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -942,7 +942,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 d7993ef64a72..263c484e7d66 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,20 +1,20 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -462,7 +462,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -489,7 +489,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc - builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); - builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); + builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); + builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / - 1024); + kKiB); #endif -@@ -485,7 +485,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -512,7 +512,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", - pmd.os_dump().shared_footprint_kb / 1024); + pmd.os_dump().shared_footprint_kb / kKiB); -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".PrivateSwapFootprint", - pmd.os_dump().private_footprint_swap_kb / 1024); + pmd.os_dump().private_footprint_swap_kb / kKiB); 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 3a105c992e73..36513267e9bc 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -74,11 +74,11 @@ +@@ -75,11 +75,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -137,10 +137,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -138,10 +138,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 = -@@ -349,10 +349,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -352,10 +352,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); -@@ -397,10 +397,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -402,10 +402,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( -@@ -485,7 +485,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -490,7 +490,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // NetworkContext is created, but before anything has the chance to use it. stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); 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 b9786e7622f2..481088dd59a3 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-16 18:40:29 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -88,7 +88,11 @@ +@@ -92,7 +92,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_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index 7f8e5da7b3be..4489325c6ff8 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/password_manager/password_store_factory.cc @@ -189,7 +189,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( base::TimeDelta::FromSeconds(20)); @@ -8,4 +8,4 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( - profile); + IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc new file mode 100644 index 000000000000..ad1ebe848aa1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc @@ -0,0 +1,11 @@ +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-07-13 09:21:17 UTC ++++ chrome/browser/pdf/pdf_extension_test.cc +@@ -1796,7 +1796,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT + + // Checks the Linux selection clipboard by polling. + void CheckSelectionClipboard(const std::string& expected) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + CheckClipboard(ui::ClipboardBuffer::kSelection, expected); + #endif + } diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index 98bd40401783..ab6ee6caf224 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -1,4 +1,4 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc @@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { #if defined(OS_WIN) @@ -9,7 +9,7 @@ idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); #endif #if defined(OS_MACOSX) -@@ -88,7 +88,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -90,7 +90,7 @@ void ProcessMetricsHistory::UpdateHistograms() { kDiskUsageHistogramMin, kDiskUsageHistogramMax, kDiskUsageHistogramBucketCount); #endif @@ -18,7 +18,7 @@ UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); #endif -@@ -109,7 +109,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -111,7 +111,7 @@ void ProcessMetricsHistory::UpdateHistograms() { UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", true); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); #endif -@@ -129,7 +129,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -131,7 +131,7 @@ void ProcessMetricsHistory::UpdateHistograms() { kHistogramBucketCount); if (cpu_usage_ > kHighCPUUtilizationThreshold) UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h index cb195b6b0cf5..c3cf5a42e12b 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h @@ -1,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_metrics_history.h.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/performance_monitor/process_metrics_history.h -@@ -72,7 +72,7 @@ class ProcessMetricsHistory { +@@ -71,7 +71,7 @@ class ProcessMetricsHistory { uint64_t disk_usage_ = 0; #endif 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 34dbb9264e81..1a57e52ccde7 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-05-13 18:40:22 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1162,11 +1162,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1193,11 +1193,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if !defined(OS_MACOSX) { key::kFullscreenAllowed, -@@ -1234,11 +1234,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1265,11 +1265,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_SPELLCHECK) 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 249e569bfbf7..bef24c9e0321 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-05-13 18:40:22 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -375,7 +375,7 @@ +@@ -380,7 +380,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1078,7 +1078,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1075,7 +1075,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 a2ac58994f69..ecef81b85a8f 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,8 +1,8 @@ ---- 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.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -295,7 +295,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore)) - media_history::MediaHistoryKeyedServiceFactory::GetInstance(); +@@ -301,7 +301,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + media_router::MediaRouterUIServiceFactory::GetInstance(); + #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) 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 871d0818daed..081583a855ac 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-05-13 18:40:22 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -135,7 +135,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -136,7 +136,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 dc127b2786f9..418a29f77142 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-05-13 18:40:22 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1678,7 +1678,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1700,7 +1700,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, -@@ -1720,7 +1720,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1742,7 +1742,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 -@@ -2059,7 +2059,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_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index 54afc4f48a1b..41996df80f99 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,20 +1,20 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -24,7 +24,7 @@ cr.define('settings', function() { +@@ -23,7 +23,7 @@ export class AppearanceBrowserProxy { - useDefaultTheme() {} + useDefaultTheme() {} -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> - useSystemTheme() {} +- // <if expr="is_linux and not chromeos"> ++ // <if expr="is_posix and not chromeos"> + useSystemTheme() {} - // </if> -@@ -64,7 +64,7 @@ cr.define('settings', function() { - chrome.send('useDefaultTheme'); - } + // </if> +@@ -63,7 +63,7 @@ export class AppearanceBrowserProxyImpl { + chrome.send('useDefaultTheme'); + } -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> - /** @override */ - useSystemTheme() { - chrome.send('useSystemTheme'); +- // <if expr="is_linux and not chromeos"> ++ // <if expr="is_posix and not chromeos"> + /** @override */ + useSystemTheme() { + chrome.send('useSystemTheme'); 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 f5bfbde5b327..cef48947ef2d 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-05-13 18:40:22 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -52,7 +52,7 @@ +@@ -27,7 +27,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_"> -@@ -60,7 +60,7 @@ +@@ -35,7 +35,7 @@ </cr-button> </template> </if> @@ -18,12 +18,12 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -123,7 +123,7 @@ +@@ -99,7 +99,7 @@ pref="{{prefs.bookmark_bar.show_on_all_tabs}}" label="$i18n{showBookmarksBar}"> </settings-toggle-button> -<if expr="is_linux and not chromeos"> +<if expr="is_posix and not chromeos"> + <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div> <settings-toggle-button - class$="[[getFirst_(pageVisibility.bookmarksBar)]]" pref="{{prefs.browser.custom_chrome_frame}}" 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 583cf7ad9097..dca6178e5ca8 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 2020-05-13 18:40:22 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -111,7 +111,7 @@ Polymer({ +@@ -137,7 +137,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> -@@ -197,7 +197,7 @@ Polymer({ +@@ -222,7 +222,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -274,10 +274,10 @@ Polymer({ +@@ -299,10 +299,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 2d242ce878e6..a9c4ec62beb9 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,10 +1,9 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc -@@ -8,7 +8,12 @@ +@@ -8,7 +8,11 @@ #include "base/hash/hash.h" - #include "base/logging.h" -+//XXX(rene) needs shim headers? + #include "base/notreached.h" +#if defined(USE_SYSTEM_PROTOBUF) +#include <google/protobuf/message_lite.h> +#else diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc index d20b30112256..f2392a735ce1 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa +@@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { 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 f6af60886da6..59ab4588c52b 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,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc @@ -7,7 +7,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboardUI", @@ -8,8 +8,8 @@ +#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}; -@@ -20,5 +20,5 @@ const base::Feature kRemoteCopyImageNotification{ + base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -24,5 +24,5 @@ const base::Feature kRemoteCopyPersistentNotification{ const base::Feature kRemoteCopyProgressNotification{ "RemoteCopyProgressNotification", base::FEATURE_DISABLED_BY_DEFAULT}; 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 03b665f6274a..0a6e7dccfdeb 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,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-07-07 21:57:32 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.h @@ -14,7 +14,7 @@ // Feature to allow shared clipboard gets processed. @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) // Feature to enable handling remote copy messages. extern const base::Feature kRemoteCopyReceiver; -@@ -27,7 +27,7 @@ extern const base::Feature kRemoteCopyImageNotificatio +@@ -30,7 +30,7 @@ extern const base::Feature kRemoteCopyPersistentNotifi // Feature to enable progress notifications for remote copy messages. extern const base::Feature kRemoteCopyProgressNotification; 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 a9af585a25de..d7938b671069 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,15 +1,15 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -445,7 +445,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - } - #endif // defined(OS_CHROMEOS) +@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + // Chrome prefers OS provided spell checkers where they exist. So only sync the + // custom dictionary on platforms that typically don't provide one. -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { controllers.push_back( -@@ -453,7 +453,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -458,7 +458,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_sync_test_integration_single__client__wallet__sync__test.cc b/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc new file mode 100644 index 000000000000..834f4d92f514 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc.orig 2020-07-13 09:22:37 UTC ++++ chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc +@@ -814,7 +814,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Cha + IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, + SameUpdatesAreIgnoredWhenLocalCardsUnmasked) { + // We need to allow storing full server cards for this test to work properly. +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::CommandLine::ForCurrentProcess()->AppendSwitch( + autofill::switches::kEnableOfferStoreUnmaskedWalletCards); + #endif 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 cf606ad8b2ce..705fc0190969 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,6 +1,6 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2020-03-16 18:39:45 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2020-07-07 21:57:33 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "chrome/browser/themes/theme_helper_win.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -78,7 +78,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {} +@@ -77,7 +77,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {} KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -18,7 +18,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -90,7 +90,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc +@@ -89,7 +89,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index b685c32d3ede..017c12ccf8cc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2020-05-13 18:40:23 UTC +--- chrome/browser/ui/BUILD.gn.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/BUILD.gn -@@ -630,12 +630,15 @@ jumbo_static_library("ui") { +@@ -641,12 +641,15 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } 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 12ef93a8d1c4..54cc03271d7d 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-05-13 18:40:25 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -84,7 +84,7 @@ +@@ -83,7 +83,7 @@ #include "components/session_manager/core/session_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -254,7 +254,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -253,7 +253,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 = -@@ -480,7 +480,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -479,7 +479,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -979,7 +979,7 @@ void BrowserCommandController::InitCommandState() { +@@ -981,7 +981,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true); #endif 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 1a746ea2edc2..d9af1ba13eb7 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,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -82,7 +82,7 @@ +@@ -85,7 +85,7 @@ #include "chrome/browser/ui/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -291,7 +291,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co +@@ -300,7 +300,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co // true, send a warning if guest mode is requested but not allowed by policy. bool IsGuestModeEnforced(const base::CommandLine& command_line, bool show_warning) { @@ -18,7 +18,7 @@ PrefService* service = g_browser_process->local_state(); DCHECK(service); -@@ -675,8 +675,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -684,8 +684,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 50a60a1e455a..a301a76dea6c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/tab_helpers.cc @@ -143,7 +143,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -377,11 +377,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -392,11 +392,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_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc new file mode 100644 index 000000000000..16ef7ae396c8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2020-07-13 09:23:32 UTC ++++ chrome/browser/ui/test/test_browser_dialog.cc +@@ -114,7 +114,7 @@ bool TestBrowserDialog::VerifyUi() { + + views::Widget* dialog_widget = *(added.begin()); + // TODO(https://crbug.com/958242) support Mac for pixel tests. +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + dialog_widget->SetBlockCloseForTesting(true); + // Deactivate before taking screenshot. Deactivated dialog pixel outputs + // is more predictable than activated dialog. diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc new file mode 100644 index 000000000000..ff9d6ec0005d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2020-07-13 09:23:57 UTC ++++ chrome/browser/ui/test/test_browser_ui.cc +@@ -10,7 +10,7 @@ + #include "build/build_config.h" + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h" + #include "ui/compositor/test/draw_waiter_for_test.h" + #include "ui/views/widget/widget.h" +@@ -37,7 +37,7 @@ bool TestBrowserUi::VerifyPixelUi(views::Widget* widge + const std::string& screenshot_prefix, + const std::string& screenshot_name) { + // TODO(https://crbug.com/958242) support Mac for pixel tests. +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + "browser-ui-tests-verify-pixels")) + return true; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc new file mode 100644 index 000000000000..eb2aa8604f95 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2020-07-13 09:24:43 UTC ++++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +@@ -1833,7 +1833,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv + } + + void Step3() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + EXPECT_EQ(1, test_view_->press_count()); + #else + EXPECT_EQ(2, test_view_->press_count()); 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 index b7b7502063f4..d9b14d21e1f2 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -234,7 +234,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do +@@ -235,7 +235,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do open_button_ = AddChildView(std::move(open_button)); int file_name_style = views::style::STYLE_PRIMARY; @@ -9,7 +9,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) file_name_style = STYLE_EMPHASIZED; #endif -@@ -1635,7 +1635,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty +@@ -1636,7 +1636,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 228b9c0b4c35..51a23ba87bf4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -38,14 +38,14 @@ #include "components/user_manager/user_manager.h" @@ -23,6 +23,6 @@ chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - auto workspace = display::Screen::GetScreen()->GetCurrentWorkspace(); - BrowserList::MoveBrowsersInWorkspaceToFront(workspace.empty() ? GetWorkspace() - : workspace); + // If the window was sent to a different workspace, prioritize it if + // it was sent to the current workspace and deprioritize it + // otherwise. This is done by MoveBrowsersInWorkspaceToFront() 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 e8ae08d593f8..492f58d424af 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-05-13 18:40:25 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1716,7 +1716,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1729,7 +1729,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_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 29ce253e020b..753ace3963ed 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -449,7 +449,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -894,7 +894,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -889,7 +889,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else SetCapture(target_context); @@ -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. -@@ -2081,7 +2081,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2076,7 +2076,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 5d47c3dfcc09..4db7812d21a2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -560,7 +560,7 @@ std::string ChromeURLs() { +@@ -563,7 +563,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -619,7 +619,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } 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 a60772e10123..aa12ea3fe72c 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-05-13 18:40:25 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -232,11 +232,11 @@ +@@ -228,11 +228,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 -@@ -358,7 +358,7 @@ bool IsAboutUI(const GURL& url) { +@@ -376,7 +376,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) -@@ -702,7 +702,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -725,7 +725,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,8 +32,8 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -750,17 +750,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - return &NewWebUI<CastUI>; +@@ -773,17 +773,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) 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 c542c05e37a5..a7c79e5ce249 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-05-13 18:40:25 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -285,7 +285,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -319,7 +319,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL}, {"tiny", IDS_SETTINGS_TINY_FONT_SIZE}, {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index f3d7249f1c4c..8942c1e2054c 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-05-13 18:40:25 UTC +--- chrome/common/BUILD.gn.orig 2020-07-07 21:58:14 UTC +++ chrome/common/BUILD.gn -@@ -277,6 +277,11 @@ static_library("common") { +@@ -273,6 +273,11 @@ 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 11726bed5663..9f189f9fc869 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-02-03 21:52:41 UTC +--- chrome/common/channel_info_posix.cc.orig 2020-07-07 21:57:33 UTC +++ chrome/common/channel_info_posix.cc @@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() { } @@ -8,8 +8,8 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - version_info::Channel product_channel(GetChannel()); -@@ -89,7 +89,7 @@ std::string GetDesktopName(base::Environment* env) { + // Google Chrome packaged as a snap is a special case: the application name +@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environment* env) { return "chromium-browser.desktop"; #endif } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 99096dbc73ed..72c78872e51f 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-05-13 18:40:25 UTC +--- chrome/common/chrome_features.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/common/chrome_features.cc -@@ -66,13 +66,13 @@ const base::Feature kAsyncDns { +@@ -68,13 +68,13 @@ const base::Feature kAsyncDns { #endif }; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index ada0e33d9b7e..2ca11194fafc 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-05-13 18:40:25 UTC +--- chrome/common/chrome_features.h.orig 2020-07-07 21:58:14 UTC +++ chrome/common/chrome_features.h -@@ -59,10 +59,10 @@ extern const base::Feature kAppServiceIntentHandling; +@@ -61,10 +61,10 @@ extern const base::Feature kAppServiceIntentHandling; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index d71921c12f3a..de52fa804ea8 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-05-13 18:40:25 UTC +--- chrome/common/chrome_switches.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/common/chrome_switches.cc -@@ -850,7 +850,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -833,7 +833,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 11cee03187c3..66b4a3837121 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-05-13 18:40:25 UTC +--- chrome/common/chrome_switches.h.orig 2020-07-07 21:58:14 UTC +++ chrome/common/chrome_switches.h -@@ -259,7 +259,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -255,7 +255,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index d69c38703319..653e9b714b41 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/command.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/common/extensions/command.cc.orig 2020-07-07 21:57:33 UTC +++ chrome/common/extensions/command.cc -@@ -300,7 +300,7 @@ std::string Command::CommandPlatform() { +@@ -293,7 +293,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index dccc7c422ff9..b93907d17968 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-05-13 18:40:25 UTC +--- chrome/common/features.gni.orig 2020-07-07 21:58:14 UTC +++ chrome/common/features.gni -@@ -55,7 +55,7 @@ declare_args() { +@@ -54,7 +54,7 @@ declare_args() { # Enables password change in leaked password dialog, disabled by default. enable_password_change_in_leaked_dialog = false 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 index 0f28ca47dca6..dc060950d123 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2020-03-17 09:44:41 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -98,7 +98,7 @@ void AddCdmHostFilePaths( +@@ -93,7 +93,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 6dad9fb69c8c..26f2e59870e8 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-05-13 18:40:25 UTC +--- chrome/common/pref_names.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/common/pref_names.cc -@@ -1108,7 +1108,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1076,7 +1076,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 -@@ -1242,7 +1242,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1213,7 +1213,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"; -@@ -1677,7 +1677,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1651,7 +1651,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 -@@ -1973,12 +1973,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = +@@ -1962,12 +1962,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = const char kAmbientAuthenticationInPrivateModesEnabled[] = "auth.ambient_auth_in_private_modes"; @@ -42,7 +42,7 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2882,7 +2882,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit +@@ -2874,7 +2874,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit const char kBlockAutoplayEnabled[] = "media.block_autoplay"; #endif // !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 2c55a35a8212..36585ecd88ca 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-05-13 18:40:25 UTC +--- chrome/common/pref_names.h.orig 2020-07-07 21:58:14 UTC +++ chrome/common/pref_names.h -@@ -346,7 +346,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -345,7 +345,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[]; -@@ -377,7 +377,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -376,7 +376,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,16 +18,16 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -545,7 +545,7 @@ extern const char kAppWindowPlacement[]; - extern const char kDownloadDefaultDirectory[]; - extern const char kDownloadExtensionsToOpen[]; +@@ -550,7 +550,7 @@ extern const char kDownloadExtensionsToOpen[]; + extern const char kDownloadExtensionsToOpenByPolicy[]; + extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) -@@ -758,9 +758,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; +@@ -764,9 +764,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; extern const char kGloballyScopeHTTPAuthCacheEnabled[]; extern const char kAmbientAuthenticationInPrivateModesEnabled[]; @@ -39,7 +39,7 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -991,7 +991,7 @@ extern const char kAutoplayWhitelist[]; +@@ -999,7 +999,7 @@ extern const char kAutoplayWhitelist[]; extern const char kBlockAutoplayEnabled[]; #endif 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 e97e68ea823f..629d91c9e0ff 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,15 +1,15 @@ ---- chrome/common/webui_url_constants.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/common/webui_url_constants.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/common/webui_url_constants.cc -@@ -320,7 +320,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { - const char kChromeUICastHost[] = "cast"; - #endif +@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { + } + #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -331,17 +331,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -330,17 +330,17 @@ const char kChromeUIProfilePickerHost[] = "profile-pic const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -30,7 +30,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -623,13 +623,13 @@ const char* const kChromeHostURLs[] = { +@@ -500,13 +500,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 d34bffc0a3ad..c8f720a222c5 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,15 +1,15 @@ ---- chrome/common/webui_url_constants.h.orig 2020-05-13 18:40:25 UTC +--- chrome/common/webui_url_constants.h.orig 2020-07-07 21:58:14 UTC +++ chrome/common/webui_url_constants.h -@@ -283,7 +283,7 @@ bool IsSystemWebUIHost(base::StringPiece host); - extern const char kChromeUICastHost[]; - #endif +@@ -282,7 +282,7 @@ bool IsSystemWebUIHost(base::StringPiece host); + + #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -295,17 +295,17 @@ extern const char kChromeUIHatsURL[]; +@@ -295,17 +295,17 @@ extern const char kChromeUIProfilePickerHost[]; 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 fd37dba13424..cc91d54a387b 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-05-13 18:40:25 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1059,7 +1059,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1078,7 +1078,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 acffc70ac0c9..5a45c5e3f160 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/test/BUILD.gn.orig 2020-05-13 18:40:25 UTC +--- chrome/test/BUILD.gn.orig 2020-07-07 21:58:14 UTC +++ chrome/test/BUILD.gn -@@ -6109,7 +6109,7 @@ test("chrome_app_unittests") { - "//components/gwp_asan/buildflags", +@@ -6191,7 +6191,7 @@ test("chrome_app_unittests") { + "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] - if (!is_fuchsia) { 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 index 1132b9852246..b1edf8f80ebd 100644 --- a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc +++ b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/chrome_test_launcher.cc.orig 2020-05-13 18:39:39 UTC +--- chrome/test/base/chrome_test_launcher.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/test/base/chrome_test_launcher.cc @@ -61,7 +61,7 @@ #endif @@ -9,6 +9,15 @@ #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h" #include "chrome/browser/upgrade_detector/installed_version_poller.h" #include "testing/gtest/include/gtest/gtest.h" +@@ -81,7 +81,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char + content::ContentTestSuiteBase::RegisterInProcessThreads(); + #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + InstalledVersionPoller::ScopedDisableForTesting disable_polling( + InstalledVersionPoller::MakeScopedDisableForTesting()); + #endif @@ -231,7 +231,7 @@ int LaunchChromeTests(size_t parallel_jobs, } 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 fbb31dab945d..15d46dc40629 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 2020-05-13 18:40:25 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2020-07-07 21:58:14 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -77,6 +77,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -104,7 +108,7 @@ +@@ -105,7 +109,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) @@ -20,7 +20,7 @@ #include "ui/views/test/test_desktop_screen_x11.h" #endif -@@ -258,7 +262,7 @@ void InProcessBrowserTest::SetUp() { +@@ -282,7 +286,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. @@ -29,7 +29,7 @@ OSCryptMocker::SetUp(); #endif -@@ -320,7 +324,7 @@ void InProcessBrowserTest::TearDown() { +@@ -344,7 +348,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index 93b8bc2e291b..6a67fa4771e1 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2020-05-13 18:40:25 UTC +--- chrome/test/base/testing_browser_process.h.orig 2020-07-07 21:58:14 UTC +++ chrome/test/base/testing_browser_process.h -@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -118,8 +118,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; StartupData* startup_data() override; 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 index 81970dcbbec1..55dac4d42cad 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-03-23 14:46:39 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-07-07 21:57:34 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -278,7 +278,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -277,7 +277,7 @@ TEST(KeyConverter, AllShorthandKeys) { ->Generate(&key_events); builder.Generate(&key_events); builder.SetKeyCode(ui::VKEY_TAB); @@ -9,7 +9,7 @@ builder.SetText("\t", "\t")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -286,7 +286,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -285,7 +285,7 @@ TEST(KeyConverter, AllShorthandKeys) { key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); #endif builder.SetKeyCode(ui::VKEY_BACK); @@ -18,7 +18,7 @@ builder.SetText("\b", "\b")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -297,7 +297,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -296,7 +296,7 @@ TEST(KeyConverter, AllShorthandKeys) { CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); } @@ -27,7 +27,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -354,7 +354,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -353,7 +353,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { diff --git a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc new file mode 100644 index 000000000000..ac458e0d2904 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc @@ -0,0 +1,11 @@ +--- chrome/test/chromedriver/server/chromedriver_server.cc.orig 2020-07-13 09:28:06 UTC ++++ chrome/test/chromedriver/server/chromedriver_server.cc +@@ -492,7 +492,7 @@ int main(int argc, char *argv[]) { + base::AtExitManager at_exit; + base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Select the locale from the environment by passing an empty string instead + // of the default "C" locale. This is particularly needed for the keycode + // conversion code to work. 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 4b91ace351f3..af10c34c339f 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,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2020-05-13 18:40:25 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-07-07 21:58:14 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -75,7 +75,7 @@ #include "ui/base/ui_base_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -269,7 +269,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -272,7 +272,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -18,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -285,7 +285,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -288,7 +288,7 @@ base::FilePath GetApplicationFontsDir() { } } @@ -27,7 +27,7 @@ } // namespace -@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -317,7 +317,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -36,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. -@@ -324,7 +324,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -327,7 +327,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -45,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. -@@ -465,7 +465,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -479,7 +479,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 e04700bca62b..b24788bca45a 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2020-05-13 18:40:25 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2020-07-07 21:58:14 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -450,7 +450,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -457,7 +457,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc new file mode 100644 index 000000000000..8a91130ad3fb --- /dev/null +++ b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc @@ -0,0 +1,23 @@ +--- chromecast/media/base/default_monotonic_clock.cc.orig 2020-07-13 09:31:00 UTC ++++ chromecast/media/base/default_monotonic_clock.cc +@@ -9,9 +9,9 @@ + #include "base/time/time.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include "chromecast/media/base/buildflags.h" +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + #include <zircon/syscalls.h> +@@ -20,7 +20,7 @@ + namespace chromecast { + namespace media { + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + int64_t MonotonicClockNow() { + timespec now = {0, 0}; + #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index 0ec0a354b754..cd067e4c8780 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2020-05-18 11:10:39 UTC +--- components/BUILD.gn.orig 2020-07-07 21:58:14 UTC +++ components/BUILD.gn -@@ -286,9 +286,13 @@ test("components_unittests") { +@@ -290,9 +290,14 @@ test("components_unittests") { ] if (!is_fuchsia) { @@ -9,10 +9,11 @@ + "//components/crash/content/browser:unit_tests", + "//components/crash/core/app:unit_tests", + ] -+ } ++ } ++ deps += [ - "//components/crash/content/browser:unit_tests", - "//components/crash/core/app:unit_tests", - "//components/data_reduction_proxy/content/common:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests", + ] diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index f9da88b9683c..9d4aed4e9def 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-12-16 21:50:45 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2020-07-07 21:58:14 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -19,7 +19,11 @@ +@@ -20,7 +20,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc index 294953ed5551..097d0570f2e7 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-12-16 21:50:45 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2020-07-07 21:58:14 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -233,7 +233,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -226,7 +226,7 @@ bool IsInAutofillSuggestionsDisabledExperiment() { } bool OfferStoreUnmaskedCards(bool is_off_the_record) { 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 index 7ab0bc75df5d..f1910897dfd2 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-05-13 18:40:26 UTC +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-07-07 21:58:14 UTC +++ components/autofill/core/browser/autofill_external_delegate.cc -@@ -117,7 +117,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( +@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( // Append the "Hide Suggestions" menu item for only Autofill Address and // Autocomplete popups. 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 fa689f4c147d..7a7e321027de 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-05-13 18:40:26 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-07-07 21:58:14 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1907,7 +1907,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1921,7 +1921,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) return false; #else -@@ -1931,7 +1931,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -1945,7 +1945,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // The option should only be shown if the user has not already opted-in. return !is_opted_in; 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 59b55704914a..92bdc3d3b18c 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-05-13 18:40:26 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-07-07 21:58:14 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -101,7 +101,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio +@@ -115,7 +115,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio bool ShouldShowImprovedUserConsentForCreditCardSave() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 b7c5ab969a32..b7177c832a48 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 2020-03-16 18:39:48 UTC +--- components/crash/core/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,7 +9,7 @@ } group("common") { -@@ -104,7 +104,9 @@ target(crash_key_target_type, "crash_key_lib") { +@@ -108,7 +108,9 @@ target(crash_key_target_type, "crash_key_lib") { ] } @@ -20,12 +20,12 @@ if (use_combined_annotations) { public_deps += [ "//third_party/crashpad/crashpad/client" ] } -@@ -167,7 +169,7 @@ source_set("unit_tests") { - sources += [ "objc_zombie_unittest.mm" ] - } - -- if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android) { -+ if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android && !is_bsd) { +@@ -184,7 +186,7 @@ source_set("unit_tests") { + sources += [ "crash_key_breakpad_ios_unittest.cc" ] + deps += [ "//third_party/breakpad:client" ] + include_dirs = [ "//third_party/breakpad/breakpad/src/" ] +- } else if (!is_mac && !is_win && !is_fuchsia && !is_android) { ++ } else if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 6bfd36f75f8d..3f9b74623f21 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-16 18:39:48 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2020-07-07 21:58:15 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -58,7 +58,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -60,7 +60,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedReadingListFeature, &kIPHBadgedTranslateManualTriggerFeature, #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) &kIPHFocusModeFeature, &kIPHGlobalMediaControlsFeature, -@@ -69,7 +69,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -71,7 +71,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 246d10568f99..8b07e4b8fb3e 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-16 18:39:48 UTC +--- components/feature_engagement/public/feature_list.h.orig 2020-07-07 21:58:15 UTC +++ components/feature_engagement/public/feature_list.h -@@ -111,7 +111,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge +@@ -113,7 +113,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"); -@@ -122,7 +122,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm +@@ -124,7 +124,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 -@@ -172,7 +172,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -176,7 +176,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), -@@ -183,7 +183,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -187,7 +187,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_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index b89758947847..adf2e64f115b 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-16 18:40:30 UTC +--- components/metrics/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ components/metrics/BUILD.gn -@@ -173,6 +173,11 @@ jumbo_static_library("metrics") { +@@ -177,6 +177,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 05cf37119ae4..579e92430da3 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2020-05-13 18:40:26 UTC +--- components/metrics/metrics_log.cc.orig 2020-07-07 21:58:15 UTC +++ components/metrics/metrics_log.cc -@@ -210,7 +210,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -214,7 +214,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 07a9dedb488d..0aec56a3e621 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2020-02-03 21:53:30 UTC +--- components/neterror/resources/neterror.js.orig 2020-07-07 21:58:15 UTC +++ components/neterror/resources/neterror.js -@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) { +@@ -202,7 +202,7 @@ function setUpCachedButton(buttonStrings) { } let primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 7c0b6f73c193..7bea87ef5488 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-05-13 18:40:26 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-07-07 21:58:15 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -719,7 +719,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -703,7 +703,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index a78ccc8787f8..13dc978bbc38 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-05-13 18:40:22 UTC -+++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -296,6 +296,8 @@ class PolicyTestCase { +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2020-07-13 09:35:12 UTC ++++ components/policy/core/browser/policy_pref_mapping_test.cc +@@ -270,6 +270,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); 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 06a59baab59d..13d0c5eb1a3a 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-02-03 21:52:44 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-07-07 21:58:15 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.h> @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -60,7 +60,7 @@ +@@ -61,7 +61,7 @@ #include "base/system/sys_info.h" #endif @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -69,11 +69,24 @@ namespace policy { +@@ -70,11 +70,24 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -53,7 +53,7 @@ #elif defined(OS_MACOSX) // TODO(crbug.com/1024115): Find a different replacement for -[NSHost // currentHost] on iOS. -@@ -123,7 +136,7 @@ std::string GetMachineName() { +@@ -124,7 +137,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { @@ -62,7 +62,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -146,7 +159,7 @@ std::string GetOSArchitecture() { +@@ -147,7 +160,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index 084085fb3d9f..886e2b810d99 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/schema.cc.orig 2019-03-11 22:00:56 UTC +--- components/policy/core/common/schema.cc.orig 2020-07-07 21:57:36 UTC +++ components/policy/core/common/schema.cc -@@ -23,7 +23,11 @@ +@@ -24,7 +24,11 @@ #include "base/strings/stringprintf.h" #include "components/policy/core/common/json_schema_constants.h" #include "components/policy/core/common/schema_internal.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 94b59296c6ce..a0d8ee1b04c9 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2020-05-13 18:40:26 UTC +--- components/policy/resources/policy_templates.json.orig 2020-07-07 21:58:15 UTC +++ components/policy/resources/policy_templates.json -@@ -1114,7 +1114,7 @@ +@@ -1127,7 +1127,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1144,7 +1144,7 @@ +@@ -1157,7 +1157,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1171,7 +1171,7 @@ +@@ -1184,7 +1184,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1995,7 +1995,7 @@ +@@ -2013,7 +2013,7 @@ 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3913,7 +3913,7 @@ +@@ -4151,7 +4151,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3967,7 +3967,7 @@ +@@ -4205,7 +4205,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7491,7 +7491,7 @@ +@@ -7781,7 +7781,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8868,7 +8868,7 @@ +@@ -9179,7 +9179,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -9591,7 +9591,7 @@ +@@ -9928,7 +9928,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 0274c627676a..59015ce58ae6 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,19 +1,13 @@ ---- components/policy/tools/generate_policy_source.py.orig 2020-02-03 21:53:30 UTC +--- components/policy/tools/generate_policy_source.py.orig 2020-07-07 21:58:15 UTC +++ components/policy/tools/generate_policy_source.py -@@ -97,6 +97,7 @@ class PolicyDetails: - 'chrome.linux', - 'chrome.mac', - 'chrome.fuchsia', -+ 'chrome.freebsd', - 'chrome.*', - 'chrome.win7', - ]: -@@ -119,7 +120,7 @@ class PolicyDetails: - if platform.startswith('chrome.'): - platform_sub = platform[7:] - if platform_sub == '*': -- self.platforms.extend(['win', 'mac', 'linux', 'fuchsia']) -+ self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'freebsd']) - elif platform_sub == 'win7': - self.platforms.append('win') - else: +@@ -37,8 +37,9 @@ PLATFORM_STRINGS = { + 'ios': ['ios'], + 'chrome.win': ['win'], + 'chrome.linux': ['linux'], ++ 'chrome.freebsd': ['freebsd'], + 'chrome.mac': ['mac'], +- 'chrome.*': ['win', 'mac', 'linux'], ++ 'chrome.*': ['win', 'mac', 'linux', 'freebsd'], + 'chrome.win7': ['win'] + } + 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 index 96e78d637267..d1eedad301dd 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-05-13 18:40:30 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-07-07 21:58:15 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -271,7 +271,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -272,7 +272,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. 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 index 7b27a7dd14d1..c04afee015a3 100644 --- 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 @@ -1,11 +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.orig 2020-07-13 09:36:15 UTC +++ components/viz/service/display_embedder/skia_output_device_dawn.cc -@@ -10,7 +10,7 @@ - +@@ -14,7 +14,7 @@ #if defined(OS_WIN) - #include <dawn_native/D3D12Backend.h> + #include "third_party/dawn/src/include/dawn_native/D3D12Backend.h" + #include "ui/gl/vsync_provider_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include <dawn_native/VulkanBackend.h> + #include "third_party/dawn/src/include/dawn_native/VulkanBackend.h" #endif 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 b6be9b242a36..2b362538954e 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-05-13 18:40:30 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-07-07 21:58:15 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -50,7 +50,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); -@@ -431,7 +431,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -448,7 +448,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 c9067e1bd917..02bacec4bf44 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,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-05-13 18:40:30 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-07-07 21:57:37 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -151,7 +151,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -157,7 +157,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp base::TimeDelta preferred_frame_interval_ = FrameRateDecider::UnspecifiedFrameInterval(); 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 index 43940cf13781..d1e2dc5db3e4 100644 --- a/www/chromium/files/patch-components_viz_test_mock__display__client.h +++ b/www/chromium/files/patch-components_viz_test_mock__display__client.h @@ -1,7 +1,7 @@ ---- components/viz/test/mock_display_client.h.orig 2020-04-06 08:00:42 UTC +--- components/viz/test/mock_display_client.h.orig 2020-07-07 21:57:37 UTC +++ components/viz/test/mock_display_client.h -@@ -35,7 +35,7 @@ class MockDisplayClient : public mojom::DisplayClient - MOCK_METHOD1(OnContextCreationResult, void(gpu::ContextResult)); +@@ -36,7 +36,7 @@ class MockDisplayClient : public mojom::DisplayClient + MOCK_METHOD1(SetWideColorEnabled, void(bool enabled)); MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) 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 c812e72af8e8..5d872cbc0665 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2020-05-13 18:40:30 UTC +--- content/app/content_main_runner_impl.cc.orig 2020-07-07 21:58:15 UTC +++ content/app/content_main_runner_impl.cc -@@ -102,17 +102,17 @@ +@@ -114,17 +114,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,16 +21,16 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -133,7 +133,7 @@ +@@ -145,7 +145,7 @@ #include "content/public/common/content_client.h" #endif -#endif // OS_LINUX +#endif // OS_LINUX || defined(OS_BSD) - #if !defined(CHROME_MULTIPLE_DLL_BROWSER) - #include "content/child/field_trial.h" -@@ -300,7 +300,7 @@ void InitializeZygoteSandboxForBrowserProcess( + #if BUILDFLAG(USE_ZYGOTE_HANDLE) + #include "content/browser/sandbox_host_linux.h" +@@ -289,7 +289,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,7 +39,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -397,7 +397,7 @@ void PreSandboxInit() { +@@ -386,7 +386,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -48,7 +48,7 @@ } // namespace -@@ -465,7 +465,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -450,7 +450,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -625,11 +625,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -594,11 +594,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 8c9efaa976a8..29faa4677fd0 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2020-05-19 08:29:25 UTC +--- content/browser/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ content/browser/BUILD.gn -@@ -2004,6 +2004,9 @@ jumbo_source_set("browser") { +@@ -2044,6 +2044,9 @@ jumbo_source_set("browser") { "//third_party/blink/public/mojom:memory_usage_monitor_linux_mojo_bindings", ] } 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 cf7d07e695bb..28bf251f55ca 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-05-13 18:40:31 UTC +--- content/browser/browser_main_loop.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/browser_main_loop.cc -@@ -242,6 +242,13 @@ +@@ -241,6 +241,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 -@@ -658,7 +665,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -654,7 +661,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MACOSX) @@ -23,7 +23,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. -@@ -668,7 +675,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -664,7 +671,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_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 3751c782527d..07b3d2a70f08 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-12-16 21:51:26 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/devtools/protocol/system_info_handler.cc @@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Give the GPU process a few seconds to provide GPU info. - // Linux Debug builds need more time -- see Issue 796437. + // Linux Debug builds need more time -- see Issue 796437 and 1046598. // Windows builds need more time -- see Issue 873112 and 1004472. --#if (defined(OS_LINUX) && !defined(NDEBUG)) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) - const int kGPUInfoWatchdogTimeoutMs = 20000; - #elif defined(OS_WIN) +-#if (defined(OS_LINUX) && !defined(NDEBUG)) || defined(OS_WIN) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) || defined(OS_WIN) const int kGPUInfoWatchdogTimeoutMs = 30000; + #else + const int kGPUInfoWatchdogTimeoutMs = 5000; 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 52ac6ac0bf74..76e451bc26d3 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,15 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2020-05-13 18:40:31 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1099,7 +1099,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -215,7 +215,7 @@ static const char* const kSwitchNames[] = { + service_manager::switches::kGpuSandboxFailuresFatal, + service_manager::switches::kDisableGpuSandbox, + service_manager::switches::kNoSandbox, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switches::kDisableDevShmUsage, + #endif + #if defined(OS_WIN) +@@ -1094,7 +1094,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 deleted file mode 100644 index 1ac54277ca6c..000000000000 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/media/media_internals.cc.orig 2020-05-13 18:40:31 UTC -+++ content/browser/media/media_internals.cc -@@ -560,7 +560,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)); --#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_ANDROID) - device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); - #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 bc0f8ce7d525..b18e2476eb81 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-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -242,7 +242,7 @@ +@@ -243,7 +243,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1199,7 +1199,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1200,7 +1200,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; -@@ -1210,7 +1210,7 @@ size_t GetPlatformProcessLimit() { +@@ -1211,7 +1211,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) -@@ -1304,7 +1304,7 @@ class RenderProcessHostImpl::IOThreadHostImpl +@@ -1305,7 +1305,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; -@@ -1724,7 +1724,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1739,7 +1739,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -45,3 +45,12 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MACOSX) +@@ -3232,7 +3232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin + service_manager::switches::kDisableInProcessStackTraces, + service_manager::switches::kDisableSeccompFilterSandbox, + service_manager::switches::kNoSandbox, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switches::kDisableDevShmUsage, + #endif + #if defined(OS_MACOSX) 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 f17c155d5c40..c9e5ead64625 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-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2020-07-07 21:58:15 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -469,10 +469,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -478,10 +478,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 8558a81751a7..d2a8a1c2bcab 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-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -206,7 +206,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -227,7 +227,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 5cff6dfbbbca..d9956498f67e 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,14 +1,28 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -115,7 +115,7 @@ +@@ -111,11 +111,11 @@ + #include "ui/gfx/gdi_util.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif +@@ -557,7 +557,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge + if (manager) + return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); + +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + BrowserAccessibilityManager* manager = + host()->GetOrCreateRootBrowserAccessibilityManager(); + if (manager && manager->GetRoot()) @@ -2187,7 +2187,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } 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 ebeeac2a51c1..397c2691e0c0 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-02-03 21:52:46 UTC +--- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/scheduler/responsiveness/watcher.cc -@@ -101,7 +101,7 @@ void Watcher::DidRunTask(const base::PendingTask* task +@@ -102,7 +102,7 @@ void Watcher::DidRunTask(const base::PendingTask* task // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. @@ -9,7 +9,7 @@ return currently_running_metadata_ui_.clear(); #endif DCHECK_LE(*mismatched_task_identifiers, 1); -@@ -170,7 +170,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque +@@ -171,7 +171,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque mismatched_event_identifiers_ui_ += 1; // See comment in DidRunTask() for why |currently_running_metadata_ui_| may // be reset. 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 2a5cb1bbdcf8..9e2464bcc5d5 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2020-05-13 18:40:31 UTC +--- content/browser/utility_process_host.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/utility_process_host.cc -@@ -247,7 +247,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -248,7 +248,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(service_manager::SandboxType::kUtility), @@ -9,3 +9,12 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), +@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { + network::switches::kNetLogCaptureMode, + network::switches::kExplicitlyAllowedPorts, + service_manager::switches::kNoSandbox, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switches::kDisableDevShmUsage, + #endif + service_manager::switches::kEnableAudioServiceSandbox, 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 cb181bd0c0b3..28bd0af475ef 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,17 +1,18 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-16 18:39:50 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2020-07-07 21:58:15 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -131,12 +131,12 @@ const std::map<int, std::string> CreateMojoResourceIdT +@@ -130,13 +130,13 @@ 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) +-#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_ANDROID) {IDR_MOJO_TIME_MOJOM_HTML, "mojo/mojo/public/mojom/base/time.mojom.html"}, {IDR_MOJO_TIME_MOJOM_LITE_JS, "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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_ANDROID) }; } - diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index bab8939d35c6..f9cf481ecfa9 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-05-13 18:40:31 UTC +--- content/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ content/common/BUILD.gn -@@ -344,6 +344,12 @@ source_set("common") { +@@ -340,6 +340,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 c3c6b860525d..838e2dee302f 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,8 +1,8 @@ ---- content/common/user_agent.cc.orig 2020-05-13 18:40:31 UTC +--- content/common/user_agent.cc.orig 2020-07-07 21:57:37 UTC +++ content/common/user_agent.cc -@@ -160,6 +160,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ - #endif +@@ -198,6 +198,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons ); + #endif +#if defined(OS_BSD) +#if defined(__x86_64__) diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index e187a3b4ecb9..ff722f4a3504 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-05-13 18:40:31 UTC +--- content/gpu/gpu_main.cc.orig 2020-07-07 21:58:15 UTC +++ content/gpu/gpu_main.cc -@@ -84,7 +84,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +@@ -83,7 +83,7 @@ + #include "ui/gfx/x/x11_types.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" -@@ -109,7 +109,7 @@ namespace content { +@@ -108,7 +108,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -162,7 +162,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -161,7 +161,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_); -@@ -288,7 +288,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -282,7 +282,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 -@@ -434,7 +434,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -424,7 +424,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) { -@@ -471,7 +471,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -461,7 +461,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 55ec485ae8ec..52a6fced51be 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,4 +1,4 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-03-16 18:39:50 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-07-07 21:58:15 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -97,8 +97,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -333,8 +334,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -339,8 +340,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -349,6 +352,7 @@ void LoadArmGpuLibraries() { +@@ -355,6 +358,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,22 @@ } bool LoadAmdGpuLibraries() { -@@ -404,6 +408,7 @@ bool LoadLibrariesForGpu( +@@ -394,12 +398,14 @@ void LoadV4L2Libraries( + } + + void LoadChromecastV4L2Libraries() { ++#if !defined(OS_BSD) + for (const char* path : kWhitelistedChromecastPaths) { + const std::string library_path(std::string(path) + + std::string("libvpcodec.so")); + if (dlopen(library_path.c_str(), dlopen_flag)) + break; + } ++#endif + } + + bool LoadLibrariesForGpu( +@@ -421,6 +427,7 @@ bool LoadLibrariesForGpu( return true; } @@ -38,7 +53,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -425,13 +430,17 @@ bool BrokerProcessPreSandboxHook( +@@ -442,13 +449,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } 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 12681a7c6faa..c0daa3c2f628 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 2020-05-13 18:40:32 UTC +--- content/public/app/content_main_delegate.cc.orig 2020-07-07 21:58:15 UTC +++ content/public/app/content_main_delegate.cc -@@ -27,13 +27,13 @@ int ContentMainDelegate::RunProcess( +@@ -24,13 +24,13 @@ int ContentMainDelegate::RunProcess( return -1; } diff --git a/www/chromium/files/patch-content_public_common_BUILD.gn b/www/chromium/files/patch-content_public_common_BUILD.gn index 20976e3b5b5b..5ec304a9b7d1 100644 --- a/www/chromium/files/patch-content_public_common_BUILD.gn +++ b/www/chromium/files/patch-content_public_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/public/common/BUILD.gn.orig 2020-05-19 08:31:27 UTC +--- content/public/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ content/public/common/BUILD.gn -@@ -254,7 +254,7 @@ jumbo_source_set("common_sources") { +@@ -255,7 +255,7 @@ jumbo_source_set("common_sources") { deps += [ "//content/public/android:jni" ] } 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 d58b41972528..bd87d06db5b6 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-05-13 18:40:32 UTC +--- content/public/common/common_param_traits_macros.h.orig 2020-07-07 21:58:15 UTC +++ content/public/common/common_param_traits_macros.h -@@ -312,7 +312,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -318,7 +318,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 aa93dd0dd814..d0a541e86aeb 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-06-03 18:40:24 UTC +--- content/public/common/content_features.cc.orig 2020-07-07 21:58:15 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 -@@ -711,7 +711,7 @@ const base::Feature kWebAssemblyThreads { +@@ -730,7 +730,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}; -@@ -741,7 +741,7 @@ const base::Feature kWebAuth{"WebAuthentication", +@@ -760,7 +760,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 e791fd32cebb..2717008affee 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-05-13 18:40:32 UTC +--- content/public/common/content_switches.cc.orig 2020-07-07 21:58:15 UTC +++ content/public/common/content_switches.cc -@@ -1003,7 +1003,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -1032,7 +1032,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 5206b024e54f..13f119841dcf 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-05-13 18:40:32 UTC +--- content/public/common/content_switches.h.orig 2020-07-07 21:58:15 UTC +++ content/public/common/content_switches.h -@@ -280,7 +280,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -284,7 +284,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 78ee754a2085..42e45dc869e8 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,6 @@ ---- content/public/test/browser_test_base.cc.orig 2020-05-13 18:40:32 UTC +--- content/public/test/browser_test_base.cc.orig 2020-07-07 21:58:15 UTC +++ content/public/test/browser_test_base.cc -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck #endif -@@ -99,6 +99,10 @@ +@@ -100,6 +100,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif @@ -20,7 +20,7 @@ #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif -@@ -185,7 +189,7 @@ BrowserTestBase::BrowserTestBase() +@@ -186,7 +190,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; diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn index 7872976772af..c0d1e3c03069 100644 --- a/www/chromium/files/patch-content_renderer_BUILD.gn +++ b/www/chromium/files/patch-content_renderer_BUILD.gn @@ -1,6 +1,6 @@ ---- content/renderer/BUILD.gn.orig 2020-05-19 08:32:02 UTC +--- content/renderer/BUILD.gn.orig 2020-07-07 21:58:15 UTC +++ content/renderer/BUILD.gn -@@ -463,10 +463,11 @@ target(link_target_type, "renderer") { +@@ -454,10 +454,11 @@ target(link_target_type, "renderer") { } if (is_linux) { diff --git a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc index 8df687e61704..34d33fece481 100644 --- a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc +++ b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/audio/audio_device_factory.cc.orig 2020-05-13 18:40:32 UTC +--- content/renderer/media/audio/audio_device_factory.cc.orig 2020-07-07 21:58:15 UTC +++ content/renderer/media/audio/audio_device_factory.cc -@@ -36,7 +36,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul +@@ -37,7 +37,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul namespace { #if defined(OS_WIN) || defined(OS_MACOSX) || \ 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 e71a59eb44df..571543b9e088 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 2020-05-13 18:40:32 UTC +--- content/renderer/render_process_impl.cc.orig 2020-07-07 21:57:37 UTC +++ content/renderer/render_process_impl.cc @@ -44,7 +44,7 @@ #if defined(OS_WIN) @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -162,7 +162,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 a535ade11d96..aed580dbffd6 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,28 +1,15 @@ ---- content/renderer/render_thread_impl.cc.orig 2020-05-13 18:40:32 UTC +--- content/renderer/render_thread_impl.cc.orig 2020-07-07 21:58:16 UTC +++ content/renderer/render_thread_impl.cc -@@ -176,12 +176,21 @@ - #include "mojo/public/cpp/bindings/message_dumper.h" - #endif +@@ -177,7 +177,7 @@ -+#if !defined(OS_BSD) #if defined(OS_MACOSX) #include <malloc/malloc.h> - #else +-#else ++#elif !defined(OS_BSD) #include <malloc.h> #endif -+#endif -+#if defined(OS_BSD) -+#include <stddef.h> -+#include <stdint.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#endif -+ - using base::ThreadRestrictions; - using blink::WebDocument; - using blink::WebFrame; -@@ -738,7 +747,7 @@ void RenderThreadImpl::Init() { +@@ -744,7 +744,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,7 +18,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -761,7 +770,7 @@ void RenderThreadImpl::Init() { +@@ -767,7 +767,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -40,7 +27,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1147,7 +1156,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1151,7 +1151,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 716ffe45a392..c9c79f4f1826 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-16 18:40:32 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-07-07 21:58:16 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -98,7 +98,7 @@ +@@ -97,7 +97,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 -@@ -173,7 +173,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -172,7 +172,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()); -@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -265,7 +265,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -264,7 +264,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); -@@ -278,7 +278,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -277,7 +277,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 9e5b6bdb5be3..6b4a3928ef91 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,7 +1,7 @@ ---- content/shell/BUILD.gn.orig 2020-05-13 18:40:32 UTC +--- content/shell/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ content/shell/BUILD.gn -@@ -90,7 +90,7 @@ static_library("content_shell_app") { - "//content/public/app:both", +@@ -227,7 +227,7 @@ static_library("content_shell_app") { + "//content/public/app", "//v8", ] - if (!is_fuchsia) { @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/app:test_support", -@@ -366,6 +366,13 @@ static_library("content_shell_lib") { +@@ -495,6 +495,13 @@ static_library("content_shell_lib") { ] deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] } @@ -21,9 +21,9 @@ + ] + } - # Annoyingly, this target and web_test_support have circular includes. - allow_circular_includes_from = [ "//content/test:web_test_support" ] -@@ -948,7 +955,7 @@ group("content_shell_crash_test") { + if (enable_plugins) { + deps += [ +@@ -1070,7 +1077,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_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 29998c1f9152..5d67147c3284 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2020-05-13 18:40:32 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2020-07-07 21:58:16 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,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 #if defined(OS_CHROMEOS) -@@ -122,7 +122,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { +@@ -132,7 +132,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #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 09235357330e..9b97dcc3d655 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,6 +1,6 @@ ---- 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.orig 2020-07-07 21:58:16 UTC +++ content/shell/browser/web_test/web_test_browser_context.cc -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc index 7aa29e2df609..4d55f97a6b88 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC +--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2020-07-07 21:57:37 UTC +++ content/shell/browser/web_test/web_test_browser_main_parts.cc -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc new file mode 100644 index 000000000000..fded6524feb6 --- /dev/null +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc @@ -0,0 +1,11 @@ +--- content/shell/browser/web_test/web_test_browser_main_runner.cc.orig 2020-07-13 09:42:59 UTC ++++ content/shell/browser/web_test/web_test_browser_main_runner.cc +@@ -205,7 +205,7 @@ void WebTestBrowserMainRunner::Initialize() { + command_line.AppendSwitch( + switches::kDisableGpuProcessForDX12VulkanInfoCollection); + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + content::WebTestBrowserPlatformInitialize(); + #endif + diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc index a62ed57b34b6..3e2eefb3df6d 100644 --- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc @@ -1,15 +1,15 @@ ---- content/shell/test_runner/test_runner.cc.orig 2020-05-13 18:40:32 UTC -+++ content/shell/test_runner/test_runner.cc -@@ -62,7 +62,7 @@ - #include "ui/gfx/geometry/size.h" +--- content/shell/renderer/web_test/test_runner.cc.orig 2020-07-07 21:58:16 UTC ++++ content/shell/renderer/web_test/test_runner.cc +@@ -73,7 +73,7 @@ #include "ui/gfx/skia_util.h" + #include "ui/gfx/test/icc_profiles.h" -#if defined(OS_LINUX) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1532,7 +1532,7 @@ void TestRunner::Reset() { +@@ -1842,7 +1842,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); @@ -17,8 +17,8 @@ +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif - -@@ -2112,7 +2112,7 @@ void TestRunner::AddOriginAccessAllowListEntry( + blink::ResetDomainRelaxationForTest(); +@@ -2426,7 +2426,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 6c2671632c68..4c053ec97b0a 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2020-05-19 08:32:40 UTC +--- content/test/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ content/test/BUILD.gn -@@ -1337,15 +1337,22 @@ test("content_browsertests") { +@@ -1330,15 +1330,22 @@ test("content_browsertests") { } if (is_linux) { diff --git a/www/chromium/files/patch-content_test_content__test__suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc index de8be8785a7f..b70aa3d92b44 100644 --- a/www/chromium/files/patch-content_test_content__test__suite.cc +++ b/www/chromium/files/patch-content_test_content__test__suite.cc @@ -1,6 +1,6 @@ ---- content/test/content_test_suite.cc.orig 2019-12-16 21:50:48 UTC +--- content/test/content_test_suite.cc.orig 2020-07-07 21:57:37 UTC +++ content/test/content_test_suite.cc -@@ -84,6 +84,7 @@ void ContentTestSuite::Initialize() { +@@ -83,6 +83,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess); @@ -8,7 +8,7 @@ if (!is_child_process) { gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff(); auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo(); -@@ -91,6 +92,7 @@ void ContentTestSuite::Initialize() { +@@ -90,6 +91,7 @@ void ContentTestSuite::Initialize() { gpu_feature_info->disabled_extensions); gl::init::InitializeExtensionSettingsOneOffPlatform(); } diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index 2bd5d6e7dc76..af5f3ef3326b 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,4 +1,4 @@ ---- content/utility/BUILD.gn.orig 2020-05-13 18:40:32 UTC +--- content/utility/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ content/utility/BUILD.gn @@ -82,7 +82,7 @@ jumbo_source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] @@ -6,6 +6,6 @@ - if (is_linux) { + if (is_linux && !is_bsd) { - deps += [ "//content/utility/soda:soda_sandbox_hook" ] + deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ] } diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 697ace21a29a..1d023f8ef171 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-10-21 19:06:34 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2020-07-07 21:57:38 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -27,7 +27,11 @@ +@@ -28,7 +28,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc index aebaba727ff9..b91676441b5d 100644 --- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc +++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2020-07-07 21:57:38 UTC +++ extensions/browser/api/web_request/form_data_parser.cc -@@ -15,7 +15,11 @@ +@@ -16,7 +16,11 @@ #include "base/values.h" #include "net/base/escape.h" #include "net/http/http_request_headers.h" diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index d640fe45fcf4..13fef4dc69a1 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,9 +1,9 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:46 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-07-07 21:57:38 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -71,7 +71,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - HidDeviceManager::GetFactoryInstance(); - IdleManagerFactory::GetInstance(); - ManagementAPI::GetFactoryInstance(); +@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + #if defined(OS_CHROMEOS) + NetworkingConfigServiceFactory::GetInstance(); + #endif -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); 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 28c322e87eba..6f4c1ea4a82e 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-05-18 18:40:23 UTC +--- extensions/common/api/_permission_features.json.orig 2020-07-07 21:58:16 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -481,7 +481,7 @@ +@@ -483,7 +483,7 @@ "platform_app", "login_screen_extension" ], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -520,7 +520,7 @@ +@@ -522,7 +522,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index 7048ea59ebd3..99ed2a04e619 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,6 +1,6 @@ ---- extensions/common/image_util.cc.orig 2020-02-03 21:52:47 UTC +--- extensions/common/image_util.cc.orig 2020-07-07 21:57:38 UTC +++ extensions/common/image_util.cc -@@ -18,7 +18,11 @@ +@@ -20,7 +20,11 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/timer/elapsed_timer.h" diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index e5e060248182..14d315831491 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2020-07-07 21:57:38 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -129,6 +129,8 @@ std::string GetPlatformString() { +@@ -130,6 +130,8 @@ std::string GetPlatformString() { return "mac"; #elif defined(OS_WIN) return "win"; 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 4f5857ab6651..fd129c7331df 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-05-13 18:40:32 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-07-07 21:57:38 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -54,7 +54,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf +@@ -55,7 +55,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MACOSX) return macos_specific_texture_target; @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif defined(OS_WIN) || defined(OS_FUCHSIA) return GL_TEXTURE_2D; -@@ -84,7 +84,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer +@@ -85,7 +85,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( gfx::BufferFormat format) { 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 0d0324bb5b46..2d079b4a4239 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,24 +1,15 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-05-13 18:40:32 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc @@ -29,7 +29,7 @@ - #include "ui/gl/buildflags.h" - #include "ui/gl/gl_context.h" + #include "ui/gl/gl_version_info.h" + #include "ui/gl/scoped_binders.h" -#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) +#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -37,7 +37,7 @@ - #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" - #endif - --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) - #define GL_DEDICATED_MEMORY_OBJECT_EXT 0x9581 - #define GL_TEXTURE_TILING_EXT 0x9580 - #define GL_TILING_TYPES_EXT 0x9583 -@@ -510,7 +510,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -503,7 +503,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -27,7 +18,7 @@ auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -529,14 +529,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -522,7 +522,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -36,47 +27,12 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif - } - - GLuint ExternalVkImageBacking::ProduceGLTextureInternal() { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_WIN) - GrVkImageInfo image_info; - bool result = backend_texture_.getVkImageInfo(&image_info); -@@ -545,7 +545,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -535,7 +535,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; - GLuint memory_object = 0; + base::Optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) auto memory_fd = image_->GetMemoryFd(); - if (!memory_fd.is_valid()) { + if (!memory_fd.is_valid()) return 0; -@@ -608,7 +608,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna - } - api->glBindTextureFn(GL_TEXTURE_2D, old_texture_binding); - return texture_service_id; --#else // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) -+#else // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - #error Unsupported OS - #endif - } -@@ -622,7 +622,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa - return nullptr; - } - --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_WIN) - if (!texture_) { - GLuint texture_service_id = ProduceGLTextureInternal(); -@@ -666,7 +666,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( - return nullptr; - } - --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_WIN) - if (!texture_passthrough_) { - GLuint texture_service_id = ProduceGLTextureInternal(); 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 98f0ab0fa3fe..321531baa60d 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,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-05-13 18:40:32 UTC +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/command_buffer/service/external_vk_image_gl_representation.cc -@@ -188,7 +188,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk +@@ -178,7 +178,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk SemaphoreHandle handle) { if (!handle.is_valid()) return 0; diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc new file mode 100644 index 000000000000..e085b3ab87e9 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/tests/webgpu_test.cc.orig 2020-07-13 09:46:01 UTC ++++ gpu/command_buffer/tests/webgpu_test.cc +@@ -51,7 +51,7 @@ bool WebGPUTest::WebGPUSupported() const { + + bool WebGPUTest::WebGPUSharedImageSupported() const { + // Currently WebGPUSharedImage is only implemented on Mac, Linux and Windows +-#if (defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)) && \ ++#if (defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) && \ + BUILDFLAG(USE_DAWN) + return true; + #else +@@ -62,7 +62,7 @@ bool WebGPUTest::WebGPUSharedImageSupported() const { + void WebGPUTest::SetUp() { + gpu::GpuPreferences gpu_preferences; + gpu_preferences.enable_webgpu = true; +-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) + gpu_preferences.use_vulkan = gpu::VulkanImplementationName::kNative; + gpu_preferences.gr_context_type = gpu::GrContextType::kVulkan; + #elif defined(OS_WIN) 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 5e9abb45b5fb..2001389bf837 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-05-13 18:40:32 UTC +--- gpu/config/gpu_control_list.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -221,7 +225,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -247,7 +251,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -789,7 +793,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -748,7 +752,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; 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 d06bde69aa2d..f72aa998482e 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 2020-03-16 18:40:32 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -14,7 +14,7 @@ +@@ -15,7 +15,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 -@@ -24,7 +24,7 @@ +@@ -25,7 +25,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 -@@ -42,7 +42,7 @@ namespace gpu { +@@ -43,7 +43,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 -@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -57,7 +57,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; @@ -36,7 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -181,7 +181,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -182,7 +182,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 fe83facc0c4c..f33260dc9b3e 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2020-05-13 18:40:32 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/ipc/service/gpu_init.cc @@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif @@ -18,16 +18,16 @@ class GpuWatchdogInit { public: -@@ -161,7 +161,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - gpu_info_.subpixel_font_rendering = true; - #endif +@@ -160,7 +160,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + device_perf_info_ = device_perf_info; + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -213,7 +213,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -212,7 +212,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL delayed_watchdog_enable = true; #endif @@ -36,7 +36,7 @@ // 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. -@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -257,7 +257,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -45,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. -@@ -267,7 +267,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -54,7 +54,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -291,14 +291,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -289,14 +289,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && use_swiftshader && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -71,7 +71,7 @@ } if (!gl_initialized) { -@@ -324,7 +324,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -322,7 +322,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -80,7 +80,7 @@ // 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 -@@ -375,7 +375,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (use_swiftshader) { @@ -89,7 +89,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -98,7 +98,7 @@ } } else { // use_swiftshader == true switch (gpu_preferences_.use_vulkan) { -@@ -445,7 +445,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -443,7 +443,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -107,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. -@@ -464,7 +464,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -462,7 +462,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -116,7 +116,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -631,7 +631,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -125,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. -@@ -651,7 +651,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -648,7 +648,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } 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 7351a28516f2..efcc11f3008d 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-05-13 18:40:32 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-07-07 21:58:16 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -216,7 +216,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 base::ThreadTicks GetWatchedThreadTime(); #endif @@ -9,7 +9,7 @@ void UpdateActiveTTY(); #endif -@@ -271,7 +271,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -274,7 +274,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded. bool is_watchdog_start_histogram_recorded = false; 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 8307d489546e..e9e398152dbe 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 2020-05-13 18:40:32 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -828,7 +828,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -862,7 +862,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_ANDROID) @@ -9,24 +9,30 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -847,9 +847,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -881,7 +881,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #if defined(OS_WIN) + if (gfx::HasExtension(enabled_extensions, +@@ -906,7 +906,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + } + #endif // defined(OS_WIN) + -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -869,7 +869,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(OS_FUCHSIA) + #if defined(OS_WIN) if (gfx::HasExtension(enabled_extensions, 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 4210be5d6669..22094637bcf5 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 2020-05-13 18:40:32 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-07-07 21:58:16 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -227,15 +227,15 @@ struct VulkanFunctionPointers { +@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROIDFn; #endif // defined(OS_ANDROID) @@ -11,6 +11,12 @@ -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #if defined(OS_WIN) + VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> +@@ -247,10 +247,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + vkImportSemaphoreWin32HandleKHRFn; + #endif // defined(OS_WIN) + -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHRFn; @@ -18,34 +24,47 @@ -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - VulkanFunction<PFN_vkImportSemaphoreZirconHandleFUCHSIA> -@@ -447,18 +447,18 @@ struct VulkanFunctionPointers { - ->vkGetAndroidHardwareBufferPropertiesANDROIDFn + #if defined(OS_WIN) + VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHRFn; +@@ -950,7 +950,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope + } #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #define vkGetSemaphoreFdKHR \ - gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn - #define vkImportSemaphoreFdKHR \ - gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn + ALWAYS_INLINE VkResult + vkGetSemaphoreFdKHR(VkDevice device, + const VkSemaphoreGetFdInfoKHR* pGetFdInfo, +@@ -964,7 +964,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( + return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn( + device, pImportSemaphoreFdInfo); + } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #if defined(OS_WIN) + ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( +@@ -983,7 +983,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, + } + #endif // defined(OS_WIN) + -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn - #define vkGetMemoryFdPropertiesKHR \ - gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn + ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, + const VkMemoryGetFdInfoKHR* pGetFdInfo, + int* pFd) { +@@ -998,7 +998,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, + return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn( + device, handleType, fd, pMemoryFdProperties); + } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - #define vkImportSemaphoreZirconHandleFUCHSIA \ -@@ -493,4 +493,4 @@ struct VulkanFunctionPointers { - gpu::GetVulkanFunctionPointers()->vkGetSwapchainImagesKHRFn - #define vkQueuePresentKHR gpu::GetVulkanFunctionPointers()->vkQueuePresentKHRFn + #if defined(OS_WIN) + ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( +@@ -1079,4 +1079,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue + pPresentInfo); + } -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ \ No newline at end of file diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index fa47a25a5bf7..3cf1b71d4df7 100644 --- a/www/chromium/files/patch-headless_BUILD.gn +++ b/www/chromium/files/patch-headless_BUILD.gn @@ -1,6 +1,6 @@ ---- headless/BUILD.gn.orig 2020-05-18 11:07:20 UTC +--- headless/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ headless/BUILD.gn -@@ -267,7 +267,7 @@ jumbo_source_set("headless_shared_sources") { +@@ -264,7 +264,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api sources += get_target_outputs(":protocol_sources") @@ -9,7 +9,7 @@ sources += [ "lib/headless_crash_reporter_client.cc", "lib/headless_crash_reporter_client.h", -@@ -286,7 +286,7 @@ jumbo_source_set("headless_shared_sources") { +@@ -284,7 +284,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -442,7 +442,7 @@ jumbo_component("headless_non_renderer") { +@@ -435,7 +435,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,25 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -589,7 +589,7 @@ test("headless_unittests") { - "//testing/gtest", - ] - -- if (!is_fuchsia) { -+ if (!is_fuchsia && !is_bsd) { - deps += [ "//components/crash/content/browser" ] - } - -@@ -673,7 +673,7 @@ test("headless_browsertests") { - "//ui/base/clipboard", - ] - -- if (!is_fuchsia) { -+ if (!is_fuchsia && !is_bsd) { - deps += [ "//components/crash/content/browser" ] - } - -@@ -801,7 +801,7 @@ jumbo_static_library("headless_shell_lib") { +@@ -710,7 +710,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } 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 86931c284dea..1c789d6aabed 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-16 18:39:51 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-07-07 21:57:38 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -157,7 +157,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -158,7 +158,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, -@@ -168,7 +168,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -169,7 +169,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } @@ -18,7 +18,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, -@@ -231,7 +231,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL +@@ -241,7 +241,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 807983d43e60..5c79311cf636 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,4 +1,4 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2020-05-13 18:40:32 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2020-07-07 21:58:16 UTC +++ headless/lib/browser/headless_request_context_manager.cc @@ -27,7 +27,7 @@ namespace headless { @@ -6,7 +6,7 @@ -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - static char kProductName[] = "HeadlessChrome"; + constexpr char kProductName[] = "HeadlessChrome"; #endif @@ -57,7 +57,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic @@ -18,7 +18,7 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -205,7 +205,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM +@@ -215,7 +215,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( base::ThreadTaskRunnerHandle::Get()); } 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 a084e43deae5..8b7349c15ece 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-05-13 18:40:32 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2020-07-07 21:58:16 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -322,7 +322,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -317,7 +317,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; @@ -9,7 +9,7 @@ // TODO(fuchsia): Implement this when crash reporting/Breakpad are available // in Fuchsia. (crbug.com/753619) NOTIMPLEMENTED(); -@@ -351,7 +351,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -346,7 +346,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( crash_reporter::InitializeCrashpadWithEmbeddedHandler( process_type.empty(), process_type, "", base::FilePath()); #endif // defined(HEADLESS_USE_BREAKPAD) @@ -18,16 +18,16 @@ } -@@ -405,7 +405,7 @@ int HeadlessContentMainDelegate::RunProcess( +@@ -398,7 +398,7 @@ int HeadlessContentMainDelegate::RunProcess( + return 0; } - #endif // !defined(CHROME_MULTIPLE_DLL_CHILD) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -440,7 +440,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { +@@ -433,7 +433,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 ea587103f60e..cd90ab68eb3d 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 2020-03-16 18:39:51 UTC +--- headless/lib/headless_content_main_delegate.h.orig 2020-07-07 21:57:38 UTC +++ headless/lib/headless_content_main_delegate.h -@@ -60,7 +60,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate +@@ -57,7 +57,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate HeadlessBrowserImpl* browser() const { return browser_.get(); } diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 344755d951da..f9064df21a72 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 2020-05-13 18:40:32 UTC +--- media/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ media/BUILD.gn -@@ -65,6 +65,9 @@ config("media_config") { +@@ -64,6 +64,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index f96c5ac063c2..59aaa7fab815 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2019-03-17 21:43:40 UTC +--- media/audio/audio_input_device.cc.orig 2020-07-07 21:58:16 UTC +++ media/audio/audio_input_device.cc -@@ -248,7 +248,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -247,7 +247,7 @@ void AudioInputDevice::OnStreamCreated( // also a risk of false positives if we are suspending when starting the stream // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 41c7e0da8d45..d04079357bca 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2020-05-13 18:40:32 UTC +--- media/base/media_switches.cc.orig 2020-07-07 21:58:16 UTC +++ media/base/media_switches.cc -@@ -346,7 +346,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -343,7 +343,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode const base::Feature kGlobalMediaControls { "GlobalMediaControls", #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -368,7 +368,7 @@ const base::Feature kGlobalMediaControlsOverlayControl + const base::Feature kGlobalMediaControlsPictureInPicture{ + "GlobalMediaControlsPictureInPicture", + #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 dc6f83903ec6..4606b563e730 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2020-05-13 18:40:32 UTC +--- media/base/video_frame.h.orig 2020-07-07 21:58:16 UTC +++ media/base/video_frame.h -@@ -39,9 +39,9 @@ +@@ -40,9 +40,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MACOSX) @@ -12,7 +12,7 @@ namespace gfx { class GpuMemoryBuffer; -@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -81,7 +81,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. @@ -21,7 +21,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -244,7 +244,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); @@ -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 +@@ -485,7 +485,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; @@ -39,7 +39,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -654,7 +654,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc b/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc deleted file mode 100644 index 1dcee4bc61f2..000000000000 --- a/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- media/blink/webmediaplayer_impl.cc.orig 2020-05-22 09:58:28 UTC -+++ media/blink/webmediaplayer_impl.cc -@@ -280,7 +280,11 @@ void CreateAllocation(base::trace_event::ProcessMemory - - auto* std_allocator = base::trace_event::MemoryDumpManager::GetInstance() - ->system_allocator_pool_name(); -- pmd->AddSuballocation(dump->guid(), std_allocator); -+ if (std_allocator == nullptr) { -+ pmd->AddSuballocation(dump->guid(), std::string()); -+ } else { -+ pmd->AddSuballocation(dump->guid(), std_allocator); -+ } - } - - } // namespace diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index f2783c3581d2..a8d84a5ba3eb 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-16 18:40:33 UTC +--- media/media_options.gni.orig 2020-07-07 21:58:16 UTC +++ media/media_options.gni -@@ -119,6 +119,9 @@ declare_args() { +@@ -120,6 +120,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false 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 cdd5cc2b0933..17e409cbac8e 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,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-05-13 18:40:32 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-07-07 21:58:16 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -20,9 +20,9 @@ +@@ -21,9 +21,9 @@ #include "ui/gfx/mojom/buffer_types_mojom_traits.h" #include "ui/gfx/mojom/color_space_mojom_traits.h" @@ -12,7 +12,7 @@ namespace mojo { -@@ -62,7 +62,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +@@ -63,7 +63,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( std::move(offsets))); } @@ -21,7 +21,7 @@ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { std::vector<mojo::PlatformHandle> dmabuf_fds; -@@ -165,7 +165,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -166,7 +166,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, shared_buffer_data.TakeFrameData(), shared_buffer_data.frame_data_size(), std::move(offsets), std::move(strides), timestamp); 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 dc7f9d176260..160cd4d2cfc2 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-05-13 18:40:32 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-07-07 21:58:16 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -62,7 +62,7 @@ namespace media { +@@ -63,7 +63,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, -@@ -279,7 +279,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea +@@ -280,7 +280,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea command_buffer_id->route_id)); } diff --git a/www/chromium/files/patch-media_webrtc_webrtc__switches.cc b/www/chromium/files/patch-media_webrtc_webrtc__switches.cc deleted file mode 100644 index 68078dc67afd..000000000000 --- a/www/chromium/files/patch-media_webrtc_webrtc__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/webrtc/webrtc_switches.cc.orig 2020-02-03 21:52:48 UTC -+++ media/webrtc/webrtc_switches.cc -@@ -50,7 +50,7 @@ namespace media { - - bool IsWebRtcApmInAudioServiceEnabled() { - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService) && - !base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kForceDisableWebRtcApmInAudioService); 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 b0970950923b..4af98b7fc4b7 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,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2020-03-16 18:39:53 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2020-07-07 21:58:16 UTC +++ mojo/public/js/mojo_bindings_resources.grd @@ -70,7 +70,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> +- <if expr="is_win or is_macosx or is_linux or is_android"> ++ <if expr="is_win or is_macosx or is_posix or is_android"> <include name="IDR_MOJO_TIME_MOJOM_HTML" file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.html" use_base_dir="false" diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index c5d655bc2cef..0793a036c42e 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-05-13 18:40:32 UTC +--- net/BUILD.gn.orig 2020-07-07 21:58:16 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" ] } -@@ -1254,6 +1254,16 @@ component("net") { +@@ -1251,6 +1251,16 @@ component("net") { ] } @@ -26,7 +26,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1384,7 +1394,7 @@ component("net") { +@@ -1381,7 +1391,7 @@ component("net") { } } @@ -35,7 +35,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1417,7 +1427,7 @@ component("net") { +@@ -1414,7 +1424,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 deleted file mode 100644 index c3c6ce4fee5c..000000000000 --- a/www/chromium/files/patch-net_base_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/base/features.cc.orig 2020-05-13 18:40:32 UTC -+++ net/base/features.cc -@@ -92,7 +92,7 @@ const base::Feature kBlockExternalRequestsFromNonSecur - #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_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc new file mode 100644 index 000000000000..896ab86ea90b --- /dev/null +++ b/www/chromium/files/patch-net_cert_cert__verifier.cc @@ -0,0 +1,11 @@ +--- net/cert/cert_verifier.cc.orig 2020-07-13 09:51:56 UTC ++++ net/cert/cert_verifier.cc +@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa + return std::unique_ptr<CertVerifier>(); + #else + scoped_refptr<CertVerifyProc> verify_proc; +-#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + verify_proc = + CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); + #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc new file mode 100644 index 000000000000..6c82b8ad6a5a --- /dev/null +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -0,0 +1,11 @@ +--- net/cert/cert_verify_proc.cc.orig 2020-07-07 21:58:16 UTC ++++ net/cert/cert_verify_proc.cc +@@ -494,7 +494,7 @@ base::Value CertVerifyParams(X509Certificate* cert, + + } // namespace + +-#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) + // static + scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc( + scoped_refptr<CertNetFetcher> cert_net_fetcher) { diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h new file mode 100644 index 000000000000..06f2a3cc65a3 --- /dev/null +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -0,0 +1,11 @@ +--- net/cert/cert_verify_proc.h.orig 2020-07-13 09:52:59 UTC ++++ net/cert/cert_verify_proc.h +@@ -66,7 +66,7 @@ class NET_EXPORT CertVerifyProc + kMaxValue = kChainLengthOne + }; + +-#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) + // Creates and returns a CertVerifyProc that uses the system verifier. + // |cert_net_fetcher| may not be used, depending on the implementation. + static scoped_refptr<CertVerifyProc> CreateSystemVerifyProc( 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 8abba04b185d..7a7f92cb82a1 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 2020-06-03 18:40:27 UTC +--- net/nqe/network_quality_estimator.cc.orig 2020-07-07 21:57:40 UTC +++ net/nqe/network_quality_estimator.cc -@@ -104,7 +104,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( +@@ -105,7 +105,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc index 5babc0608b02..ed8fc03ddcf0 100644 --- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-05-15 15:16:32 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-07-07 21:58:16 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc @@ -47,7 +47,7 @@ #elif defined(OS_MACOSX) @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1435,7 +1435,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -1438,7 +1438,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc index 9f9ad02d0d9c..24b9cfee354e 100644 --- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/unix_domain_client_socket_posix.cc.orig 2019-06-07 19:59:03 UTC +--- net/socket/unix_domain_client_socket_posix.cc.orig 2020-07-07 21:57:40 UTC +++ net/socket/unix_domain_client_socket_posix.cc -@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st +@@ -57,7 +57,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st return true; } 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 3e87bd2fcfd9..1e987d9088ec 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 2020-03-16 18:39:54 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2020-07-07 21:57:40 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 -@@ -51,7 +51,7 @@ void SetUpOnNetworkThread( +@@ -46,7 +46,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,3 +18,12 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // +@@ -192,7 +192,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr + base::StringPiece impl_name, + scoped_refptr<net::CertNetFetcher> cert_net_fetcher, + bool use_system_roots) { +-#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) + if (impl_name == "platform") { + if (!use_system_roots) { + std::cerr << "WARNING: platform verifier not supported with " diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc index 36e2fa9c37e2..8af45ede1fe2 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.cc +++ b/www/chromium/files/patch-net_url__request_url__fetcher.cc @@ -1,8 +1,8 @@ ---- net/url_request/url_fetcher.cc.orig 2019-10-30 16:19:14 UTC +--- net/url_request/url_fetcher.cc.orig 2020-07-07 21:57:40 UTC +++ net/url_request/url_fetcher.cc -@@ -11,7 +11,7 @@ namespace net { - - URLFetcher::~URLFetcher() = default; +@@ -21,7 +21,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign + URLFetcherImpl::SetIgnoreCertificateRequests(ignored); + } -#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) +#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h index 41aa176d8ffe..07e0026df1a8 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.h +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -1,6 +1,6 @@ ---- net/url_request/url_fetcher.h.orig 2020-05-13 18:40:33 UTC +--- net/url_request/url_fetcher.h.orig 2020-07-07 21:57:40 UTC +++ net/url_request/url_fetcher.h -@@ -114,7 +114,7 @@ class NET_EXPORT URLFetcher { +@@ -355,7 +355,7 @@ class NET_EXPORT URLFetcher { // The unannotated Create() methods are not available on desktop Linux + // Windows. They are available on other platforms, since we only audit network // annotations on Linux & Windows. 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 fd2e091f9f61..43cbe2a0589b 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-16 18:39:54 UTC +--- net/url_request/url_request_context.cc.orig 2020-07-07 21:57:40 UTC +++ net/url_request/url_request_context.cc -@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext:: +@@ -90,7 +90,7 @@ const HttpNetworkSession::Context* URLRequestContext:: return &network_session->context(); } 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 6d7cdded4fdf..f69727d63b47 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-05-13 18:40:33 UTC +--- net/url_request/url_request_context_builder.cc.orig 2020-07-07 21:58:16 UTC +++ net/url_request/url_request_context_builder.cc -@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -486,7 +486,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -495,7 +495,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ConfiguredProxyResolutionService::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 3cb711ca1ddb..a3e9a92305b1 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2020-05-13 18:40:33 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2020-07-07 21:58:16 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -52,7 +52,7 @@ +@@ -57,7 +57,7 @@ #include "ui/gfx/geometry/rect.h" #include "v8/include/v8.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -361,7 +361,7 @@ void InitializeSDK(bool enable_v8) { +@@ -381,7 +381,7 @@ void InitializeSDK(bool enable_v8) { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -402,7 +402,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -422,7 +422,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -27,7 +27,7 @@ // PreviewModeClient does not know its pp::Instance. SetLastInstance(client_->GetPluginInstance()); #endif -@@ -864,7 +864,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -896,7 +896,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2853,7 +2853,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2919,7 +2919,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 -@@ -3349,7 +3349,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3415,7 +3415,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 bd63ba366842..cbec18fa6c1d 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2020-03-16 18:39:54 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2020-07-07 21:57:40 UTC +++ ppapi/proxy/file_io_resource.cc @@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, @@ -24,7 +24,7 @@ } if (increase > 0) { -@@ -318,7 +320,7 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -315,7 +317,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); -@@ -594,9 +596,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( +@@ -590,9 +592,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index 72f86cb90395..cd189d01ec16 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_main.cc.orig 2019-10-30 16:20:58 UTC +--- remoting/host/host_main.cc.orig 2020-07-07 21:57:41 UTC +++ remoting/host/host_main.cc -@@ -49,9 +49,9 @@ int DesktopProcessMain(); +@@ -48,9 +48,9 @@ int DesktopProcessMain(); int FileChooserMain(); int RdpDesktopSessionMain(); #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ namespace { -@@ -146,10 +146,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -143,10 +143,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeRdpDesktopSession) { main_routine = &RdpDesktopSessionMain; #endif // defined(OS_WIN) 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 65db5a7293fb..881e5c7bf25e 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-05-13 18:40:33 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2020-07-07 21:58:16 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 -@@ -357,7 +357,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -39,20 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -579,10 +579,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm - enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); - if (enable_window_capture_) { - --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - LOG(WARNING) << "Window capturing is not fully supported on Linux or " - "Windows."; --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - - // uint32_t is large enough to hold window IDs on all platforms. - uint32_t window_id; -@@ -777,7 +777,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -749,7 +749,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 +48,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -863,7 +863,7 @@ void HostProcess::StartOnUiThread() { +@@ -835,7 +835,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +57,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()-> -@@ -872,7 +872,7 @@ void HostProcess::StartOnUiThread() { +@@ -844,7 +844,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +66,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -927,7 +927,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -893,7 +893,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +75,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. -@@ -1526,7 +1526,7 @@ void HostProcess::StartHost() { +@@ -1486,7 +1486,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +84,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1695,7 +1695,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1656,7 +1656,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_test_it2me__standalone__host.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc new file mode 100644 index 000000000000..b02ec414092e --- /dev/null +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc @@ -0,0 +1,11 @@ +--- remoting/test/it2me_standalone_host.cc.orig 2020-07-13 09:57:40 UTC ++++ remoting/test/it2me_standalone_host.cc +@@ -49,7 +49,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() + context_->ui_task_runner()), + connection_(base::WrapUnique(new testing::NiceMock<MockSession>())), + session_jid_(kSessionJid), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // We cannot support audio capturing for linux, since a pipe name is + // needed to initialize AudioCapturerLinux. + config_(protocol::SessionConfig::ForTest()), diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc new file mode 100644 index 000000000000..07508465e607 --- /dev/null +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc @@ -0,0 +1,39 @@ +--- remoting/test/it2me_standalone_host_main.cc.orig 2020-07-13 09:56:53 UTC ++++ remoting/test/it2me_standalone_host_main.cc +@@ -9,19 +9,19 @@ + #include "remoting/proto/event.pb.h" + #include "remoting/test/it2me_standalone_host.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <gtk/gtk.h> + + #include "base/linux_util.h" + #include "ui/gfx/x/x11.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + int main(int argc, const char** argv) { + base::AtExitManager at_exit_manager; + base::CommandLine::Init(argc, argv); + remoting::test::It2MeStandaloneHost host; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Required in order for us to run multiple X11 threads. + XInitThreads(); + +@@ -34,10 +34,12 @@ int main(int argc, const char** argv) { + gtk_init(nullptr, nullptr); + #endif + ++#if !defined(OS_BSD) + // Need to prime the host OS version value for linux to prevent IO on the + // network thread. base::GetLinuxDistro() caches the result. + base::GetLinuxDistro(); +-#endif // OS_LINUX ++#endif ++#endif // OS_LINUX || OS_BSD) + remoting::LoadResources(""); + host.StartOutputTimer(); + host.Run(); 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 6046b28b1771..d31824506bd2 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-16 18:39:54 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2020-07-07 21:57:41 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> -@@ -92,7 +94,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -93,7 +95,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 32423e1a0600..83d0bd577519 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- services/audio/BUILD.gn.orig 2020-03-16 18:39:54 UTC +--- services/audio/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ services/audio/BUILD.gn -@@ -82,7 +82,7 @@ source_set("audio") { +@@ -74,7 +74,7 @@ source_set("audio") { "//services/service_manager/sandbox", ] 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 17db61b295df..949e923aae2f 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2020-02-03 21:53:32 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2020-07-07 21:57:41 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) return nullptr; #else return device::NewSystemLocationProvider(); diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index 7c3ad6a76957..c8fd1084c327 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,7 +1,7 @@ ---- services/device/usb/BUILD.gn.orig 2019-09-09 21:55:22 UTC +--- services/device/usb/BUILD.gn.orig 2020-07-07 21:57:41 UTC +++ services/device/usb/BUILD.gn -@@ -110,7 +110,7 @@ static_library("usb") { - ] +@@ -112,7 +112,7 @@ static_library("usb") { + deps += [ "//third_party/re2" ] } - if (is_android || is_chromeos || is_linux) { diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index e7682ef424cc..1bbb99196176 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-05-13 18:40:33 UTC +--- services/network/BUILD.gn.orig 2020-07-07 21:58:16 UTC +++ services/network/BUILD.gn -@@ -264,7 +264,6 @@ jumbo_component("network_service") { +@@ -261,7 +261,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 a7929f91058c..89ffe2c5fb63 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2020-05-13 18:40:33 UTC +--- services/network/network_context.cc.orig 2020-07-07 21:58:16 UTC +++ services/network/network_context.cc -@@ -1805,7 +1805,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -1756,7 +1756,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc new file mode 100644 index 000000000000..d9102ff03143 --- /dev/null +++ b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc @@ -0,0 +1,11 @@ +--- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig 2020-07-13 09:58:25 UTC ++++ services/network/public/cpp/cert_verifier/cert_verifier_creation.cc +@@ -70,7 +70,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro + + bool IsUsingCertNetFetcher() { + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_CHROMEOS) || \ +- defined(OS_LINUX) || \ ++ defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ + BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + return true; diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index b38e937afd6f..440b79e2bffa 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2020-07-07 21:58:16 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc @@ -22,8 +22,10 @@ #include "build/build_config.h" @@ -44,7 +44,7 @@ return res; } -@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -241,6 +245,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { // TODO(chiniforooshan): There is no need to read both /statm and /status // files. Refactor to get everything from /status using ProcessMetric. @@ -52,7 +52,7 @@ auto statm_file = GetProcPidDir(pid).Append("statm"); auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); -@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -255,6 +260,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, if (!success) return false; @@ -63,7 +63,7 @@ auto process_metrics = CreateProcessMetrics(pid); -@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -295,6 +304,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { @@ -74,7 +74,7 @@ std::vector<VmRegionPtr> maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -310,6 +323,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa +@@ -312,6 +325,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa return std::vector<VmRegionPtr>(); return maps; @@ -82,7 +82,7 @@ } // static -@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -319,6 +333,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector<uint8_t>* accessed_pages_bitmap) { @@ -93,7 +93,7 @@ const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -360,6 +378,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; diff --git a/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn b/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn new file mode 100644 index 000000000000..5dd58766265e --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/BUILD.gn.orig 2020-07-13 12:06:56 UTC ++++ services/tracing/public/cpp/BUILD.gn +@@ -141,7 +141,7 @@ target(tracing_lib_type, "cpp") { + ] + } + +- if (is_linux && !is_fuchsia) { ++ if (is_linux && !is_fuchsia && !is_bsd) { + deps += [ "//components/crash/core/app:app" ] + } + 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 index 61e7cb3830ad..3d1509228a5b 100644 --- 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 @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-03-17 10:13:47 UTC +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-07-07 21:57:41 UTC +++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -13,13 +13,17 @@ namespace tracing { +@@ -12,13 +12,17 @@ namespace tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. 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 index eba213a1112c..31d7a54601da 100644 --- 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 @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-05-13 18:40:33 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-07-07 21:58:16 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -476,7 +476,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall +@@ -525,7 +525,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index e41e957b73ea..e619801ca914 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,6 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2019-03-11 22:01:02 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2020-07-07 21:57:41 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -77,7 +77,7 @@ static void* malloc_nothrow(size_t size) { +@@ -78,7 +78,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; @@ -9,7 +9,7 @@ result = malloc(size); #else // It's the responsibility of the caller to check the return value. -@@ -97,7 +97,7 @@ static void* calloc_nothrow(size_t size) { +@@ -98,7 +98,7 @@ static void* calloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedCalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index c181f9dab7c6..364195df8094 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-05-13 18:41:47 UTC +--- third_party/angle/BUILD.gn.orig 2020-07-07 22:03:17 UTC +++ third_party/angle/BUILD.gn -@@ -362,6 +362,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -363,6 +363,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", 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 c2ec46d08158..ae471f19d258 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,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2020-05-13 18:41:47 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-07-07 22:03:18 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -54,7 +54,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -36,7 +36,7 @@ if (rx::IsVulkanXcbDisplayAvailable()) { impl = rx::CreateVulkanXcbDisplay(state); -@@ -1387,7 +1387,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1395,7 +1395,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif 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 47db5b5fd088..95d1dd2edfc9 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,6 +1,6 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-05-13 18:41:57 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-07-07 22:03:29 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c -@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -241,7 +241,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables 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 index a876cc8f94ef..b904b155325c 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-05-13 18:40:34 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -65,11 +65,11 @@ +@@ -66,11 +66,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -14,7 +14,7 @@ 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 +@@ -147,7 +147,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif @@ -23,7 +23,7 @@ defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -192,7 +192,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -195,7 +195,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder &CrashMemoryMetricsReporterImpl::Bind)), main_thread->GetTaskRunner()); #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc new file mode 100644 index 000000000000..10d93b4ff97d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-07-13 10:01:14 UTC ++++ third_party/blink/renderer/core/exported/web_frame_test.cc +@@ -5964,7 +5964,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { + EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); + } + +-#if !defined(OS_MACOSX) && !defined(OS_LINUX) ++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) + TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { + RegisterMockedHttpURLLoad("move_caret.html"); + +@@ -6297,7 +6297,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { + TEST_F(CompositedSelectionBoundsTest, EditableDiv) { + RunTest("composited_selection_bounds_editable_div.html"); + } +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #if !defined(OS_ANDROID) + TEST_F(CompositedSelectionBoundsTest, Input) { + RunTest("composited_selection_bounds_input.html"); 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 d05dcc105788..fab556d7fc68 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 2020-03-16 18:40:35 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -122,7 +122,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -113,7 +113,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 d6fcee071c37..c0d73aa54377 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 2020-05-13 18:40:34 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -60,7 +60,7 @@ +@@ -61,7 +61,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 -@@ -324,7 +324,7 @@ void LayoutView::UpdateLayout() { +@@ -329,7 +329,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 b02ea6eab805..3d568f18d12f 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-05-13 18:40:34 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -107,7 +107,7 @@ namespace { +@@ -108,7 +108,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; 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 14dc2ef5bb1a..700447cffeaa 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 2020-03-16 18:39:56 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -444,7 +444,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -407,7 +407,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_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc new file mode 100644 index 000000000000..cfb3a7419840 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2020-07-13 10:01:57 UTC ++++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc +@@ -243,7 +243,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) { + TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) { + SetupRenderer(kDefaultOutputDeviceId); + renderer_proxy_->Start(); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) + static const int kExpectedBufferSize = kHardwareSampleRate / 100; + #elif defined(OS_ANDROID) + static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100; diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc new file mode 100644 index 000000000000..753361abf198 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2020-07-13 10:02:28 UTC ++++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc +@@ -132,7 +132,7 @@ class AudioWorkletThreadTest : public PageTestBase { + ASSERT_TRUE(thread->IsCurrentThread()); + // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL on + // linux. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + EXPECT_EQ(base::PlatformThread::GetCurrentThreadPriority(), + base::ThreadPriority::NORMAL); + #else 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 9f8310ddf65a..027bb5d83172 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 2020-05-13 18:40:34 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -101,6 +101,7 @@ executable("character_data_generator") { +@@ -103,6 +103,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 086b16ed616f..2fe87557e6d5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-02-03 21:52:52 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; +@@ -83,7 +83,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -115,7 +115,7 @@ FontCache::FontCache() +@@ -123,7 +123,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 1e3ddbf169fd..42d7e8063d30 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-05-13 18:40:35 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -169,7 +169,7 @@ class PLATFORM_EXPORT FontCache { +@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -244,11 +244,11 @@ class PLATFORM_EXPORT FontCache { +@@ -245,11 +245,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -32,7 +32,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -327,12 +327,12 @@ class PLATFORM_EXPORT FontCache { +@@ -330,12 +330,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -47,7 +47,7 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -366,7 +366,7 @@ class PLATFORM_EXPORT FontCache { +@@ -375,7 +375,7 @@ class PLATFORM_EXPORT FontCache { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 3c38c7f4dc44..7a5fb5e58d72 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-12-16 21:50:53 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -38,7 +38,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -225,7 +225,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -239,7 +239,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc new file mode 100644 index 000000000000..75fffdbe36dc --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2020-07-13 10:02:58 UTC ++++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc +@@ -667,7 +667,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) + HarfBuzzShaper shaper(string); + scoped_refptr<ShapeResult> result = ShapeWithParameter(&shaper); + EXPECT_EQ(length, result->NumCharacters()); +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + // Linux and Fuchsia use Lohit Devanagari. When using that font the shaper + // returns 32767 glyphs instead of 32769. + // TODO(crbug.com/933551): Add Noto Sans Devanagari to diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index e1c2576cebf6..ee42d5ea5b4a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-05-13 18:40:35 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-07-07 21:57:43 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc -@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +@@ -84,7 +84,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } @@ -18,7 +18,7 @@ void FontCache::PlatformInit() {} -@@ -228,7 +228,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -229,7 +229,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,7 +27,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc new file mode 100644 index 000000000000..5bb3bf609ccf --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc @@ -0,0 +1,19 @@ +--- third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc.orig 2020-07-13 10:03:26 UTC ++++ third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc +@@ -244,14 +244,14 @@ static void DecodeThreadMain(ImageFrameGenerator* gene + cc::PaintImage::kDefaultGeneratorClientId); + } + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // TODO(crbug.com/948641) + #define MAYBE_incompleteDecodeBecomesCompleteMultiThreaded \ + DISABLED_incompleteDecodeBecomesCompleteMultiThreaded + #else + #define MAYBE_incompleteDecodeBecomesCompleteMultiThreaded \ + incompleteDecodeBecomesCompleteMultiThreaded +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + TEST_F(ImageFrameGeneratorTest, + MAYBE_incompleteDecodeBecomesCompleteMultiThreaded) { + SetFrameStatus(ImageFrame::kFramePartial); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 6c21812b5fa9..ac15b14a300e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-05-15 15:25:13 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-07-07 21:58:17 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -187,7 +187,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -196,7 +196,7 @@ void VideoFrameSubmitter::OnBeginFrame( if (viz::FrameTokenGT(pair.key, *next_frame_token_)) continue; diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index f98caf16c2f7..8b35da84f023 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2020-05-13 18:40:36 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2020-07-07 21:57:56 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -75,6 +75,12 @@ static_library("client") { +@@ -78,6 +78,12 @@ static_library("client") { sources += [ "crashpad_client_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h index 55a2785a0709..f2a935ddbc0e 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2020-05-13 18:40:36 UTC +--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2020-07-07 21:57:56 UTC +++ third_party/crashpad/crashpad/util/misc/capture_context.h -@@ -23,7 +23,7 @@ +@@ -21,7 +21,7 @@ #include <mach/mach.h> #elif defined(OS_WIN) #include <windows.h> @@ -9,7 +9,7 @@ #include <ucontext.h> #elif defined(OS_FUCHSIA) #include <signal.h> -@@ -39,7 +39,7 @@ using NativeCPUContext = x86_thread_state; +@@ -37,7 +37,7 @@ using NativeCPUContext = arm_unified_thread_state; #endif #elif defined(OS_WIN) using NativeCPUContext = CONTEXT; diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h new file mode 100644 index 000000000000..a7505f370c19 --- /dev/null +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h @@ -0,0 +1,19 @@ +--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2020-07-13 13:11:01 UTC ++++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h +@@ -1631,6 +1631,8 @@ class ThreadLocal : public ThreadLocalBase { + // MutexBase and Mutex implement mutex on pthreads-based platforms. + class MutexBase { + public: ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wthread-safety-analysis" + // Acquires this mutex. + void Lock() { + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_)); +@@ -1647,6 +1649,7 @@ class MutexBase { + has_owner_ = false; + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); + } ++#pragma GCC diagnostic pop + + // Does nothing if the current thread holds the mutex. Otherwise, crashes + // with high probability. 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 e56b6079f8f5..54433ee2b928 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 2020-03-16 18:42:08 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-07-07 22:03:20 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -118,6 +118,7 @@ +@@ -119,6 +119,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 de8859859bed..f9943f71d1d5 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2020-05-13 18:40:36 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2020-07-07 21:58:18 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -37,7 +37,11 @@ +@@ -36,7 +36,11 @@ #include "third_party/leveldatabase/leveldb_chrome.h" #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" 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_ext_base_thread__utils.h new file mode 100644 index 000000000000..da364c77fb7b --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h @@ -0,0 +1,12 @@ +--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2020-07-13 15:16:20 UTC ++++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h +@@ -47,6 +47,9 @@ inline bool MaybeSetThreadName(const std::string& name + + #if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + return pthread_setname_np(buf) == 0; ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) ++ pthread_set_name_np(pthread_self(), buf); ++ return true; + #else + return pthread_setname_np(pthread_self(), buf) == 0; + #endif diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc index 33d2e4409c7a..be4417cf274f 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/subprocess.cc.orig 2020-05-18 14:55:51 UTC +--- third_party/perfetto/src/base/subprocess.cc.orig 2020-07-07 22:03:25 UTC +++ third_party/perfetto/src/base/subprocess.cc -@@ -31,8 +31,8 @@ +@@ -33,8 +33,8 @@ #include "perfetto/base/time.h" #include "perfetto/ext/base/utils.h" @@ -11,7 +11,7 @@ #include <sys/prctl.h> #endif -@@ -56,8 +56,8 @@ struct ChildProcessArgs { +@@ -58,8 +58,8 @@ struct ChildProcessArgs { // Don't add any dynamic allocation in this function. This will be invoked // under a fork(), potentially in a state where the allocator lock is held. void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) { 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 index 1196437c938c..93157f580e27 100644 --- 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 @@ -1,7 +1,7 @@ ---- 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.orig 2020-07-07 22:03:25 UTC +++ third_party/perfetto/src/base/thread_task_runner.cc -@@ -27,7 +27,7 @@ - #include "perfetto/base/logging.h" +@@ -28,7 +28,7 @@ + #include "perfetto/ext/base/thread_utils.h" #include "perfetto/ext/base/unix_task_runner.h" -#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ @@ -9,12 +9,3 @@ 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_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index d8f528b3f21a..db04ed1d1388 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,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-05-13 18:41:54 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-07-07 22:03:25 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2326,6 +2326,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr +@@ -2410,6 +2410,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h b/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h deleted file mode 100644 index 4710263d7bdd..000000000000 --- a/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2019-03-17 01:47:13 UTC -+++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h -@@ -2232,7 +2232,7 @@ remove them if not needed. - #include <mutex> // for std::mutex - #include <atomic> // for std::atomic - --#if !defined(_WIN32) && !defined(__APPLE__) -+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) - #include <malloc.h> // for aligned_alloc() - #endif - diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 573da6f01056..1fa940441d77 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2020-05-13 18:41:57 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2020-07-07 22:03:28 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -222,7 +222,12 @@ AdapterType GetAdapterTypeFromName(const char* network +@@ -244,7 +244,12 @@ AdapterType GetAdapterTypeFromName(const char* network } #endif 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 e5217a82f65e..7cfebcf2be77 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,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-05-13 18:41:57 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-07-07 22:03:28 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -51,7 +51,7 @@ +@@ -50,7 +50,7 @@ #include "rtc_base/null_socket_server.h" #include "rtc_base/time_utils.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -70,7 +70,7 @@ typedef void* SockOptArg; +@@ -69,7 +69,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -292,7 +292,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -291,7 +291,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -310,7 +310,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -551,7 +551,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -550,7 +550,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni b/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni deleted file mode 100644 index a54244fd5e3e..000000000000 --- a/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni +++ /dev/null @@ -1,157 +0,0 @@ ---- 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. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --# This provides the yasm_assemble() template which uses YASM to assemble --# assembly files. --# --# Files to be assembled with YASM should have an extension of .asm. --# --# Parameters --# --# yasm_flags (optional) --# [list of strings] Pass additional flags into YASM. These are appended --# to the command line. Note that the target machine type and system is --# already set up based on the current toolchain so you don't need to --# specify these things (see below). --# --# Example: yasm_flags = [ "--force-strict" ] --# --# include_dirs (optional) --# [list of dir names] List of additional include dirs. Note that the --# source root and the root generated file dir is always added, just like --# our C++ build sets up. --# --# Example: include_dirs = [ "//some/other/path", target_gen_dir ] --# --# defines (optional) --# [list of strings] List of defines, as with the native code defines. --# --# Example: defines = [ "FOO", "BAR=1" ] --# --# inputs, deps, visibility (optional) --# These have the same meaning as in an action. --# --# Example --# --# yasm_assemble("my_yasm_target") { --# sources = [ --# "ultra_optimized_awesome.asm", --# ] --# include_dirs = [ "assembly_include" ] --# } -- --if (is_mac || is_ios) { -- if (current_cpu == "x86") { -- _yasm_flags = [ -- "-fmacho32", -- "-m", -- "x86", -- ] -- } else if (current_cpu == "x64") { -- _yasm_flags = [ -- "-fmacho64", -- "-m", -- "amd64", -- ] -- } --} else if (is_posix || is_fuchsia) { -- if (current_cpu == "x86") { -- _yasm_flags = [ -- "-felf32", -- "-m", -- "x86", -- ] -- } else if (current_cpu == "x64") { -- _yasm_flags = [ -- "-DPIC", -- "-felf64", -- "-m", -- "amd64", -- ] -- } --} else if (is_win) { -- if (current_cpu == "x86") { -- _yasm_flags = [ -- "-DPREFIX", -- "-fwin32", -- "-m", -- "x86", -- ] -- } else if (current_cpu == "x64") { -- _yasm_flags = [ -- "-fwin64", -- "-m", -- "amd64", -- ] -- } -+if (current_cpu == "x86") { -+ _yasm_flags = [ -+ "-felf32", -+ "-m", -+ "x86", -+ ] -+} else if (current_cpu == "x64") { -+ _yasm_flags = [ -+ "-DPIC", -+ "-felf64", -+ "-m", -+ "amd64", -+ ] - } - --if (is_win) { -- asm_obj_extension = "obj" --} else { -- asm_obj_extension = "o" --} -- - template("yasm_assemble") { -- assert(defined(invoker.sources), "Need sources defined for $target_name") -- -- # Only depend on YASM on x86 systems. Force compilation of .asm files for -- # ARM to fail. -- assert(current_cpu == "x86" || current_cpu == "x64") -- - action_name = "${target_name}_action" - source_set_name = target_name - -@@ -114,22 +32,12 @@ template("yasm_assemble") { - inputs = invoker.inputs - } - -- # Executable (first in the args). The binary might be in the root build dir -- # (no cross-compiling) or in a toolchain-specific subdirectory of that -- # (when cross-compiling). -- yasm_label = "//third_party/yasm($host_toolchain)" -- args = [ "./" + # Force current dir. -- rebase_path(get_label_info(yasm_label, "root_out_dir") + "/yasm", -- root_build_dir) ] -- -- # Deps. -- deps = [ yasm_label ] -+ deps = [] - if (defined(invoker.deps)) { - deps += invoker.deps - } - -- # Flags. -- args += _yasm_flags -+ args = [ "yasm" ] + _yasm_flags - if (defined(invoker.yasm_flags)) { - args += invoker.yasm_flags - } -@@ -184,9 +92,6 @@ template("yasm_assemble") { - } - - sources = get_target_outputs(":$action_name") -- -- # Do not publicize any header to remove build dependency. -- public = [] - - deps = [ ":$action_name" ] - } diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn deleted file mode 100644 index 8613c5f195da..000000000000 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/zlib/BUILD.gn.orig 2020-05-18 20:40:28 UTC -+++ third_party/zlib/BUILD.gn -@@ -82,6 +82,8 @@ if (use_arm_neon_optimizations) { - defines = [ "CRC32_ARMV8_CRC32" ] - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] -+ } else if (is_bsd) { -+ defines += [ "ARMV8_OS_FREEBSD" ] - } else if (is_linux || is_chromeos) { - defines += [ "ARMV8_OS_LINUX" ] - } else if (is_fuchsia) { -@@ -350,7 +352,7 @@ static_library("minizip") { - ] - } - -- if (is_mac || is_ios || is_android || is_nacl) { -+ if (is_mac || is_ios || is_android || is_nacl || is_bsd) { - # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We - # use fopen, ftell, and fseek instead on these systems. - defines = [ "USE_FILE32API" ] diff --git a/www/chromium/files/patch-third_party_zlib_cpu__features.c b/www/chromium/files/patch-third__party_zlib_cpu__features.c index 0fae5fd16f9f..f64dce9f4de3 100644 --- a/www/chromium/files/patch-third_party_zlib_cpu__features.c +++ b/www/chromium/files/patch-third__party_zlib_cpu__features.c @@ -1,6 +1,6 @@ ---- third_party/zlib/cpu_features.c.orig 2020-05-18 20:40:28 UTC +--- third_party/zlib/cpu_features.c.orig 2020-07-07 21:58:18 UTC +++ third_party/zlib/cpu_features.c -@@ -24,11 +24,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; +@@ -25,11 +25,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; #ifndef CPU_NO_SIMD @@ -23,7 +23,7 @@ #include <cpu-features.h> #elif defined(ARMV8_OS_LINUX) #include <asm/hwcap.h> -@@ -49,7 +58,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; +@@ -50,7 +59,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; static void _cpu_check_features(void); #endif @@ -32,7 +32,7 @@ static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; void ZLIB_INTERNAL cpu_check_features(void) { -@@ -108,6 +117,13 @@ static void _cpu_check_features(void) +@@ -109,6 +118,13 @@ static void _cpu_check_features(void) #elif defined(ARMV8_OS_WINDOWS) arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); @@ -46,10 +46,3 @@ #endif } #endif -@@ -145,4 +161,4 @@ static void _cpu_check_features(void) - } - #endif - #endif --#endif -\ No newline at end of file -+#endif diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 498a0904d175..1a1692b44dd7 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,6 +1,6 @@ ---- tools/gn/build/gen.py.orig 2020-05-13 18:47:33 UTC +--- tools/gn/build/gen.py.orig 2020-07-07 22:09:39 UTC +++ tools/gn/build/gen.py -@@ -73,6 +73,9 @@ class Platform(object): +@@ -78,6 +78,9 @@ class Platform(object): def is_haiku(self): return self._platform == 'haiku' @@ -10,7 +10,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku'] -@@ -354,6 +357,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -372,6 +375,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_haiku(): cflags.append('-fPIC') cflags.extend(['-D_BSD_SOURCE']) 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 bf456025bb2c..8decbb4d3af6 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,10 +1,10 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2020-05-13 18:40:36 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2020-07-07 21:57:58 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -219,6 +219,7 @@ FEATURE_GRAMMAR = ( - 'enum_map': { - 'chromeos': 'Feature::CHROMEOS_PLATFORM', - 'linux': 'Feature::LINUX_PLATFORM', -+ 'bsd': 'Feature::LINUX_PLATFORM', - 'mac': 'Feature::MACOSX_PLATFORM', - 'win': 'Feature::WIN_PLATFORM', - } +@@ -236,6 +236,7 @@ FEATURE_GRAMMAR = ({ + 'enum_map': { + 'chromeos': 'Feature::CHROMEOS_PLATFORM', + 'linux': 'Feature::LINUX_PLATFORM', ++ 'bsd': 'Feature::LINUX_PLATFORM', + 'mac': 'Feature::MACOSX_PLATFORM', + 'win': 'Feature::WIN_PLATFORM', + } diff --git a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc new file mode 100644 index 000000000000..81aa2da7101a --- /dev/null +++ b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc @@ -0,0 +1,20 @@ +--- ui/aura/test/aura_test_helper.cc.orig 2020-07-13 10:05:19 UTC ++++ ui/aura/test/aura_test_helper.cc +@@ -29,7 +29,7 @@ + #include "ui/wm/core/default_activation_client.h" + #include "ui/wm/core/default_screen_position_client.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck + #endif + +@@ -55,7 +55,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con + DCHECK(!g_instance); + g_instance = this; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + ui::test::EnableTestConfigForPlatformWindows(); + #endif + diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 40534eb32dbb..7ee7103042eb 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,20 +1,20 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2020-07-07 21:58:19 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc -@@ -8,7 +8,7 @@ +@@ -9,7 +9,7 @@ #if defined(USE_X11) - #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" + #include "ui/base/dragdrop/os_exchange_data_provider_x11.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" - #elif defined(OS_MACOSX) - #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -23,7 +23,7 @@ std::unique_ptr<OSExchangeData::Provider> + #if defined(USE_OZONE) + #include "ui/base/dragdrop/os_exchange_data_provider_factory_ozone.h" + #endif +@@ -27,7 +27,7 @@ std::unique_ptr<OSExchangeDataProvider> OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) - return std::make_unique<OSExchangeDataProviderAuraX11>(); + return std::make_unique<OSExchangeDataProviderX11>(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - return std::make_unique<OSExchangeDataProviderAura>(); - #elif defined(OS_MACOSX) - return ui::BuildOSExchangeDataProviderMac(); + #if defined(USE_OZONE) + // The instance can be nullptr in tests that do not instantiate the platform, + // or on platforms that do not implement specific drag'n'drop. For them, diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index 5d959a77dad4..8a1ebb0848a0 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,15 +1,15 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2020-05-13 18:40:37 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2020-07-07 21:58:19 UTC +++ ui/base/ime/init/input_method_initializer.cc -@@ -8,7 +8,7 @@ +@@ -10,7 +10,7 @@ #if defined(OS_CHROMEOS) #include "ui/base/ime/ime_bridge.h" -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "base/logging.h" + #include "base/check.h" #include "ui/base/ime/linux/fake_input_method_context_factory.h" #elif defined(OS_WIN) -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ namespace { @@ -18,7 +18,7 @@ const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory_for_testing; #endif -@@ -46,7 +46,7 @@ void ShutdownInputMethod() { +@@ -48,7 +48,7 @@ void ShutdownInputMethod() { void InitializeInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Initialize(); @@ -27,7 +27,7 @@ if (!g_linux_input_method_context_factory_for_testing) g_linux_input_method_context_factory_for_testing = new FakeInputMethodContextFactory(); -@@ -65,7 +65,7 @@ void InitializeInputMethodForTesting() { +@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Shutdown(); 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 d9fdcb06fe51..74f63f6db820 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,15 @@ ---- ui/base/ui_base_features.cc.orig 2020-05-13 18:40:37 UTC +--- ui/base/ui_base_features.cc.orig 2020-07-07 21:58:19 UTC +++ ui/base/ui_base_features.cc -@@ -121,7 +121,7 @@ const base::Feature kPrecisionTouchpadLogging{ +@@ -98,7 +98,7 @@ const base::Feature kCompositorThreadedScrollbarScroll + // native apps on Windows. + const base::Feature kExperimentalFlingAnimation { + "ExperimentalFlingAnimation", +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -130,7 +130,7 @@ const base::Feature kPrecisionTouchpadLogging{ "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_WIN) @@ -9,7 +18,7 @@ // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -131,7 +131,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -140,7 +140,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; @@ -18,7 +27,7 @@ // Enables forced colors mode for web content. const base::Feature kForcedColors{"ForcedColors", -@@ -157,7 +157,7 @@ bool IsEyeDropperEnabled() { +@@ -166,7 +166,7 @@ bool IsEyeDropperEnabled() { // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the // Mac launch bug. const base::Feature kFormControlsRefresh = {"FormControlsRefresh", 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 e54a72640da8..2f0d38fc356e 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-05-13 18:40:37 UTC +--- ui/base/ui_base_features.h.orig 2020-07-07 21:58:19 UTC +++ ui/base/ui_base_features.h -@@ -58,10 +58,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: +@@ -60,10 +60,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUsingWMPointerForTouch(); #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index d566a8abc3c9..0eee152db4c4 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,7 +1,7 @@ ---- ui/compositor/compositor.cc.orig 2020-05-13 18:40:37 UTC +--- ui/compositor/compositor.cc.orig 2020-07-07 21:58:19 UTC +++ ui/compositor/compositor.cc -@@ -695,7 +695,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to - NOTREACHED(); +@@ -740,7 +740,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr + throughput_tracker_map_.erase(tracker_id); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 52126045fe15..b812a2cd1ddf 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,8 +1,8 @@ ---- ui/compositor/compositor.h.orig 2020-05-13 18:40:37 UTC +--- ui/compositor/compositor.h.orig 2020-07-07 21:58:19 UTC +++ ui/compositor/compositor.h -@@ -341,7 +341,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT - void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override; - void OnFrameTokenChanged(uint32_t frame_token) override; +@@ -363,7 +363,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT + void StopThroughtputTracker(TrackerId tracker_id) override; + void CancelThroughtputTracker(TrackerId tracker_id) 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-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index df1fa86b3c0d..3e96b3e5b3b1 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-09-09 21:55:46 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2020-07-07 21:58:19 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -826,6 +826,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -816,6 +816,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -836,6 +838,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -826,6 +828,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 87607363d4d9..e9b8d932f94d 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-05-13 18:40:37 UTC +--- ui/gfx/BUILD.gn.orig 2020-07-07 21:58:19 UTC +++ ui/gfx/BUILD.gn -@@ -582,7 +582,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -580,7 +580,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index 5f0bb35c60b5..52f1f467375c 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,6 +1,6 @@ ---- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/font_render_params.h.orig 2020-07-07 21:57:59 UTC +++ ui/gfx/font_render_params.h -@@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -111,7 +111,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); @@ -9,10 +9,12 @@ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); - #endif +@@ -120,7 +120,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); + // Gets the device scale factor to query the FontRenderParams. + GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_FUCHSIA) - // Gets the device scale factor to query the FontRenderParams. - GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); + // Sets the device scale factor for FontRenderParams to decide + // if it should enable subpixel positioning. 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 20952718c93d..e4128cb160c5 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,7 +1,7 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-07-07 21:57:59 UTC +++ ui/gfx/native_pixmap_handle.cc -@@ -8,11 +8,15 @@ - +@@ -9,11 +9,15 @@ + #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_LINUX) @@ -17,7 +17,7 @@ #if defined(OS_FUCHSIA) #include <lib/zx/vmo.h> #include "base/fuchsia/fuchsia_logging.h" -@@ -20,7 +24,7 @@ +@@ -21,7 +25,7 @@ namespace gfx { @@ -26,7 +26,7 @@ static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of +@@ -32,7 +36,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size @@ -35,7 +35,7 @@ , base::ScopedFD fd #elif defined(OS_FUCHSIA) -@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, +@@ -43,7 +47,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, : stride(stride), offset(offset), size(size) @@ -44,7 +44,7 @@ , fd(std::move(fd)) #elif defined(OS_FUCHSIA) -@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati +@@ -71,7 +75,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { @@ -53,7 +53,7 @@ DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { -@@ -96,7 +100,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma +@@ -97,7 +101,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index cc63ccfc221a..1d624f958cea 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-05-13 18:40:37 UTC +--- ui/gfx/render_text.cc.orig 2020-07-07 21:58:19 UTC +++ ui/gfx/render_text.cc -@@ -1167,32 +1167,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -1179,32 +1179,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_gfx_x_BUILD.gn b/www/chromium/files/patch-ui_gfx_x_BUILD.gn new file mode 100644 index 000000000000..f70d74f17804 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_x_BUILD.gn @@ -0,0 +1,11 @@ +--- ui/gfx/x/BUILD.gn.orig 2020-07-13 11:08:01 UTC ++++ ui/gfx/x/BUILD.gn +@@ -16,6 +16,8 @@ declare_args() { + if (xcbproto_path == "") { + if (use_sysroot) { + xcbproto_path = "$sysroot/usr/share/xcb" ++ } else if (is_bsd) { ++ xcbproto_path = "/usr/local/share/xcb" + } else { + xcbproto_path = "/usr/share/xcb" + } diff --git a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py new file mode 100644 index 000000000000..1a9d08c9d938 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py @@ -0,0 +1,13 @@ +--- ui/gfx/x/gen_xproto.py.orig 2020-07-13 16:58:52 UTC ++++ ui/gfx/x/gen_xproto.py +@@ -1015,6 +1015,10 @@ def main(): + 'dist-packages') + sys.path.insert(1, path) + ++ # Workaround to use the xcb-proto package, which installs using the default python version ++ # Remove this as soon as chromium builds with python3! ++ sys.path.append(os.path.join('..', '..', '..', 'site-packages')) ++ + import xcbgen.xtypes + import xcbgen.state + diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 4bca250f77c2..9266552d908a 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-05-13 18:40:37 UTC +--- ui/gl/BUILD.gn.orig 2020-07-07 21:58:19 UTC +++ ui/gl/BUILD.gn -@@ -232,7 +232,7 @@ jumbo_component("gl") { +@@ -229,7 +229,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 8ea47d4341d2..4881f35df4c7 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-05-13 18:40:37 UTC +--- ui/gl/generate_bindings.py.orig 2020-07-07 21:58:19 UTC +++ ui/gl/generate_bindings.py -@@ -2804,6 +2804,9 @@ GLX_FUNCTIONS = [ +@@ -2813,6 +2813,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc index c91797ca9683..8088210e0936 100644 --- a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/print_dialog_gtk.cc.orig 2020-03-16 18:40:30 UTC +--- ui/gtk/print_dialog_gtk.cc.orig 2020-07-07 21:58:19 UTC +++ ui/gtk/print_dialog_gtk.cc -@@ -336,7 +336,7 @@ void PrintDialogGtk::ShowDialog( +@@ -341,7 +341,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( diff --git a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h deleted file mode 100644 index fcc30a1c5836..000000000000 --- a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/message_center/public/cpp/message_center_constants.h.orig 2020-05-13 18:40:37 UTC -+++ ui/message_center/public/cpp/message_center_constants.h -@@ -109,7 +109,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. - const int kButtonIconTopPadding = 11; // In DIPs. - const int kButtonIconToTitlePadding = 16; // In DIPs. - --#if !defined(OS_LINUX) || defined(USE_AURA) -+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) - constexpr SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234); - constexpr SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243); - #endif 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 928d9aed5ddf..15980314aa07 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-05-13 18:40:37 UTC +--- ui/native_theme/native_theme_base.cc.orig 2020-07-07 21:58:19 UTC +++ ui/native_theme/native_theme_base.cc -@@ -254,7 +254,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -255,7 +255,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_strings_app__locale__settings.grd b/www/chromium/files/patch-ui_strings_app__locale__settings.grd index 9341a0bc5305..ff17c71e5984 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 2020-03-16 18:40:15 UTC +--- ui/strings/app_locale_settings.grd.orig 2020-07-07 21:57:59 UTC +++ ui/strings/app_locale_settings.grd -@@ -216,7 +216,7 @@ +@@ -217,7 +217,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 8390dd78b6fe..3e4380cfcbf7 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,7 +1,7 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-07-07 21:58:19 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -171,7 +171,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( - bubble_delegate->Init(); +@@ -170,7 +170,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( + bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 4599ba02af0f..9e8e9bd90dd6 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/controls/label.cc.orig 2020-07-07 21:58:19 UTC +++ ui/views/controls/label.cc -@@ -695,7 +695,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -881,7 +881,7 @@ bool Label::PasteSelectionClipboard() { +@@ -875,7 +875,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index a0f9988afe25..2ff071560d33 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-07-07 21:58:19 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -62,7 +62,7 @@ +@@ -64,7 +64,7 @@ #include "base/win/win_util.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 -@@ -183,14 +183,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -185,14 +185,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -258,7 +258,7 @@ bool IsControlKeyModifier(int flags) { +@@ -260,7 +260,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,16 +35,16 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -691,7 +691,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -709,7 +709,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) - RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); + RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -737,7 +737,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -755,7 +755,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; -@@ -886,7 +886,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -907,7 +907,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(); -@@ -2146,7 +2146,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 69203a9262d4..08d332729f6b 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,11 +1,11 @@ ---- ui/views/examples/widget_example.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/examples/widget_example.cc.orig 2020-07-07 21:57:59 UTC +++ ui/views/examples/widget_example.cc -@@ -72,7 +72,7 @@ void WidgetExample::CreateExampleView(View* container) - BuildButton(container, "Popup widget", POPUP); - BuildButton(container, "Dialog widget", DIALOG); - BuildButton(container, "Modal Dialog", MODAL_DIALOG); +@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) + DIALOG); + BuildButton(container, GetStringUTF16(IDS_WIDGET_MODAL_BUTTON_LABEL), + MODAL_DIALOG); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Windows does not support TYPE_CONTROL top-level widgets. - BuildButton(container, "Child widget", CHILD); - #endif + BuildButton(container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL), + CHILD); 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 45c1fde7e8f2..a3fc5fdcfd09 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-05-13 18:40:37 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-07-07 21:58:19 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -754,7 +754,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP +@@ -787,7 +787,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 50b0207899de..352aa572affe 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-05-13 18:40:37 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2020-07-07 21:58:19 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,6 +9,15 @@ #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif +@@ -1072,7 +1072,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS + // Widget, public: + + namespace { +-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_WIN) || defined(OS_LINUX)) ++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) + void CloseWindow(aura::Window* window) { + if (window) { + Widget* widget = Widget::GetWidgetForNativeView(window); @@ -1102,13 +1102,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 7b62ec2bc6b8..10e68218b0e0 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/window/dialog_delegate.cc.orig 2020-07-07 21:58:19 UTC +++ ui/views/window/dialog_delegate.cc -@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg +@@ -62,7 +62,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index f1cb20d1fa32..582adbf52d53 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-05-13 18:41:59 UTC +--- v8/BUILD.gn.orig 2020-07-07 22:03:31 UTC +++ v8/BUILD.gn -@@ -3742,7 +3742,7 @@ v8_component("v8_libbase") { +@@ -3839,7 +3839,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3762,6 +3762,12 @@ v8_component("v8_libbase") { +@@ -3859,6 +3859,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -4064,6 +4070,7 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4232,6 +4238,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 24e66024517d..ad2d9bc6e0d8 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-05-13 18:41:59 UTC +--- v8/src/api/api.cc.orig 2020-07-07 22:03:31 UTC +++ v8/src/api/api.cc -@@ -5726,7 +5726,7 @@ bool v8::V8::Initialize() { +@@ -5640,7 +5640,7 @@ bool v8::V8::Initialize(const int build_config) { 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 index 9e539ca470b2..981dab7567fa 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -1,14 +1,6 @@ ---- v8/src/base/platform/platform-freebsd.cc.orig 2020-05-13 18:41:59 UTC +--- v8/src/base/platform/platform-freebsd.cc.orig 2020-07-28 10:13:42 UTC +++ v8/src/base/platform/platform-freebsd.cc -@@ -6,6 +6,7 @@ - // parts, the implementation is in platform-posix.cc. - - #include <pthread.h> -+#include <pthread_np.h> - #include <semaphore.h> - #include <signal.h> - #include <stdlib.h> -@@ -81,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib +@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib lib_name = std::string(path); } result.push_back(SharedLibraryAddress( diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 53cb053e8c62..1dad413ec5ac 100644 --- a/www/chromium/files/patch-weblayer_BUILD.gn +++ b/www/chromium/files/patch-weblayer_BUILD.gn @@ -1,6 +1,6 @@ ---- weblayer/BUILD.gn.orig 2020-05-18 11:02:15 UTC +--- weblayer/BUILD.gn.orig 2020-07-07 21:58:19 UTC +++ weblayer/BUILD.gn -@@ -414,6 +414,14 @@ source_set("weblayer_lib_base") { +@@ -511,6 +511,14 @@ source_set("weblayer_lib_base") { ] } 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 index 3e404619721d..733a0acf27d1 100644 --- a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc +++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/app/content_main_delegate_impl.cc.orig 2020-05-13 18:40:37 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2020-07-07 21:58:19 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -164,7 +164,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -173,7 +173,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( } void ContentMainDelegateImpl::PreSandboxStartup() { 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 0f18b2e56b46..16d8033cd983 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-05-13 18:40:37 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-07-07 21:58:19 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -47,7 +47,7 @@ +@@ -53,7 +53,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 -@@ -121,7 +121,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -128,7 +128,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 603c3e2827a2..d55b1f819953 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-05-13 18:40:37 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-07-07 21:58:19 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -87,7 +87,7 @@ +@@ -102,7 +102,7 @@ #include "weblayer/browser/safe_browsing/safe_browsing_service.h" #endif @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -321,7 +321,7 @@ ContentBrowserClientImpl::CreateNetworkContext( +@@ -339,7 +339,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext 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 -@@ -537,7 +537,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -608,7 +608,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe } #endif @@ -27,11 +27,12 @@ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -571,6 +571,6 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -642,7 +642,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - } // namespace weblayer + void ContentBrowserClientImpl::AppendExtraCommandLineSwitches( + base::CommandLine* command_line, 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 b3ed53bb4cbf..32bb154eec2a 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,9 +1,9 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2020-05-13 18:40:37 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2020-07-07 21:58:19 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -91,12 +91,12 @@ class ContentBrowserClientImpl : public content::Conte +@@ -101,12 +101,12 @@ class ContentBrowserClientImpl : public content::Conte + void RenderProcessWillLaunch(content::RenderProcessHost* host) override; scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext() override; - -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( @@ -12,6 +12,6 @@ content::PosixFileDescriptorInfo* mappings) override; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - void CreateFeatureListAndFieldTrials(); - + void AppendExtraCommandLineSwitches(base::CommandLine* command_line, + int child_process_id) override; + #if 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 index 905959498728..41d6b5d75adf 100644 --- a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc +++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc @@ -1,8 +1,8 @@ ---- weblayer/browser/system_network_context_manager.cc.orig 2020-05-13 18:40:04 UTC +--- weblayer/browser/system_network_context_manager.cc.orig 2020-07-07 21:58:19 UTC +++ weblayer/browser/system_network_context_manager.cc -@@ -52,7 +52,7 @@ SystemNetworkContextManager::CreateDefaultNetworkConte - network::mojom::NetworkContextParamsPtr network_context_params = - network::mojom::NetworkContextParams::New(); +@@ -64,7 +64,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw + network::mojom::NetworkContextParams* network_context_params, + const std::string& user_agent) { network_context_params->user_agent = user_agent; -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index b233d0ff6b75..b3f70a7b96a2 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -234,7 +234,9 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-legacy.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/IssuesManager.js %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js %%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/changes/changes-legacy.js %%DATADIR%%/resources/inspector/changes/changes.js @@ -243,9 +245,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js %%DATADIR%%/resources/inspector/cm_headless/cm_headless.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/clike.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/clojure.js %%DATADIR%%/resources/inspector/cm/cm_module.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm/active-line.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm/brace-fold.js @@ -259,25 +258,10 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/cm/matchbrackets.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm/multiplex.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm/overlay.js +%%DEBUG%%%%DATADIR%%/resources/inspector/cm/simple.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/jsx.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/livescript.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/markdown.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/php.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/python.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/shell.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js -%%DEBUG%%%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/css.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js -%%DEBUG%%%%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 @@ -294,6 +278,7 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Lazy.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js @@ -308,7 +293,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/UIString.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js %%DATADIR%%/resources/inspector/components/components.js %%DATADIR%%/resources/inspector/components/components-legacy.js @@ -385,6 +369,7 @@ bin/chrome %%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/elements/elements-legacy.js %%DATADIR%%/resources/inspector/elements/elements.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js @@ -399,6 +384,7 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js @@ -475,7 +461,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js %%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js @@ -556,6 +541,7 @@ bin/chrome %%DATADIR%%/resources/inspector/issues/issues_module.js %%DATADIR%%/resources/inspector/issues/issues-legacy.js %%DATADIR%%/resources/inspector/issues/issues.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js @@ -703,9 +689,12 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js %%DATADIR%%/resources/inspector/platform/platform.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/date-utilities.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js %%DATADIR%%/resources/inspector/profiler/profiler-legacy.js %%DATADIR%%/resources/inspector/profiler/profiler.js @@ -787,6 +776,7 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CrossOriginEmbedderPolicyIssue.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js @@ -807,6 +797,7 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/MixedContentIssue.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js @@ -814,11 +805,11 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RelatedIssue.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SameSiteCookieIssue.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js %%DATADIR%%/resources/inspector/sdk/sdk.js @@ -928,6 +919,23 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/runmode/runmode-standalone.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clike/clike.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clojure/clojure.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/coffeescript/coffeescript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/css/css.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlembedded/htmlembedded.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlmixed/htmlmixed.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/javascript/javascript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/jsx/jsx.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/livescript/livescript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/markdown/markdown.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/php/php.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/python/python.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/shell/shell.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/wast/wast.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/xml/xml.js %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar-XB.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/bg.json @@ -993,6 +1001,7 @@ bin/chrome %%DATADIR%%/resources/inspector/timeline/timeline_module.js %%DATADIR%%/resources/inspector/timeline/timeline-legacy.js %%DATADIR%%/resources/inspector/timeline/timeline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CLSLinkifier.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js |