diff options
351 files changed, 2274 insertions, 1568 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 3a330df82f1d..b303b8598d90 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 87.0.4280.141 +PORTVERSION= 88.0.4324.96 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts diff --git a/www/chromium/distinfo b/www/chromium/distinfo index d18fdfbc1344..013c1a7625e0 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1610013360 -SHA256 (chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375 -SIZE (chromium-87.0.4280.141.tar.xz) = 856467564 -SHA256 (chromium-87.0.4280.141-testdata.tar.xz) = 210492a8c704bf47b92039e2564f73ebfbcc5ab605d23f66ba16547235a64539 -SIZE (chromium-87.0.4280.141-testdata.tar.xz) = 257414220 +TIMESTAMP = 1611041053 +SHA256 (chromium-88.0.4324.96.tar.xz) = 8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f +SIZE (chromium-88.0.4324.96.tar.xz) = 857138392 +SHA256 (chromium-88.0.4324.96-testdata.tar.xz) = e68ae3559bd1645d4894f3f0712f999cc0e906367adc91615ae9a6d10bc1ee98 +SIZE (chromium-88.0.4324.96-testdata.tar.xz) = 257480820 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index b963da3a6dbf..1d59abc70dd1 100644 --- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -1,11 +1,11 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2020-11-24 12:45:30 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-01-18 21:28:45 UTC +++ build/config/compiler/pgo/pgo.gni -@@ -12,7 +12,7 @@ declare_args() { +@@ -13,7 +13,7 @@ declare_args() { # 2 : Used during the PGO (optimization) phase. chrome_pgo_phase = 0 if (is_official_build && -- (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only))) { -+ (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only && !is_bsd))) { +- (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast))) { ++ (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { chrome_pgo_phase = 2 } 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 9fe3b4985016..fa954c72a7b2 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-11-13 06:42:21 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:31:51 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 37720bb5f096..65c3f3f33fb6 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2020-11-13 06:36:33 UTC +--- BUILD.gn.orig 2021-01-18 21:28:44 UTC +++ BUILD.gn -@@ -422,7 +422,7 @@ group("gn_all") { +@@ -424,7 +424,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -463,8 +463,6 @@ group("gn_all") { +@@ -467,8 +467,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -519,10 +517,6 @@ group("gn_all") { +@@ -523,10 +521,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -582,10 +576,6 @@ group("gn_all") { +@@ -586,10 +580,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -663,7 +653,7 @@ group("gn_all") { +@@ -667,7 +657,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,16 +49,16 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -678,7 +668,7 @@ group("gn_all") { +@@ -682,7 +672,7 @@ group("gn_all") { } } -- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) { -+ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) { +- if (is_mac || is_win || is_android || is_linux || is_chromeos) { ++ if (is_mac || is_win || is_android || (is_linux && !is_bsd) || is_chromeos) { deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -797,7 +787,6 @@ group("gn_all") { +@@ -802,7 +792,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -84,7 +84,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1296,9 +1285,6 @@ group("chromium_builder_perf") { +@@ -1320,9 +1309,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 8a96c5b88c47..3d880b5a714d 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,11 +1,11 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2020-11-13 06:36:34 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2021-01-18 21:28:44 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() - gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const { +@@ -139,7 +139,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS) // Get the difference between the widget's client area bounds and window // bounds, and grow |window_bounds| by that amount. gfx::Insets native_frame_insets = diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index f7124e6daed6..181a4bb22687 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2020-11-13 06:36:34 UTC +--- ash/display/mirror_window_controller.cc.orig 2021-01-18 21:28:44 UTC +++ ash/display/mirror_window_controller.cc -@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow( +@@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 0ff1f5c9a661..c5c95ee51939 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,15 +1,6 @@ ---- base/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- base/BUILD.gn.orig 2021-01-18 21:28:44 UTC +++ base/BUILD.gn -@@ -53,7 +53,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. -- from_here_uses_location_builtins = !is_official_build -+ from_here_uses_location_builtins = !is_official_build && !is_bsd - - # Unsafe developer build. Has developer-friendly features that may weaken or - # disable security measures like sandboxing or ASLR. -@@ -878,7 +878,7 @@ component("base") { +@@ -873,7 +873,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -889,6 +889,11 @@ component("base") { +@@ -884,6 +884,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -30,7 +21,7 @@ } if (is_win) { -@@ -1295,7 +1300,7 @@ component("base") { +@@ -1293,7 +1298,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -39,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1342,7 +1347,7 @@ component("base") { +@@ -1343,7 +1348,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -48,16 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -1811,7 +1816,7 @@ component("base") { - ] - } - -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux || is_chromeos || is_android) && !is_bsd) { - sources += [ - "allocator/partition_allocator/spinning_futex_linux.cc", - "allocator/partition_allocator/spinning_futex_linux.h", -@@ -1956,6 +1961,34 @@ component("base") { +@@ -1969,6 +1974,34 @@ component("base") { } } @@ -92,8 +74,8 @@ # iOS if (is_ios) { sources -= [ -@@ -3069,7 +3102,7 @@ test("base_unittests") { - ] +@@ -3111,7 +3144,7 @@ test("base_unittests") { + } } - if (is_linux || is_chromeos) { @@ -101,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc" ] } -@@ -3110,7 +3143,7 @@ test("base_unittests") { +@@ -3152,7 +3185,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index 212e4561c6c2..b5135ca51e2c 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,11 +1,13 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2020-11-13 06:36:34 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-01-18 21:28:44 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h -@@ -10,7 +10,7 @@ +@@ -16,6 +16,10 @@ + #include <malloc.h> #endif - #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_ --#include <malloc.h> ++#if defined(OS_BSD) +#include <stdlib.h> - ++#endif ++ #include "base/allocator/allocator_shim_internals.h" + extern "C" { 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 21de4b8f7dc2..9a0e6af659a2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-01-18 21:28:44 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { @@ -36,12 +36,12 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -595,7 +595,7 @@ static size_t GetAllocatedSize(void* ptr) { - static size_t GetAllocatedSize(void* ptr) { +@@ -595,7 +595,7 @@ static size_t GetUsableSize(void* ptr) { + static size_t GetUsableSize(void* ptr) { return malloc_size(ptr); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - static size_t GetAllocatedSize(void* ptr) { + static size_t GetUsableSize(void* ptr) { return malloc_usable_size(ptr); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index b9db7cc31cd5..e4554498dec5 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:36:34 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:28:44 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index 9b1a187130ab..06b2673bf136 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2020-11-30 16:06:59 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-01-18 21:28:44 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -197,6 +197,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -65,6 +65,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me // Check that some of our zanier calculations worked out as expected. #if ENABLE_TAG_FOR_MTE_CHECKED_PTR static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); 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 01c57fe8a78a..4b234571f964 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-11-13 06:36:34 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-01-18 21:28:44 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -333,9 +333,13 @@ void FreeFullPage(PartitionRoot<base::internal::Thread +@@ -366,9 +366,13 @@ void FreeFullSlotSpan(PartitionRoot<base::internal::Th } } @@ -15,7 +15,7 @@ EXPECT_EQ(0, mincore(ptr, SystemPageSize(), &ret)); return in_core == (ret & 1); } -@@ -344,7 +348,7 @@ bool CheckPageInCore(void* ptr, bool in_core) { +@@ -377,7 +381,7 @@ bool CheckPageInCore(void* ptr, bool in_core) { EXPECT_TRUE(CheckPageInCore(ptr, in_core)) #else #define CHECK_PAGE_IN_CORE(ptr, in_core) (void)(0) diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index f07b964997d3..747ffeeecfa4 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,4 +1,4 @@ ---- base/cpu.cc.orig 2020-11-13 06:36:34 UTC +--- base/cpu.cc.orig 2021-01-18 21:28:44 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ @@ -9,15 +9,6 @@ defined(OS_AIX) #include "base/containers/flat_set.h" #include "base/files/file_util.h" -@@ -31,7 +31,7 @@ - #endif - - #if defined(ARCH_CPU_ARM_FAMILY) && \ -- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) - #include "base/files/file_util.h" - #endif - @@ -182,6 +182,14 @@ std::string* CpuInfoBrand() { return brand; diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 66bf850fd83e..962c7386eaee 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-01-18 21:28:44 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper { +@@ -696,7 +696,11 @@ class SandboxSymbolizeHelper { // Skip regions with empty file names. continue; } diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc index 9905dc61e18e..c8a9a0b452d8 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_stub.cc.orig 2020-11-13 06:36:34 UTC +--- base/files/file_path_watcher_stub.cc.orig 2021-01-18 21:28:44 UTC +++ base/files/file_path_watcher_stub.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -22,17 +22,17 @@ @@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl bool Watch(const FilePath& path, - bool recursive, + Type type, const FilePathWatcher::Callback& callback) override { +#if defined(OS_BSD) + DCHECK(!impl_.get()); -+ if (recursive) { ++ if (type == Type::kRecursive) { + return false; + } else { + impl_ = std::make_unique<FilePathWatcherKQueue>(); + } + DCHECK(impl_.get()); -+ return impl_->Watch(path, recursive, callback); ++ return impl_->Watch(path, type, callback); +#else return false; +#endif 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 a54a03a1849e..0bf19b3df280 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-11-13 06:36:34 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-01-18 21:28:44 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -425,12 +425,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -438,12 +438,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -15,7 +15,7 @@ ASSERT_TRUE(base::DeleteFile(file1)); VLOG(1) << "Waiting for file1 deletion"; -@@ -632,7 +632,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) { +@@ -650,7 +650,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) { ASSERT_TRUE(WaitForEvents()); } @@ -24,7 +24,7 @@ // Verify that creating a symlink is caught. TEST_F(FilePathWatcherTest, CreateLink) { -@@ -790,7 +790,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { +@@ -816,7 +816,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { ASSERT_TRUE(WaitForEvents()); } @@ -33,7 +33,7 @@ enum Permission { Read, -@@ -798,7 +798,7 @@ enum Permission { +@@ -824,7 +824,7 @@ enum Permission { Execute }; @@ -42,7 +42,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -827,9 +827,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -853,9 +853,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -54,12 +54,12 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -864,7 +864,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -891,7 +891,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } -#endif // OS_APPLE +#endif // OS_APPLE || OS_BSD - } // namespace - } // namespace base + #if defined(OS_MAC) + diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index bf2c4dce52dd..9d65358e9cf3 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,4 +1,4 @@ ---- base/files/file_util.h.orig 2020-11-13 06:36:34 UTC +--- base/files/file_util.h.orig 2021-01-18 21:28:44 UTC +++ base/files/file_util.h @@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, @@ -17,7 +17,7 @@ #endif // OS_POSIX -@@ -592,7 +592,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -597,7 +597,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index 7c9c399872b9..53e25ed562e5 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/files/file_util_posix.cc.orig 2021-01-18 21:28:44 UTC +++ base/files/file_util_posix.cc -@@ -412,7 +412,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -406,7 +406,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { @@ -9,7 +9,7 @@ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -947,8 +947,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -953,8 +953,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si // space. It can fail because the filesystem doesn't support it. In that case, // use the manual method below. @@ -23,7 +23,7 @@ return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1172,7 +1176,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1178,7 +1182,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, // posix_fadvise() is only available in the Android NDK in API 21+. Older // versions may have the required kernel support, but don't have enough usage // to justify backporting. @@ -32,7 +32,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1208,7 +1212,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1214,7 +1218,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -41,7 +41,7 @@ // __ANDROID_API__ >= 21) } -@@ -1243,7 +1247,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1249,7 +1253,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP #endif // !defined(OS_NACL_NONSFI) @@ -50,7 +50,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1264,6 +1268,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1270,6 +1274,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } 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 5bec8bb9694e..5c955c9a7f2f 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-11-13 06:36:34 UTC +--- base/files/file_util_unittest.cc.orig 2021-01-18 21:28:44 UTC +++ base/files/file_util_unittest.cc -@@ -1639,7 +1639,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { +@@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { #endif } @@ -9,7 +9,7 @@ // This test will validate that files which would block when read result in a // failure on a call to ReadFileToStringNonBlocking. To accomplish this we will // use a named pipe because it appears as a file on disk and we can control how -@@ -1672,7 +1672,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { +@@ -1671,7 +1671,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { ASSERT_EQ(result.size(), 1u); EXPECT_EQ(result[0], 'a'); } @@ -18,7 +18,7 @@ TEST_F(FileUtilTest, MoveFileNew) { // Create a file -@@ -3507,7 +3507,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3506,7 +3506,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3525,7 +3525,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index ba15ad8b4ded..1503462f073b 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2020-11-13 06:36:34 UTC +--- base/i18n/icu_util.cc.orig 2021-01-18 21:28:44 UTC +++ base/i18n/icu_util.cc @@ -48,7 +48,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -9,8 +9,8 @@ ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -341,7 +341,7 @@ void InitializeIcuTimeZone() { - fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); +@@ -342,7 +342,7 @@ void InitializeIcuTimeZone() { + FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); -#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index 6978712eb3bc..3e6bae041cb9 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_iterator_freebsd.cc.orig 2021-01-18 21:28:45 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> @@ -20,6 +20,15 @@ // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { +@@ -50,7 +54,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* + } + } else { + // Got the list, just make sure we're sized exactly right +- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); ++ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); + kinfo_procs_.resize(num_of_kinfo_proc); + done = true; + } @@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc index 37f708f1d1f3..6fba502213d2 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_util_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_util_unittest.cc.orig 2021-01-18 21:28:45 UTC +++ base/process/process_util_unittest.cc -@@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli +@@ -1308,11 +1308,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 4e19767b60bf..9cfe26c9f8cb 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2020-11-13 06:36:34 UTC +--- base/system/sys_info.h.orig 2021-01-18 21:28:45 UTC +++ base/system/sys_info.h -@@ -202,6 +202,8 @@ class BASE_EXPORT SysInfo { +@@ -208,6 +208,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo { +@@ -217,7 +219,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index d77d55ffd491..02bec6b99962 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_unittest.cc.orig 2020-11-16 14:01:04 UTC +--- base/system/sys_info_unittest.cc.orig 2021-01-18 21:28:45 UTC +++ base/system/sys_info_unittest.cc @@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) { EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); @@ -24,18 +24,18 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD) - #if defined(OS_FUCHSIA) - // TODO(crbug.com/851734): Implementation depends on statvfs, which is not -@@ -117,7 +117,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfTotalDiskSpace) { - EXPECT_GT(SysInfo::AmountOfTotalDiskSpace(tmp_path), 0) << tmp_path.value(); + TEST_F(SysInfoTest, AmountOfFreeDiskSpace) { + // We aren't actually testing that it's correct, just that it's sane. +@@ -137,7 +137,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac } + #endif // defined(OS_FUCHSIA) -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { int32_t os_major_version = -1; -@@ -178,7 +178,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -198,7 +198,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index b19569faecac..84cc7d20576b 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- base/test/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ base/test/BUILD.gn -@@ -415,7 +415,11 @@ if (is_linux || is_chromeos) { +@@ -416,7 +416,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] 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 f688a93a4820..356c0291d387 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2020-11-13 06:36:34 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-01-18 21:28:45 UTC +++ base/test/launcher/test_launcher.cc -@@ -58,6 +58,7 @@ +@@ -57,6 +57,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,7 +8,7 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" -@@ -588,7 +589,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -598,7 +599,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) { results_tracker_.AddGlobalTag("OS_IOS"); #endif diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index 4a1997aa7402..975180f95adb 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/threading/platform_thread_unittest.cc.orig 2021-01-18 21:28:45 UTC +++ base/threading/platform_thread_unittest.cc -@@ -311,7 +311,7 @@ TEST(PlatformThreadTest, +@@ -312,7 +312,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanIncreaseThreadPriority) { @@ -9,7 +9,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -405,9 +405,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -406,9 +406,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 411d0893d684..c38c4a9ad7d3 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2020-11-13 06:36:34 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-01-18 21:28:45 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -132,6 +134,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -163,6 +165,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index f7ca678e981c..39523ac96cf1 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2020-11-13 06:36:34 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-01-18 21:28:45 UTC +++ base/trace_event/process_memory_dump.cc -@@ -95,7 +95,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -100,7 +100,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 18dad57ca637..7ea45f213a28 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,15 +1,6 @@ ---- build/config/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- build/config/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ build/config/BUILD.gn -@@ -133,7 +133,7 @@ config("debug") { - # builds, and we have to tell it to turn it off. - defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] - } -- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) { -+ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { - # Enable libstdc++ debugging facilities to help catch problems early, see - # http://crbug.com/65151 . - # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -231,9 +231,7 @@ config("default_libs") { +@@ -232,9 +232,7 @@ config("default_libs") { ] } else if (is_linux || is_chromeos) { libs = [ @@ -19,7 +10,7 @@ ] } } -@@ -316,7 +314,7 @@ config("executable_config") { +@@ -317,7 +315,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index e38336dcdf13..e013fead44a4 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,19 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2020-11-13 06:36:34 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-01-18 21:28:45 UTC +++ build/config/BUILDCONFIG.gn -@@ -131,10 +131,10 @@ declare_args() { - is_official_build = false - - # Whether we're a traditional desktop unix. -- is_desktop_linux = current_os == "linux" -+ is_desktop_linux = current_os == "linux" || current_os == "freebsd" - - # Set to true when compiling with the Clang compiler. -- is_clang = current_os != "linux" || -+ is_clang = current_os != "linux" || current_os == "freebsd" || - (current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64") -@@ -186,8 +186,8 @@ if (host_toolchain == "") { +@@ -183,8 +183,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -24,7 +11,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -224,7 +224,7 @@ if (target_os == "android") { +@@ -221,7 +221,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -33,7 +20,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -285,10 +285,11 @@ if (custom_toolchain != "") { +@@ -282,10 +282,11 @@ if (custom_toolchain != "") { # current_os value directly. is_android = current_os == "android" diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index fc8c2c97e48c..285441131a4a 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-11-13 06:36:34 UTC +--- build/config/compiler/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ build/config/compiler/BUILD.gn -@@ -128,7 +128,7 @@ declare_args() { +@@ -129,7 +129,7 @@ declare_args() { # # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may # call an old clang that doesn't support auto-init. @@ -17,8 +17,8 @@ + if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } - if (fatal_linker_warnings && is_apple && -@@ -389,7 +389,7 @@ config("compiler") { + if (fatal_linker_warnings && is_apple) { +@@ -387,7 +387,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", -@@ -480,7 +480,7 @@ config("compiler") { +@@ -478,7 +478,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ -@@ -776,7 +776,7 @@ config("compiler_cpu_abi") { +@@ -777,7 +777,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" ] } -@@ -1129,7 +1129,7 @@ config("compiler_deterministic") { +@@ -1127,7 +1127,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1512,7 +1512,7 @@ config("default_warnings") { +@@ -1510,7 +1510,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1686,7 +1686,7 @@ config("no_chromium_code") { +@@ -1685,7 +1685,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -72,7 +72,7 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1764,7 +1764,7 @@ config("thin_archive") { +@@ -1763,7 +1763,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). @@ -81,7 +81,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2297,7 +2297,7 @@ config("symbols") { +@@ -2317,7 +2317,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) { @@ -90,7 +90,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2339,7 +2339,7 @@ config("symbols") { +@@ -2349,7 +2349,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_apple && !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 b49ed2337d43..01a145600471 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2020-11-13 06:36:34 UTC +--- build/config/compiler/compiler.gni.orig 2021-01-18 21:28:45 UTC +++ build/config/compiler/compiler.gni -@@ -192,7 +192,7 @@ declare_args() { +@@ -196,7 +196,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-ui_ozone_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index 770d40dad741..d49986fdb240 100644 --- a/www/chromium/files/patch-ui_ozone_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,5 +1,5 @@ ---- ui/ozone/ozone.gni.orig 2020-11-16 15:29:43 UTC -+++ ui/ozone/ozone.gni +--- build/config/ozone.gni.orig 2021-01-18 21:28:45 UTC ++++ build/config/ozone.gni @@ -69,6 +69,9 @@ declare_args() { ozone_platform = "x11" ozone_platform_drm = true @@ -7,6 +7,6 @@ + } else if (is_bsd) { + ozone_platform = "x11" + ozone_platform_x11 = true - } else if (is_desktop_linux) { + } else if (is_linux) { ozone_platform = "x11" ozone_platform_wayland = true diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 1cf6de3f5faa..5ee773afacd4 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-11-13 06:36:34 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-01-18 21:28:45 UTC +++ build/toolchain/gcc_toolchain.gni @@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -641,13 +646,23 @@ template("clang_toolchain") { +@@ -626,13 +631,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index 24073ea8f674..d979167d0891 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/toolchain/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ build/toolchain/linux/BUILD.gn -@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { +@@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { } clang_toolchain("clang_arm64") { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index ddeec9370073..f2fa2bb72414 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-11-13 06:36:34 UTC +--- cc/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ cc/BUILD.gn -@@ -615,7 +615,7 @@ cc_test_static_library("test_support") { +@@ -620,7 +620,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -824,7 +824,6 @@ cc_test("cc_unittests") { +@@ -832,7 +832,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc index 9e1df01e2f56..fa16b79f9b18 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,6 +1,6 @@ ---- cc/test/layer_tree_test.cc.orig 2020-11-13 06:36:34 UTC +--- cc/test/layer_tree_test.cc.orig 2021-01-18 21:28:45 UTC +++ cc/test/layer_tree_test.cc -@@ -669,7 +669,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -676,7 +676,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 8e7377fb50a9..59dd074602c3 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-11-13 06:36:34 UTC +--- cc/trees/property_tree.cc.orig 2021-01-18 21:28:45 UTC +++ cc/trees/property_tree.cc -@@ -1285,13 +1285,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1295,13 +1295,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_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 00783fba5d2d..58f9f142dd90 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2020-11-16 16:03:08 UTC +--- chrome/BUILD.gn.orig 2021-01-18 21:28:45 UTC +++ chrome/BUILD.gn -@@ -1214,6 +1214,10 @@ group("browser_dependencies") { +@@ -1227,6 +1227,10 @@ group("browser_dependencies") { public_deps += [ "//chromeos/lacros" ] } diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index d1904bdbb5cf..7fb979ceda4b 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-11-13 06:36:35 UTC +--- chrome/app/BUILD.gn.orig 2021-01-18 21:28:46 UTC +++ chrome/app/BUILD.gn -@@ -140,7 +140,7 @@ static_library("test_support") { +@@ -143,7 +143,7 @@ static_library("test_support") { "//v8:v8_headers", ] diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index d40216695f0b..a5a64acdbed4 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,17 +1,17 @@ ---- chrome/app/chrome_main.cc.orig 2020-11-13 06:36:35 UTC +--- chrome/app/chrome_main.cc.orig 2021-01-18 21:28:46 UTC +++ chrome/app/chrome_main.cc -@@ -109,12 +109,12 @@ int ChromeMain(int argc, const char** argv) { +@@ -119,12 +119,12 @@ int ChromeMain(int argc, const char** argv) { + MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) if (command_line->HasSwitch(switches::kHeadless)) { return headless::HeadlessShellMain(params); } - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || -- // defined(OS_WIN) -+ // defined(OS_WIN) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || + // defined(OS_WIN) int rv = content::ContentMain(params); - 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 e1ea6214cf7a..0fafceb8d9ce 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,15 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-11-13 06:36:35 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-01-18 21:28:46 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -108,7 +108,7 @@ - #include "chrome/app/shutdown_signal_handlers_posix.h" - #endif - --#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) - #include "components/nacl/common/nacl_paths.h" - #include "components/nacl/zygote/nacl_fork_delegate_linux.h" - #endif -@@ -147,12 +147,12 @@ +@@ -148,12 +148,12 @@ #include "v8/include/v8.h" #endif @@ -24,12 +15,12 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -258,7 +258,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; @@ -38,7 +29,7 @@ base::AdjustOOMScore(base::GetCurrentProcId(), score); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. @@ -49,7 +40,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -339,7 +339,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -338,7 +338,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +49,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -349,7 +349,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -348,7 +348,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +58,7 @@ #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -402,7 +402,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +67,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. -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,7 +76,7 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -486,7 +486,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ @@ -94,16 +85,16 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -705,7 +705,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -709,7 +709,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -716,7 +716,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -720,7 +720,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,16 +103,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -744,7 +744,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - #if defined(OS_CHROMEOS) - chromeos::RegisterPathProvider(); - #endif --#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) - nacl::RegisterPathProvider(); - #endif - -@@ -924,7 +924,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,7 +112,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -937,7 +937,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -941,7 +941,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -139,7 +121,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1056,7 +1056,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -148,7 +130,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1077,7 +1077,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1079,7 +1079,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -157,16 +139,16 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1097,7 +1097,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1099,7 +1099,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. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1139,7 +1139,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1141,7 +1141,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -175,21 +157,21 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1167,7 +1167,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1169,7 +1169,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if defined(OS_CHROMEOS) -@@ -1204,7 +1204,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1206,7 +1206,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) content::ContentClient* ChromeMainDelegate::CreateContentClient() { return &chrome_content_client_; diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index cda37d0c9fd8..e5745e5079f8 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-11-13 06:36:35 UTC +--- chrome/app/generated_resources.grd.orig 2021-01-18 21:28:46 UTC +++ chrome/app/generated_resources.grd -@@ -5245,7 +5245,7 @@ Keep your key file in a safe place. You will need it t +@@ -5263,7 +5263,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> -@@ -7236,7 +7236,7 @@ the Bookmarks menu."> +@@ -7269,7 +7269,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> -@@ -8212,7 +8212,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8257,7 +8257,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp new file mode 100644 index 000000000000..a4943a16b491 --- /dev/null +++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp @@ -0,0 +1,11 @@ +--- chrome/app/profiles_strings.grdp.orig 2021-01-20 14:08:57 UTC ++++ chrome/app/profiles_strings.grdp +@@ -87,7 +87,7 @@ + Add Profile... + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile."> + Add profile... + </message> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 3c4b4a7a0881..aa17c38055a6 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/BUILD.gn.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/BUILD.gn -@@ -4999,7 +4999,7 @@ static_library("browser") { +@@ -5161,7 +5161,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 fced5539e0f5..fb03e7cab0b9 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2020-11-16 14:15:55 UTC +--- chrome/browser/about_flags.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/about_flags.cc -@@ -881,7 +881,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -188,7 +188,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/native_theme/native_theme_features.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "base/allocator/buildflags.h" + #endif + +@@ -886,7 +886,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -9,7 +18,7 @@ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1231,7 +1231,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP +@@ -1236,7 +1236,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP }, }; @@ -17,8 +26,8 @@ +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) - const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { -@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureVariation +@@ -2869,7 +2869,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, #endif // OS_CHROMEOS @@ -27,7 +36,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -2873,7 +2873,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2885,7 +2885,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -36,23 +45,7 @@ { "disable-accelerated-video-encode", flag_descriptions::kAcceleratedVideoEncodeName, -@@ -2979,13 +2979,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kForceEnableDevicesPageName, - flag_descriptions::kForceEnableDevicesPageDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kForceEnableDevicesPage)}, --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - {"enable-webgl2-compute-context", - flag_descriptions::kWebGL2ComputeContextName, - flag_descriptions::kWebGL2ComputeContextDescription, - kOsWin | kOsLinux | kOsCrOS, - SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)}, --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - {"enable-webgl-draft-extensions", - flag_descriptions::kWebglDraftExtensionsName, - flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -3182,7 +3182,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID @@ -61,16 +54,16 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3192,7 +3192,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableNavigationPredictorDescription, - kOsCrOS | kOsLinux, - FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, +@@ -3222,7 +3222,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableNavigationPredictorRendererWarmupName, + flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription, + kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)}, -#endif // OS_CHROMEOS || OS_LINUX +#endif // OS_CHROMEOS || OS_LINUX || OS_BSD {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3990,7 +3990,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3977,7 +3977,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -79,7 +72,7 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4067,7 +4067,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4054,7 +4054,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths, kOmniboxBookmarkPathsVariations, "OmniboxBundledExperimentV1")}, @@ -88,7 +81,7 @@ // defined(OS_WIN) {"enable-speculative-service-worker-start-on-query-input", -@@ -4376,14 +4376,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4344,14 +4344,14 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -105,7 +98,7 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -114,7 +107,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5100,7 +5100,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5060,7 +5060,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -123,16 +116,16 @@ // defined(OS_CHROMEOS) {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5687,7 +5687,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(autofill::features::kAutofillTouchToFill)}, - #endif // defined(OS_ANDROID) +@@ -5643,7 +5643,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5684,7 +5684,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -141,7 +134,7 @@ // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -5914,7 +5914,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5861,7 +5861,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kEnablePasswordsAccountStorage)}, @@ -150,7 +143,7 @@ defined(OS_CHROMEOS) {"passwords-account-storage-iph", flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -5922,7 +5922,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5869,7 +5869,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, @@ -159,7 +152,7 @@ // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6655,7 +6655,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6602,7 +6602,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, #endif @@ -168,19 +161,20 @@ defined(OS_CHROMEOS) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6689,13 +6689,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6636,14 +6636,14 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)}, #endif // !defined(OS_ANDROID) --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) {"enable-ephemeral-guest-profiles-on-desktop", flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, kOsWin | kOsLinux | kOsMac, FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || + // defined(OS_MAC) #if defined(OS_ANDROID) - {"decouple-sync-from-android-auto-sync", diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 5d4e1b1a1d9a..47359ed2aa2e 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -86,7 +86,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -87,7 +87,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { @@ -9,7 +9,7 @@ // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. -@@ -99,7 +99,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -100,7 +100,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch shell_integration::GetApplicationNameForProtocol(url); return application_name.empty() ? metrics::OmniboxInputType::EMPTY : metrics::OmniboxInputType::URL; 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 f8c604310dfc..13bd7d24719b 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-11-13 06:36:36 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -849,7 +849,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -850,7 +850,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 f964e5bca392..45fb9150fab2 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,7 +1,7 @@ ---- chrome/browser/browser_resources.grd.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/browser_resources.grd.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/browser_resources.grd -@@ -67,7 +67,7 @@ - <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" use_base_dir="false" type="BINDATA" /> +@@ -78,7 +78,7 @@ + <include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" /> </if> - <if expr="is_win or is_macosx or (is_linux and not chromeos)"> 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 53ba6f36a598..d6f8b88eb625 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,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -128,7 +128,7 @@ +@@ -135,7 +135,7 @@ #include "media/mojo/mojom/speech_recognition_service.mojom.h" #endif @@ -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" -@@ -733,7 +733,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -775,7 +775,7 @@ void PopulateChromeWebUIFrameBinders( } #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 1bd2c375e286..34b9ba7f1f22 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-11-13 06:36:36 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -246,7 +246,7 @@ +@@ -247,7 +247,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -925,7 +925,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -926,7 +926,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -18,7 +18,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 . -@@ -934,7 +934,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -956,7 +956,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -957,7 +957,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #endif // defined(OS_MAC) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1113,6 +1113,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1114,6 +1114,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -44,7 +44,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1120,6 +1121,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1121,6 +1122,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index eca704213545..f326832f6045 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-11-13 06:36:36 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -424,7 +424,7 @@ +@@ -432,7 +432,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" -@@ -482,7 +482,7 @@ +@@ -490,7 +490,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -514,7 +514,7 @@ +@@ -522,7 +522,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -833,11 +833,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -849,11 +849,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -41,25 +41,25 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1354,7 +1356,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1378,7 +1380,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( - parameters, startup_data_); + parameters, &startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) main_parts = - std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); + std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1380,7 +1382,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( - // Construct additional browser parts. Stages are called in the order in - // which they are added. - #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +@@ -1407,7 +1409,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + #if BUILDFLAG(IS_LACROS) + main_parts->AddParts( + std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2134,7 +2136,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2168,7 +2170,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -68,7 +68,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3728,7 +3730,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3725,7 +3727,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -77,7 +77,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3763,7 +3765,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3760,7 +3762,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -86,16 +86,16 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3852,7 +3854,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri +@@ -3848,7 +3850,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (startup_data_) { - auto* chrome_feature_list_creator = - startup_data_->chrome_feature_list_creator(); -@@ -4094,7 +4096,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + auto* chrome_feature_list_creator = + startup_data_.chrome_feature_list_creator(); + // This has to run very early before ServiceManagerContext is created. +@@ -4083,7 +4085,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index c8a20014a154..2ae6632fbd5a 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -165,7 +165,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 5a6f0ae78a96..43e7a724148a 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-11-13 06:36:36 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1393,7 +1393,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1400,7 +1400,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 -@@ -1445,7 +1445,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1453,7 +1453,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { @@ -18,3 +18,12 @@ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); +@@ -1549,7 +1549,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow + bool content_initiated, + content::CheckDownloadAllowedCallback check_download_allowed_cb) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) + // Don't download pdf if it is a file URL, as that might cause an infinite + // download loop if Chrome is not the system pdf viewer. diff --git a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn new file mode 100644 index 000000000000..3098fc8c7046 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn @@ -0,0 +1,42 @@ +--- chrome/browser/error_reporting/BUILD.gn.orig 2021-01-19 12:11:56 UTC ++++ chrome/browser/error_reporting/BUILD.gn +@@ -22,6 +22,13 @@ static_library("error_reporting") { + "//services/network:network_service", + "//services/network/public/cpp", + ] ++ ++ if (is_bsd) { ++ deps -= [ ++ "//components/crash/content/browser/error_reporting", ++ "//components/crash/core/app", ++ ] ++ } + } + + source_set("test_support") { +@@ -35,6 +42,12 @@ source_set("test_support") { + "//base", + "//components/crash/content/browser/error_reporting:mock_crash_endpoint", + ] ++ ++ if (is_bsd) { ++ deps -= [ ++ "//components/crash/content/browser/error_reporting:mock_crash_endpoint", ++ ] ++ } + } + + source_set("unit_test") { +@@ -52,4 +65,12 @@ source_set("unit_test") { + "//net:test_support", + "//testing/gtest", + ] ++ ++ if (is_bsd) { ++ deps -= [ ++ "//components/crash/content/browser/error_reporting", ++ "//components/crash/content/browser/error_reporting:mock_crash_endpoint", ++ "//components/crash/core/app", ++ ] ++ } + } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 20751e79fc3b..2d6ff3f86733 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1219,6 +1219,12 @@ static_library("extensions") { +@@ -1233,6 +1233,12 @@ static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 2ff400204851..02ba7ca0e7b0 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,9 +1,9 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-01-18 21:28:49 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -47,7 +47,11 @@ - #include "extensions/browser/extensions_browser_client.h" +@@ -49,7 +49,11 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" + #include "extensions/common/mojom/renderer.mojom.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else 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 27d41ae412f1..72a1313efa83 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -226,7 +226,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -238,7 +238,7 @@ base::FilePath GetEndpointVerificationDir() { return *GetEndpointVerificationDirOverride(); #if defined(OS_WIN) if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) @@ -18,7 +18,7 @@ std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -237,7 +237,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -249,7 +249,7 @@ base::FilePath GetEndpointVerificationDir() { if (true) #endif return path; 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 index 101f5825aa6c..ba7cf1f62692 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -277,7 +277,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -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. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 0a77345fbfb5..672c3ce67a76 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -179,7 +179,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // Appearance settings. (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 6ada7b6132d6..bda3866c4958 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -56,13 +56,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -55,13 +55,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel bool force_first_run, bool no_first_run); diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index a4ca410854a5..06233854a178 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,25 +1,15 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/flag_descriptions.cc -@@ -4549,15 +4549,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -4609,7 +4609,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute"; - const char kWebGL2ComputeContextDescription[] = - "Enable the use of WebGL 2.0 Compute API."; - --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4601,17 +4601,17 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4653,17 +4653,17 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -40,7 +30,7 @@ // defined(OS_CHROMEOS) #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) -@@ -4623,14 +4623,14 @@ const char kWebContentsOcclusionDescription[] = +@@ -4675,14 +4675,14 @@ const char kWebContentsOcclusionDescription[] = #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) @@ -57,18 +47,19 @@ #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) const char kUserDataSnapshotName[] = "Enable user data snapshots"; -@@ -4646,12 +4646,12 @@ const char kWebShareDescription[] = +@@ -4698,13 +4698,13 @@ const char kWebShareDescription[] = "platforms."; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) const char kEnableEphemeralGuestProfilesOnDesktopName[] = "Enable ephemeral Guest profiles on Desktop"; const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || + // defined(OS_MAC) // Feature flags -------------------------------------------------------------- - diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 64f7528768d8..70902c3e7489 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,4 +1,4 @@ ---- chrome/browser/flag_descriptions.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/flag_descriptions.h @@ -19,9 +19,9 @@ #include "ppapi/buildflags/buildflags.h" @@ -12,25 +12,16 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2646,14 +2646,14 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2699,7 +2699,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - extern const char kWebGL2ComputeContextName[]; - extern const char kWebGL2ComputeContextDescription[]; - --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2680,7 +2680,7 @@ extern const char kRemoteCopyProgressNotificationDescr +@@ -2726,7 +2726,7 @@ extern const char kRemoteCopyProgressNotificationDescr extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; @@ -39,7 +30,7 @@ // defined(OS_CHROMEOS) #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) -@@ -2690,12 +2690,12 @@ extern const char kWebContentsOcclusionDescription[]; +@@ -2736,12 +2736,12 @@ extern const char kWebContentsOcclusionDescription[]; #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) @@ -54,16 +45,17 @@ #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) extern const char kUserDataSnapshotName[]; -@@ -2707,10 +2707,10 @@ extern const char kWebShareName[]; +@@ -2753,11 +2753,11 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) extern const char kEnableEphemeralGuestProfilesOnDesktopName[]; extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[]; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_MAC) // Feature flags -------------------------------------------------------------- - 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 74d70e1d8bc0..208ca0daeeaf 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 2020-11-13 06:36:37 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -50,7 +50,9 @@ +@@ -52,7 +52,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" -@@ -59,7 +61,7 @@ +@@ -61,7 +63,7 @@ #include "ui/base/ui_base_features.h" #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 665250477f3c..56b456672897 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-11-13 06:36:37 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -685,11 +685,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -696,11 +696,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MAC) || \ 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 712b6da45013..8f7295bcca48 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -496,7 +496,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -497,7 +497,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / kKiB); #endif -@@ -519,7 +519,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -520,7 +520,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / kKiB); diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc index 34eb6cc1c96c..e8aa98c2da4e 100644 --- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -138,7 +138,7 @@ const struct { +@@ -143,7 +143,7 @@ const struct { {base::DIR_APP_DATA, nullptr, kBlockAllChildren}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren}, #endif diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 9a40f6e5a6a2..afed6828fa4c 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -77,11 +77,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -14,9 +14,9 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -140,10 +140,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut - auth_dynamic_params->enable_negotiate_port = - local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); +@@ -142,10 +142,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + auth_dynamic_params->basic_over_http_enabled = + local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -27,8 +27,8 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -356,10 +356,10 @@ SystemNetworkContextManager::SystemNetworkContextManag - pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, +@@ -360,10 +360,10 @@ SystemNetworkContextManager::SystemNetworkContextManag + pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -406,10 +406,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -411,10 +411,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -492,7 +492,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -506,7 +506,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_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index bd2c3b45ccba..841884f60f2d 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -29,7 +29,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" @@ -9,7 +9,7 @@ defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" -@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer +@@ -63,7 +63,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -18,7 +18,7 @@ registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); #endif } -@@ -72,7 +72,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -78,7 +78,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc new file mode 100644 index 000000000000..880d5c7e1983 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -0,0 +1,11 @@ +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-01-19 11:25:20 UTC ++++ chrome/browser/notifications/notification_platform_bridge_delegator.cc +@@ -55,7 +55,7 @@ bool NativeNotificationsEnabled(Profile* profile) { + return true; + #elif defined(OS_WIN) + return NotificationPlatformBridgeWin::NativeNotificationEnabled(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + if (profile) { + // Prefs take precedence over flags. + PrefService* prefs = profile->GetPrefs(); 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 ff640ce7d221..73a160aa0a8e 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-11-13 06:36:37 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -98,7 +98,11 @@ +@@ -99,7 +99,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 1c56fbbb06f3..3961c25d2a66 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,7 +1,7 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -188,7 +188,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - network_context_getter); +@@ -171,7 +171,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + network_context_getter); #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) 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 index b34557dd2b0d..cf811f1a48e3 100644 --- a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc +++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2159,7 +2159,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT +@@ -2192,7 +2192,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT // Runs `action` and checks the Linux selection clipboard contains `expected`. void DoActionAndCheckSelectionClipboard(base::OnceClosure action, const std::string& expected) { diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc new file mode 100644 index 000000000000..63f71da34584 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-01-19 11:25:47 UTC ++++ chrome/browser/performance_manager/policies/policy_features.cc +@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage + + const base::Feature kUrgentDiscardingFromPerformanceManager{ + "UrgentDiscardingFromPerformanceManager", +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc index 4665a7ee3008..ea664315e958 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/plugins/plugin_info_host_impl.cc -@@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( +@@ -380,7 +380,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { if (cus_plugin_info) { output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; 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 0715ada218cc..8febb778ebac 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-11-13 06:36:37 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1248,11 +1248,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1231,11 +1231,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1302,11 +1302,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1279,11 +1279,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_SPELLCHECK) diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 39960e2ed591..24ef044f429a 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2020-11-16 14:22:12 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/policy/device_management_service_configuration.cc @@ -18,7 +18,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_manager.h" #endif -@@ -86,7 +86,7 @@ std::string DeviceManagementServiceConfiguration::GetR +@@ -95,7 +95,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo std::string DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl() { #if defined(OS_WIN) || defined(OS_MAC) || \ 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 a13aef2a4f6a..beb84f618c6e 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-11-13 06:36:37 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -379,7 +379,7 @@ +@@ -382,7 +382,7 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -976,7 +976,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1012,7 +1012,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 313bbc7a2f2d..c9c613035e8d 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -135,7 +135,7 @@ const char* const kPersistentPrefNames[] = { +@@ -136,7 +136,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif 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 2ceb167d42ff..58c178088b70 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -304,7 +304,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -319,7 +319,7 @@ void ChromeBrowserMainExtraPartsProfiles:: media_router::MediaRouterUIServiceFactory::GetInstance(); #endif #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile.cc b/www/chromium/files/patch-chrome_browser_profiles_profile.cc new file mode 100644 index 000000000000..4c8fd4448a54 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc @@ -0,0 +1,11 @@ +--- chrome/browser/profiles/profile.cc.orig 2021-01-19 11:26:11 UTC ++++ chrome/browser/profiles/profile.cc +@@ -387,7 +387,7 @@ bool Profile::IsIncognitoProfile() const { + + // static + bool Profile::IsEphemeralGuestProfileEnabled() { +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) + return base::FeatureList::IsEnabled( + features::kEnableEphemeralGuestProfilesOnDesktop); 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 7da8fb14299f..f6b59e998304 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-11-13 06:36:37 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -166,7 +166,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -158,7 +158,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_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc new file mode 100644 index 000000000000..522081927248 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -0,0 +1,11 @@ +--- chrome/browser/profiles/profiles_state.cc.orig 2021-01-19 11:26:28 UTC ++++ chrome/browser/profiles/profiles_state.cc +@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) { + bool IsGuestModeRequested(const base::CommandLine& command_line, + PrefService* local_state, + bool show_warning) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_MAC) + DCHECK(local_state); + 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 682cd5b87417..8c9310106ba3 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-11-13 06:36:37 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2077,7 +2077,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2085,7 +2085,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index cff0cfde0031..709bd4d86e22 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-01-18 21:28:50 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -34,7 +34,7 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -164,7 +164,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -153,7 +153,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -183,7 +183,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #endif diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index e6c143f662d7..39e05c8ddba0 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -676,7 +676,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc index 56b63ca0ccf2..5be8db6d33dc 100644 --- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc +++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -1,7 +1,7 @@ ---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/search/search_suggest/search_suggest_service.cc @@ -21,7 +21,11 @@ - #include "components/prefs/scoped_user_pref_update.h" + #include "components/search/ntp_features.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 91f46393f627..4d1a0b5802ad 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/signin/signin_util.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/signin/signin_util.cc -@@ -34,7 +34,7 @@ +@@ -33,7 +33,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "ui/base/l10n/l10n_util.h" 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 25b558a9f5ac..4dc0568e821d 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -458,7 +458,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -470,7 +470,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. @@ -9,7 +9,7 @@ // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY) && GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { -@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -479,7 +479,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_device__info__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc new file mode 100644 index 000000000000..d42df1b06cf7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc @@ -0,0 +1,17 @@ +--- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-01-19 11:26:56 UTC ++++ chrome/browser/sync/device_info_sync_service_factory.cc +@@ -42,12 +42,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo + std::string GetSigninScopedDeviceId() const override { + // Since the local sync backend is currently only supported on Windows, Mac and + // Linux don't even check the pref on other os-es. +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + syncer::SyncPrefs prefs(profile_->GetPrefs()); + if (prefs.IsLocalSyncEnabled()) { + return "local_device"; + } +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + return GetSigninScopedDeviceIdForProfile(profile_); + } diff --git a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc new file mode 100644 index 000000000000..7f9ece9d002b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-01-19 11:27:21 UTC ++++ chrome/browser/sync/profile_sync_service_factory.cc +@@ -202,7 +202,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI + + // Only check the local sync backend pref on the supported platforms of + // Windows, Mac and Linux. +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + syncer::SyncPrefs prefs(profile->GetPrefs()); + local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); + UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); +@@ -220,7 +220,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI + + init_params.start_behavior = syncer::ProfileSyncService::AUTO_START; + } +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + if (!local_sync_backend_enabled) { + // Always create the GCMProfileService instance such that we can listen to diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 0b814894d31e..c1b26ea14dec 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-11-13 06:36:37 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/BUILD.gn -@@ -615,12 +615,15 @@ static_library("ui") { +@@ -610,12 +610,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 87622229ba37..0115dc7feccd 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-11-17 18:39:17 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -82,7 +82,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 -@@ -246,7 +246,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -247,7 +247,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 = -@@ -473,7 +473,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -477,7 +477,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -940,7 +940,7 @@ void BrowserCommandController::InitCommandState() { +@@ -951,7 +951,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 deleted file mode 100644 index 6f5dea3b1228..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-11-13 06:36:38 UTC -+++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -274,7 +274,7 @@ bool CanOpenProfileOnStartup(Profile* profile) { - // true, send a warning if guest mode is requested but not allowed by policy. - bool IsGuestModeEnforced(const base::CommandLine& command_line, - bool show_warning) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_MAC) - PrefService* service = g_browser_process->local_state(); - DCHECK(service); 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 adef229813ab..79d52bc86f1d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -146,7 +146,7 @@ +@@ -149,7 +149,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -398,11 +398,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -409,11 +409,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc new file mode 100644 index 000000000000..2ec423585b2e --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-01-19 11:28:04 UTC ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc +@@ -19,7 +19,7 @@ + #include "ui/gfx/image/image_skia.h" + #include "ui/views/widget/widget.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/browser/shell_integration_linux.h" + #endif + +@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni + const AppWindow::CreateParams& create_params, + views::Widget::InitParams* init_params, + views::Widget* widget) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + std::string app_name = + web_app::GenerateApplicationNameFromAppId(app_window()->extension_id()); + // Set up a custom WM_CLASS for app windows. This allows task switchers in +@@ -66,7 +66,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni + init_params->wm_class_class = shell_integration_linux::GetProgramClassClass(); + const char kX11WindowRoleApp[] = "app"; + init_params->wm_role_name = std::string(kX11WindowRoleApp); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + ChromeNativeAppWindowViews::OnBeforeWidgetInit(create_params, init_params, + widget); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 91e548894e4e..94dfc0162a66 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -18,7 +18,7 @@ // This connector is used in ui_devtools's TracingAgent to hook up with the // tracing service. -@@ -114,7 +114,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -115,7 +115,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); @@ -27,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -145,7 +145,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -146,7 +146,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); 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 85c8bb8ae076..31392d6aa2e3 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-11-13 06:36:38 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1474,7 +1474,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -1506,7 +1506,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating void BrowserView::TabDraggingStatusChanged(bool is_dragging) { // TODO(crbug.com/1110266): Remove explicit OS_CHROMEOS check once OS_LINUX // CrOS cleanup is done. @@ -9,7 +9,7 @@ contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get -@@ -1854,7 +1854,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1887,7 +1887,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 554e68d84e0d..35a03cd03e8d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -49,7 +49,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -657,7 +657,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const { +@@ -659,7 +659,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const { } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index ee1036f6e65d..c5a6f0a4e23d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -421,7 +421,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -425,7 +425,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index f2f4d79efeac..18e668b1ea58 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -571,7 +571,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -576,7 +576,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index d7fa4004d710..f12761d8fcef 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-11-13 06:36:38 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -445,7 +445,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -446,7 +446,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()); -@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -896,7 +896,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 +@@ -2088,7 +2088,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc index 7bdf932fe9ad..1e35b5c85fa3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc.orig 2020-11-16 14:24:34 UTC +--- chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc -@@ -34,7 +34,7 @@ +@@ -42,7 +42,7 @@ namespace { 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 c8f191f9c109..51b097e7b129 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,15 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-01-18 21:28:51 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -246,12 +246,12 @@ +@@ -241,7 +241,7 @@ + #include "chrome/browser/ui/webui/app_launcher_page_ui.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "chrome/browser/ui/webui/webui_js_exception/webui_js_exception_ui.h" + #endif + +@@ -262,12 +262,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -15,7 +24,7 @@ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -425,7 +425,7 @@ bool IsAboutUI(const GURL& url) { +@@ -473,7 +473,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -24,7 +33,16 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -816,7 +816,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -808,7 +808,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + } + #endif // !defined(OFFICIAL_BUILD) + #endif // defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (url.host_piece() == chrome::kChromeUIWebUIJsExceptionHost) + return &NewWebUI<WebUIJsExceptionUI>; + #endif +@@ -876,7 +876,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -33,7 +51,7 @@ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; -@@ -865,19 +865,19 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -920,19 +920,19 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 4faf02b48592..9563b5d178dc 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-11-13 06:36:38 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -335,7 +335,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -341,7 +341,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_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc index c3155f6ef9b4..098790bb86bf 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/browser/web_applications/components/web_app_shortcut.cc -@@ -34,7 +34,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { #if defined(OS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 5019b7a909c9..71d13e7afb67 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-11-13 06:36:38 UTC +--- chrome/common/BUILD.gn.orig 2021-01-18 21:28:52 UTC +++ chrome/common/BUILD.gn -@@ -250,6 +250,10 @@ +@@ -247,6 +247,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } @@ -10,8 +10,8 @@ + if (enable_extensions) { sources += [ - "cast_messages.cc", -@@ -487,7 +491,7 @@ + "extensions/api/commands/commands_handler.cc", +@@ -480,13 +484,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } @@ -20,7 +20,6 @@ sources += [ "auto_start_linux.cc", "auto_start_linux.h", -@@ -496,6 +500,14 @@ "multi_process_lock_linux.cc", ] deps += [ "//sandbox/linux:sandbox_services" ] diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 5e39098d9c4f..da8ebf0e7946 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/common/chrome_features.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_features.cc @@ -96,13 +96,13 @@ const base::Feature kAsyncDns { #endif @@ -16,18 +16,19 @@ #if defined(OS_CHROMEOS) // Enable Borealis on Chrome OS. -@@ -337,12 +337,12 @@ const base::Feature kEnableAmbientAuthenticationInInco - "EnableAmbientAuthenticationInIncognito", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -343,13 +343,13 @@ const base::Feature kEarlyLibraryLoad{"EarlyLibraryLoa + const base::Feature kEnableAllSystemWebApps{"EnableAllSystemWebApps", + base::FEATURE_DISABLED_BY_DEFAULT}; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) COMPONENT_EXPORT(CHROME_FEATURES) // Enables ephemeral Guest profiles on desktop. extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{ "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || + // defined(OS_MAC) #if defined(OS_WIN) - // Enables users to create a desktop shortcut for incognito mode. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 5d4404baffc3..31705c7b1355 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2020-11-13 06:36:38 UTC +--- chrome/common/chrome_features.h.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_features.h @@ -82,10 +82,10 @@ extern const base::Feature kAppShimNewCloseBehavior; @@ -13,16 +13,17 @@ #if defined(OS_CHROMEOS) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -214,10 +214,10 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -227,11 +227,11 @@ extern const base::Feature kEnableAmbientAuthenticatio COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kEnableAmbientAuthenticationInIncognito; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + defined(OS_MAC) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) &6 !defined(OS_CHROMEOS)) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || + // defined(OS_MAC) #if defined(OS_WIN) - COMPONENT_EXPORT(CHROME_FEATURES) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index adac9acf140f..bca2440a07b4 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,8 +1,8 @@ ---- chrome/common/chrome_paths.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/common/chrome_paths.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_paths.cc -@@ -52,21 +52,29 @@ const base::FilePath::CharType kPepperFlashSystemBaseD - FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); - #endif +@@ -47,21 +47,29 @@ namespace { + const base::FilePath::CharType kPepperFlashBaseDirectory[] = + FILE_PATH_LITERAL("PepperFlash"); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -32,7 +32,7 @@ #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -@@ -207,7 +215,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -182,7 +190,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -41,7 +41,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -494,6 +502,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -453,6 +461,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); @@ -51,7 +51,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -501,7 +512,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -460,7 +471,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif #if defined(OS_CHROMEOS) || \ @@ -60,7 +60,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -509,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -468,7 +479,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -69,7 +69,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -544,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -503,7 +514,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -78,7 +78,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -558,6 +569,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -517,6 +528,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -88,7 +88,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -570,7 +584,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -529,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 40581d9ba666..9fca877cf783 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.h.orig 2020-11-13 06:36:38 UTC +--- chrome/common/chrome_paths.h.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_paths.h @@ -51,7 +51,7 @@ enum { // contains subdirectories. @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -120,7 +120,7 @@ enum { +@@ -116,7 +116,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 34d872d21a68..b5a35819fa43 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-11-13 06:36:38 UTC +--- chrome/common/chrome_switches.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_switches.cc -@@ -808,7 +808,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -796,7 +796,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 951b9dd1ab2e..464527dd34b6 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-11-13 06:36:38 UTC +--- chrome/common/chrome_switches.h.orig 2021-01-18 21:28:52 UTC +++ chrome/common/chrome_switches.h -@@ -253,7 +253,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -249,7 +249,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index b20e33aa9aa6..93fa34eb9726 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-11-13 06:36:38 UTC +--- chrome/common/features.gni.orig 2021-01-18 21:28:52 UTC +++ chrome/common/features.gni -@@ -51,7 +51,7 @@ declare_args() { +@@ -52,7 +52,7 @@ declare_args() { enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 66315fb8d269..4df741a42ea7 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-11-13 06:36:38 UTC +--- chrome/common/pref_names.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/common/pref_names.cc -@@ -1076,7 +1076,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1089,7 +1089,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 -@@ -1238,7 +1238,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1246,7 +1246,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"; -@@ -1685,7 +1685,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1687,7 +1687,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,9 +27,9 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -2027,12 +2027,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = - const char kAmbientAuthenticationInPrivateModesEnabled[] = - "auth.ambient_auth_in_private_modes"; +@@ -2044,12 +2044,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled + // requests. + const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -42,7 +42,7 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2931,7 +2931,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit +@@ -2955,7 +2955,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 b7cd0378d468..18d910d8ffb9 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-11-13 06:36:38 UTC +--- chrome/common/pref_names.h.orig 2021-01-18 21:28:52 UTC +++ chrome/common/pref_names.h -@@ -355,7 +355,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -357,7 +357,7 @@ extern const char kAllowDeletingBrowserHistory[]; 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[]; -@@ -385,7 +385,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -384,7 +384,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MAC) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -27,9 +27,9 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -777,9 +777,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; - extern const char kGloballyScopeHTTPAuthCacheEnabled[]; +@@ -783,9 +783,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; + extern const char kBasicAuthOverHttpEnabled[]; -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -39,7 +39,7 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -1006,7 +1006,7 @@ extern const char kAutoplayWhitelist[]; +@@ -1014,7 +1014,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 c611494c9cdd..7ce98cde6a54 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,21 @@ ---- chrome/common/webui_url_constants.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/common/webui_url_constants.cc -@@ -338,7 +338,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -339,12 +339,12 @@ bool IsSystemWebUIHost(base::StringPiece host) { } #endif // defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + const char kChromeUIWebUIJsExceptionHost[] = "webuijsexception"; + const char kChromeUIWebUIJsExceptionURL[] = "chrome://webuijsexception/"; + #endif + -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; -@@ -360,18 +360,18 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -361,13 +361,13 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,14 +30,17 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; + const char kChromeUIProfileCustomizationHost[] = "profile-customization"; +@@ -378,7 +378,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro + const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -542,14 +542,14 @@ const char* const kChromeHostURLs[] = { +@@ -549,14 +549,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -48,3 +57,12 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif +@@ -615,7 +615,7 @@ const char* const kChromeDebugURLs[] = { + content::kChromeUIGpuJavaCrashURL, + kChromeUIJavaCrashURL, + #endif +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + kChromeUIWebUIJsExceptionURL, + #endif + kChromeUIQuitURL, 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 34971b669e6b..a670a1c664e5 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,21 @@ ---- chrome/common/webui_url_constants.h.orig 2020-11-13 06:36:38 UTC +--- chrome/common/webui_url_constants.h.orig 2021-01-18 21:28:52 UTC +++ chrome/common/webui_url_constants.h -@@ -291,7 +291,7 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -292,12 +292,12 @@ bool IsSystemWebUIHost(base::StringPiece host); #endif // defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + extern const char kChromeUIWebUIJsExceptionHost[]; + extern const char kChromeUIWebUIJsExceptionURL[]; + #endif + -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -311,18 +311,18 @@ extern const char kChromeUINearbyShareURL[]; +@@ -314,13 +314,13 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,10 +30,13 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; + extern const char kChromeUIProfileCustomizationHost[]; +@@ -330,7 +330,7 @@ extern const char kChromeUIProfilePickerUrl[]; + extern const char kChromeUIProfilePickerStartupQuery[]; #endif -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #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 b9b4af9491ed..dc56b33cfaaa 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-11-13 06:36:38 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1072,7 +1072,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1073,7 +1073,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index 4448e259fa8d..7a4d2a5c5ba5 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) -@@ -29,7 +29,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( +@@ -30,7 +30,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { @@ -18,7 +18,7 @@ // The global SkFontConfigInterface is configured and initialized with a // SkFontconfigInterface compatible font_service::FontLoader in // RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup -@@ -74,7 +74,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab +@@ -75,7 +75,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab void* buffer, size_t* length) { bool result = false; diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index ffb6d9547174..b366a3e63cdf 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2020-11-13 06:36:38 UTC +--- chrome/test/BUILD.gn.orig 2021-01-18 21:28:52 UTC +++ chrome/test/BUILD.gn -@@ -6572,7 +6572,7 @@ test("chrome_app_unittests") { +@@ -6791,7 +6791,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] 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 7f936ee83cae..3e022fb7f138 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,6 +1,6 @@ ---- chrome/test/base/chrome_test_launcher.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/test/base/chrome_test_launcher.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/test/base/chrome_test_launcher.cc -@@ -61,7 +61,7 @@ +@@ -60,7 +60,7 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ #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" -@@ -79,7 +79,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char +@@ -75,7 +75,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char content::ContentTestSuiteBase::RegisterInProcessThreads(); #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,7 @@ InstalledVersionPoller::ScopedDisableForTesting disable_polling( InstalledVersionPoller::MakeScopedDisableForTesting()); #endif -@@ -201,7 +201,7 @@ int LaunchChromeTests(size_t parallel_jobs, +@@ -198,7 +198,7 @@ int LaunchChromeTests(size_t parallel_jobs, if (command_line.HasSwitch(switches::kLaunchAsBrowser)) sampling_profiler = std::make_unique<MainThreadStackSamplingProfiler>(); @@ -27,7 +27,7 @@ ChromeCrashReporterClient::Create(); #elif defined(OS_WIN) // We leak this pointer intentionally. The crash client needs to outlive -@@ -229,7 +229,7 @@ int LaunchChromeTests(size_t parallel_jobs, +@@ -226,7 +226,7 @@ int LaunchChromeTests(size_t parallel_jobs, } #if defined(OS_WIN) || defined(OS_MAC) || \ 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 2f7f24189243..d9b256cd980f 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -78,6 +78,10 @@ +@@ -79,6 +79,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -288,7 +292,7 @@ void InProcessBrowserTest::SetUp() { +@@ -304,7 +308,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. @@ -20,7 +20,7 @@ OSCryptMocker::SetUp(); #endif -@@ -348,7 +352,7 @@ void InProcessBrowserTest::TearDown() { +@@ -364,7 +368,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc index fe02e60c4d33..731e516bb31e 100644 --- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc +++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-01-18 21:28:52 UTC +++ chrome/test/base/interactive_ui_tests_main.cc @@ -16,7 +16,7 @@ #if defined(USE_AURA) @@ -8,8 +8,8 @@ +#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" - #endif -@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite + #include "ui/views/test/ui_controls_factory_desktop_aura_ozone.h" +@@ -54,7 +54,7 @@ class InteractiveUITestSuite : public ChromeTestSuite com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); diff --git a/www/chromium/files/patch-chrome_test_base_test__browser__window.h b/www/chromium/files/patch-chrome_test_base_test__browser__window.h index 2e871fc158fd..cc7782b6b667 100644 --- a/www/chromium/files/patch-chrome_test_base_test__browser__window.h +++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h @@ -1,11 +1,11 @@ ---- chrome/test/base/test_browser_window.h.orig 2020-11-13 06:36:38 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-01-18 21:28:52 UTC +++ chrome/test/base/test_browser_window.h -@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow { +@@ -176,7 +176,7 @@ class TestBrowserWindow : public BrowserWindow { bool is_source_keyboard) override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) - void ShowHatsBubble(const std::string& site_id) override {} - #endif - + void ShowHatsBubble(const std::string& site_id, + base::OnceClosure success_callback, + base::OnceClosure failure_callback) override {} 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 5f92ad3ddac7..d3f6d7bef5e1 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-11-13 06:36:38 UTC +--- chrome/test/base/testing_browser_process.h.orig 2021-01-18 21:28:52 UTC +++ chrome/test/base/testing_browser_process.h -@@ -124,8 +124,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -125,8 +125,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; StartupData* startup_data() override; 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 704780f0ba1c..ec46ddf1775b 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-11-13 06:36:40 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-01-18 21:28:54 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -73,7 +73,7 @@ #include "ui/base/ui_base_switches.h" @@ -63,7 +63,7 @@ base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -657,7 +657,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -660,7 +660,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif @@ -72,7 +72,7 @@ wayland_server_controller_ = std::make_unique<WaylandServerController>(window_manager_.get()); #endif -@@ -739,7 +739,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res +@@ -742,7 +742,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res } void CastBrowserMainParts::PostMainMessageLoopRun() { 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 98d3d306f0e0..a4c02cae7939 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,7 +1,7 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2020-11-13 06:36:40 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-01-18 21:28:54 UTC +++ chromecast/browser/cast_content_browser_client.cc @@ -130,9 +130,9 @@ - #include "chromecast/external_mojo/broker_service/broker_service.h" + #include "chromecast/external_mojo/broker_service/broker_service.h" // nogncheck #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_CAST_RENDERER) #include "base/sequenced_task_runner.h" -@@ -472,7 +472,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -471,7 +471,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index 796c8f04c306..26aea899f137 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,20 +1,17 @@ ---- components/BUILD.gn.orig 2020-11-13 06:36:40 UTC +--- components/BUILD.gn.orig 2021-01-18 21:28:54 UTC +++ components/BUILD.gn -@@ -308,10 +308,15 @@ test("components_unittests") { - ] +@@ -319,9 +319,13 @@ test("components_unittests") { + } if (!is_fuchsia) { # !iOS and !Fuchsia + if (!is_bsd) { + deps += [ + "//components/crash/content/browser:unit_tests", -+ "//components/crash/content/browser/error_reporting:unit_tests", + "//components/crash/core/app:unit_tests", + ] + } -+ deps += [ - "//components/crash/content/browser:unit_tests", -- "//components/crash/content/browser/error_reporting:unit_tests", - "//components/crash/core/app: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 fbf77d73e828..13765df64c41 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 2020-11-13 06:36:40 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2021-01-18 21:28:54 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -19,7 +19,11 @@ +@@ -18,7 +18,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_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index cc01912f968b..6ddd2b270b0e 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-11-13 06:36:40 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2021-01-18 21:28:54 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1960,7 +1960,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1957,7 +1957,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. @@ -9,12 +9,12 @@ defined(OS_APPLE) // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. -@@ -1984,7 +1984,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -1981,7 +1981,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp return !is_opted_in; #else return false; --#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \ -+#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \ +-#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \ ++#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \ // defined(OS_APPLE) } 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 83f8745adb76..e5619788d9bf 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-11-13 06:36:40 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-01-18 21:28:54 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -123,7 +123,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma +@@ -129,7 +129,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma bool ShouldShowImprovedUserConsentForCreditCardSave() { #if defined(OS_WIN) || defined(OS_APPLE) || \ diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index 1d4730753f4a..6a6d550da676 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,22 +1,6 @@ ---- components/crash/content/browser/BUILD.gn.orig 2020-11-13 06:36:40 UTC +--- components/crash/content/browser/BUILD.gn.orig 2021-01-18 21:28:55 UTC +++ components/crash/content/browser/BUILD.gn -@@ -35,7 +35,7 @@ source_set("browser") { - "//content/public/common", - ] - -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux || is_chromeos || is_android) && !is_bsd) { - set_sources_assignment_filter([]) - - # Want this file on both Linux and Android. -@@ -49,13 +49,13 @@ source_set("browser") { - deps += [ "//third_party/crashpad/crashpad/client" ] - } - -- if (!is_android) { -+ if (!is_android && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } +@@ -33,7 +33,7 @@ source_set("browser") { # This is not in the GYP build but this target includes breakpad client # headers, so add the dependency here. @@ -25,3 +9,12 @@ configs += [ "//third_party/breakpad:client_config" ] public_configs = [ "//third_party/breakpad:client_config" ] } +@@ -53,7 +53,7 @@ source_set("browser") { + "//components/crash/android:jni_headers", + "//mojo/public/cpp/bindings", + ] +- } else { ++ } else if (!is_bsd) { + deps += [ "//third_party/breakpad:client" ] + } + } diff --git a/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn new file mode 100644 index 000000000000..4923048a822a --- /dev/null +++ b/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn @@ -0,0 +1,13 @@ +--- components/crash/content/browser/error_reporting/BUILD.gn.orig 2021-01-19 12:19:09 UTC ++++ components/crash/content/browser/error_reporting/BUILD.gn +@@ -30,4 +30,10 @@ source_set("mock_crash_endpoint") { + "//testing/gtest", + "//url", + ] ++ ++ if (is_bsd) { ++ deps -= [ ++ "//components/crash/core/app", ++ ] ++ } + } 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 5b41932bac30..71ee941f05b2 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-11-13 06:36:40 UTC +--- components/crash/core/common/BUILD.gn.orig 2021-01-18 21:28:55 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -29,7 +29,7 @@ } else { include_dirs = [ "//third_party/breakpad/breakpad/src" ] -@@ -184,7 +186,7 @@ source_set("unit_tests") { +@@ -185,7 +187,7 @@ source_set("unit_tests") { sources += [ "crash_key_breakpad_ios_unittest.cc" ] deps += [ "//third_party/breakpad:client" ] include_dirs = [ "//third_party/breakpad/breakpad/src/" ] diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index e6e1dad77f19..dac296350f9f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2020-11-13 06:36:40 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/event_constants.cc @@ -10,13 +10,13 @@ namespace feature_engagement { @@ -17,10 +17,10 @@ defined(OS_CHROMEOS) const char kSixthTabOpened[] = "sixth_tab_opened"; const char kTabGroupCreated[] = "tab_group_created"; -@@ -32,7 +32,7 @@ const char kFocusModeConditionsMet[] = "focus_mode_con - - const char kWebUITabStripClosed[] = "webui_tab_strip_closed"; +@@ -34,7 +34,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c const char kWebUITabStripOpened[] = "webui_tab_strip_opened"; + + const char kDesktopPwaInstalled[] = "desktop_pwa_installed"; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 8550f9c063fc..86c60eb55b59 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.h.orig 2020-11-13 06:36:40 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/event_constants.h @@ -12,16 +12,16 @@ namespace feature_engagement { namespace events { @@ -20,9 +20,9 @@ defined(OS_CHROMEOS) // A new tab was opened when 5 (or more) tabs were already open. extern const char kSixthTabOpened[]; -@@ -54,7 +54,7 @@ extern const char kWebUITabStripClosed[]; - // The WebUI tab strip was opened by the user. - extern const char kWebUITabStripOpened[]; +@@ -57,7 +57,7 @@ extern const char kWebUITabStripOpened[]; + // The PWA was installed by the user. + extern const char kDesktopPwaInstalled[]; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index edfc2d3a4eda..5f8245e8bd63 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2020-11-13 06:36:40 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -30,7 +30,7 @@ const base::Feature kIPHWebUITabStripFeature{"IPH_WebU - base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHDesktopSnoozeFeature{"IPH_DesktopSnoozeFeature", +@@ -32,7 +32,7 @@ const base::Feature kIPHDesktopSnoozeFeature{"IPH_Desk base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHDesktopPwaInstallFeature{ + "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 29479fe45148..f4d6ac83c913 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2020-11-13 06:36:40 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/feature_constants.h @@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; -@@ -26,7 +26,7 @@ extern const base::Feature kIPHPasswordsAccountStorage - extern const base::Feature kIPHReopenTabFeature; +@@ -27,7 +27,7 @@ extern const base::Feature kIPHReopenTabFeature; extern const base::Feature kIPHWebUITabStripFeature; extern const base::Feature kIPHDesktopSnoozeFeature; + extern const base::Feature kIPHDesktopPwaInstallFeature; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) 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 b1ddb3e1c682..b8f5783911aa 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-11-13 06:36:40 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -66,7 +66,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -75,7 +75,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, -@@ -75,7 +75,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHPasswordsAccountStorageFeature, +@@ -85,7 +85,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHReopenTabFeature, &kIPHWebUITabStripFeature, + &kIPHDesktopPwaInstallFeature, -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) 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 90087005d86f..5a1da8650e2b 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-11-13 06:36:40 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-01-18 21:28:55 UTC +++ components/feature_engagement/public/feature_list.h -@@ -126,7 +126,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -142,7 +142,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) @@ -9,16 +9,16 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -137,7 +137,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordsAccountStorageFeat - "IPH_PasswordsAccountStorage"); +@@ -154,7 +154,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordsAccountStorageFeat DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_ReopenTab"); DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip"); + DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, "IPH_DesktopPwaInstall"); -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) } // namespace -@@ -196,7 +196,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -222,7 +222,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), @@ -27,10 +27,10 @@ defined(OS_CHROMEOS) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), -@@ -205,7 +205,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHPasswordsAccountStorageFeature), +@@ -232,7 +232,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHReopenTabFeature), VARIATION_ENTRY(kIPHWebUITabStripFeature), + VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc index 178e30dc695d..2e0eab35bd06 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2020-11-26 17:50:17 UTC +--- components/feed/core/v2/proto_util.cc.orig 2021-01-18 21:28:55 UTC +++ components/feed/core/v2/proto_util.cc -@@ -79,8 +79,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -81,8 +81,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if defined(OS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -95,8 +95,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -97,8 +97,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc new file mode 100644 index 000000000000..b11752464fe0 --- /dev/null +++ b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc @@ -0,0 +1,11 @@ +--- components/invalidation/impl/invalidation_switches.cc.orig 2021-01-19 11:31:15 UTC ++++ components/invalidation/impl/invalidation_switches.cc +@@ -28,7 +28,7 @@ const base::Feature kFCMInvalidationsForSyncDontCheckV + + const base::Feature kSyncInstanceIDTokenTTL { + "SyncInstanceIDTokenTTL", +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_IOS) + base::FEATURE_ENABLED_BY_DEFAULT + #else diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 4fee4f1fc144..0c4becbfccb9 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-11-13 06:36:41 UTC +--- components/metrics/BUILD.gn.orig 2021-01-18 21:28:55 UTC +++ components/metrics/BUILD.gn -@@ -189,6 +189,11 @@ static_library("metrics") { +@@ -173,6 +173,11 @@ 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 63cfb92beb13..d9b00ed46374 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-11-13 06:36:41 UTC +--- components/metrics/metrics_log.cc.orig 2021-01-18 21:28:55 UTC +++ components/metrics/metrics_log.cc -@@ -224,7 +224,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -238,7 +238,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 a61693d6fc70..c043f069e901 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-11-13 06:36:41 UTC +--- components/neterror/resources/neterror.js.orig 2021-01-18 21:28:55 UTC +++ components/neterror/resources/neterror.js -@@ -153,7 +153,7 @@ function detailsButtonClick() { +@@ -144,7 +144,7 @@ function detailsButtonClick() { } 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 90cf9695a7d4..faea37ffba0a 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-11-13 06:36:41 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-01-18 21:28:55 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -749,7 +749,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -802,7 +802,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc b/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc new file mode 100644 index 000000000000..a9c38a492ead --- /dev/null +++ b/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc @@ -0,0 +1,11 @@ +--- components/permissions/prediction_service/prediction_service_common.cc.orig 2021-01-19 11:31:48 UTC ++++ components/permissions/prediction_service/prediction_service_common.cc +@@ -10,7 +10,7 @@ namespace permissions { + ClientFeatures_Platform GetCurrentPlatformProto() { + #if defined(OS_WIN) + return permissions::ClientFeatures_Platform_PLATFORM_WINDOWS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return permissions::ClientFeatures_Platform_PLATFORM_LINUX; + #elif defined(OS_ANDROID) + return permissions::ClientFeatures_Platform_PLATFORM_ANDROID; 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 92b510244ce1..f5a464625049 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,5 +1,14 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-11-13 06:36:41 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2021-01-18 21:28:55 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc +@@ -17,7 +17,7 @@ + #include <wincred.h> + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD) + #include <pwd.h> + #include <sys/types.h> + #include <unistd.h> @@ -32,7 +32,7 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif @@ -18,3 +27,37 @@ #include "base/system/sys_info.h" #endif +@@ -75,9 +75,14 @@ namespace policy { + namespace em = enterprise_management; + + std::string GetMachineName() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_BSD) ++ char hostname[MAXHOSTNAMELEN]; ++ if (gethostname(hostname, MAXHOSTNAMELEN) == 0) ++#else + char hostname[HOST_NAME_MAX]; + if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. ++#endif + return hostname; + return std::string(); + #elif defined(OS_APPLE) +@@ -136,7 +141,7 @@ std::string GetMachineName() { + } + + std::string GetOSVersion() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD) + return base::SysInfo::OperatingSystemVersion(); + #elif defined(OS_WIN) + base::win::OSInfo::VersionNumber version_number = +@@ -159,7 +164,7 @@ std::string GetOSArchitecture() { + } + + std::string GetOSUsername() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD) + struct passwd* creds = getpwuid(getuid()); + if (!creds || !creds->pw_name) + return std::string(); 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 013236168a8b..d1579d98b8c5 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-11-13 06:36:41 UTC +--- components/policy/resources/policy_templates.json.orig 2021-01-18 21:28:55 UTC +++ components/policy/resources/policy_templates.json -@@ -1198,7 +1198,7 @@ +@@ -1217,7 +1217,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1224,7 +1224,7 @@ +@@ -1243,7 +1243,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1245,7 +1245,7 @@ +@@ -1264,7 +1264,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -4285,7 +4285,7 @@ +@@ -4406,7 +4406,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4341,7 +4341,7 @@ +@@ -4462,7 +4462,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8423,7 +8423,7 @@ +@@ -8644,7 +8644,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -9998,7 +9998,7 @@ +@@ -10221,7 +10221,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -10733,7 +10733,7 @@ +@@ -10957,7 +10957,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc new file mode 100644 index 000000000000..64cff1df5033 --- /dev/null +++ b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc @@ -0,0 +1,11 @@ +--- components/safe_browsing/core/realtime/url_lookup_service_base.cc.orig 2021-01-19 11:33:56 UTC ++++ components/safe_browsing/core/realtime/url_lookup_service_base.cc +@@ -101,7 +101,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { + return RTLookupRequest::OS_TYPE_FUCHSIA; + #elif defined(OS_IOS) + return RTLookupRequest::OS_TYPE_IOS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return RTLookupRequest::OS_TYPE_LINUX; + #elif defined(OS_MAC) + return RTLookupRequest::OS_TYPE_MAC; diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index 31144453f53a..ecc7dca2115c 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,4 +1,4 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2020-11-13 06:36:41 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2021-01-18 21:28:56 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc @@ -15,7 +15,7 @@ @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -35,7 +35,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -36,7 +36,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if defined(OS_WIN) content::InitializeDWriteFontProxy(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -54,7 +54,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -55,7 +55,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // encoding to PNG or we could provide our own codec implementations. // Sanity check that fonts are working. diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h index 7c96529f2692..7258930a6c7b 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -1,4 +1,4 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2020-11-13 06:36:41 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2021-01-18 21:28:56 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h @@ -20,7 +20,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -74,7 +74,7 @@ class PaintPreviewCompositorCollectionImpl +@@ -70,7 +70,7 @@ class PaintPreviewCompositorCollectionImpl std::unique_ptr<PaintPreviewCompositorImpl>> compositors_; diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index 914773d67ed7..0fc693cefe7e 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2020-11-13 06:36:41 UTC +--- components/storage_monitor/BUILD.gn.orig 2021-01-18 21:28:56 UTC +++ components/storage_monitor/BUILD.gn -@@ -88,6 +88,13 @@ static_library("storage_monitor") { +@@ -81,6 +81,13 @@ static_library("storage_monitor") { } } @@ -12,5 +12,5 @@ + } + if (use_udev) { - sources += [ - "udev_util_linux.cc", + if (is_linux || is_chromeos) { + sources += [ diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index d24435ee8443..69dba7ba632c 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,11 +1,11 @@ ---- components/viz/common/features.cc.orig 2020-11-13 06:36:42 UTC +--- components/viz/common/features.cc.orig 2021-01-18 21:28:57 UTC +++ components/viz/common/features.cc -@@ -22,7 +22,7 @@ const base::Feature kForcePreferredIntervalForVideo{ - - // Use the SkiaRenderer. +@@ -25,7 +25,7 @@ const base::Feature kForcePreferredIntervalForVideo{ + const base::Feature kUseSkiaRenderer { + "UseSkiaRenderer", #if defined(OS_WIN) || \ - (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) + (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD) - const base::Feature kUseSkiaRenderer{"UseSkiaRenderer", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_ENABLED_BY_DEFAULT #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 3182be564557..696bac17a3c7 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,4 +1,4 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2020-11-13 06:36:42 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2021-01-18 21:28:57 UTC +++ components/viz/service/display_embedder/software_output_surface.h @@ -48,7 +48,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi UpdateVSyncParametersCallback callback) override; @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -71,7 +71,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -68,7 +68,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_; ui::LatencyTracker latency_tracker_; diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index fe02b2b577bd..c7071d812016 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,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-11-13 06:36:42 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-01-18 21:28:57 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -54,7 +54,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -56,7 +56,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -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); -@@ -456,7 +456,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -464,7 +464,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw #if defined(OS_ANDROID) if (display_client_) display_client_->DidCompleteSwapWithSize(pixel_size); diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index a250cd6d6e76..89ed0abd009e 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2020-11-16 14:31:07 UTC +--- content/app/content_main.cc.orig 2021-01-18 21:28:57 UTC +++ content/app/content_main.cc -@@ -230,7 +230,7 @@ int RunContentProcess(const ContentMainParams& params, +@@ -229,7 +229,7 @@ int RunContentProcess(const ContentMainParams& params, #endif base::EnableTerminationOnOutOfMemory(); 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 4871cb59aa5b..651e503ec499 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-11-13 06:36:42 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-01-18 21:28:57 UTC +++ content/app/content_main_runner_impl.cc -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ #endif // OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -151,7 +151,7 @@ +@@ -154,7 +154,7 @@ #include "content/public/common/content_client.h" #endif @@ -18,7 +18,7 @@ #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/browser/sandbox_host_linux.h" -@@ -301,7 +301,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -310,7 +310,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -27,7 +27,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -392,7 +392,7 @@ void PreSandboxInit() { +@@ -401,7 +401,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ } // namespace -@@ -455,7 +455,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -45,8 +45,8 @@ PreSandboxInit(); #endif -@@ -830,7 +830,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana - delegate_->PostFieldTrialInitialization(); +@@ -855,7 +855,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana + mojo::core::InitFeatures(); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -54,7 +54,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -840,7 +840,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana +@@ -865,7 +865,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()), MOJO_RESULT_OK); } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 0eb1e2627b47..40aab04f31af 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-11-13 06:36:42 UTC +--- content/browser/BUILD.gn.orig 2021-01-18 21:28:57 UTC +++ content/browser/BUILD.gn -@@ -2113,6 +2113,15 @@ source_set("browser") { +@@ -2132,6 +2132,15 @@ source_set("browser") { deps += [ "//third_party/speech-dispatcher" ] } 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 7ae7a0c506e8..6efb4bb2760f 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-11-13 06:36:42 UTC +--- content/browser/browser_main_loop.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/browser_main_loop.cc -@@ -367,7 +367,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem +@@ -366,7 +366,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem if (chromeos::switches::MemoryPressureHandlingEnabled()) monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); #elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \ diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc new file mode 100644 index 000000000000..77358e43f630 --- /dev/null +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -0,0 +1,29 @@ +--- content/browser/download/download_manager_impl.cc.orig 2021-01-19 11:34:47 UTC ++++ content/browser/download/download_manager_impl.cc +@@ -82,7 +82,7 @@ + #include "third_party/blink/public/common/loader/referrer_utils.h" + #include "third_party/blink/public/common/loader/throttling_url_loader.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl + } + }; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + base::FilePath GetTemporaryDownloadDirectory() { + std::unique_ptr<base::Environment> env(base::Environment::Create()); + return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); +@@ -559,7 +559,7 @@ bool DownloadManagerImpl::InterceptDownload( + + base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { + base::FilePath default_download_directory; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // TODO(thomasanderson,crbug.com/784010): Remove this when all Linux + // distros with versions of GTK lower than 3.14.7 are no longer + // supported. This should happen when support for Ubuntu Trusty and diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h index 08594c6635ba..8a5d2c7e159e 100644 --- a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h +++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h @@ -1,6 +1,6 @@ ---- content/browser/font_access/font_enumeration_cache.h.orig 2020-11-16 14:31:38 UTC +--- content/browser/font_access/font_enumeration_cache.h.orig 2021-01-18 21:28:57 UTC +++ content/browser/font_access/font_enumeration_cache.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "third_party/blink/public/common/font_access/font_enumeration_table.pb.h" #include "third_party/blink/public/mojom/font_access/font_access.mojom.h" 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 9f89b4fa5583..8975da33e93c 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-11-13 06:36:42 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1127,7 +1127,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -228,7 +228,7 @@ static const char* const kSwitchNames[] = { + sandbox::policy::switches::kGpuSandboxFailuresFatal, + sandbox::policy::switches::kDisableGpuSandbox, + sandbox::policy::switches::kNoSandbox, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) + switches::kDisableDevShmUsage, + #endif + #if defined(OS_WIN) +@@ -1135,7 +1135,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_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 8c5ab9697cad..0d82cce8c24f 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2020-11-13 06:36:42 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -364,7 +364,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -304,7 +304,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #elif defined(OS_MAC) + #else diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 28c58204cc70..262461b64a77 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2020-11-16 14:32:47 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -243,7 +243,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -244,7 +244,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_WIN) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // On Windows and Linux, we would like to produce new content as soon as // possible or the OS will create an additional black gutter. Until we can // block resize on surface synchronization on these platforms, we will not diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index c469e1919709..52f44c3fd679 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2020-11-13 06:36:42 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -438,7 +438,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -437,7 +437,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -459,7 +459,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -458,7 +458,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index c6b2f77b8105..94ee33792212 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2020-11-13 06:36:42 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -70,7 +70,7 @@ +@@ -69,7 +69,7 @@ #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,8 +9,8 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -117,7 +117,7 @@ void RenderMessageFilter::GenerateRoutingID( - std::move(callback).Run(render_widget_helper_->GetNextRoutingID()); +@@ -126,7 +126,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( + std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -138,7 +138,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -147,7 +147,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea } #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index 97cc245059ec..2d6a9757d293 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,8 +1,8 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2020-11-13 06:36:42 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter - // mojom::RenderMessageFilter: +@@ -80,14 +80,14 @@ class CONTENT_EXPORT RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; + void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) 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-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 5e4309d365cd..630bf5251a3c 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-11-13 06:36:42 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -237,7 +237,7 @@ +@@ -235,7 +235,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1228,7 +1228,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1219,7 +1219,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,16 +18,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1239,7 +1239,7 @@ size_t GetPlatformProcessLimit() { +@@ -1230,7 +1230,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } - #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1324,7 +1324,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1315,7 +1315,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1757,7 +1757,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1747,7 +1747,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -45,12 +45,18 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MAC) -@@ -3302,7 +3302,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin - #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) +@@ -3254,11 +3254,11 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin + switches::kDisableInProcessStackTraces, + sandbox::policy::switches::kDisableSeccompFilterSandbox, + sandbox::policy::switches::kNoSandbox, +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +- !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++ !BUILDFLAG(IS_CHROMEOS_LACROS)) switches::kDisableDevShmUsage, #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) +-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) ++#if ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)) || defined(OS_BSD) switches::kEnableAcceleratedVideoDecode, #endif #if defined(OS_MAC) 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 9d4810a47c60..fdc28c4b3e2e 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-11-13 06:36:42 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -278,7 +278,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -261,7 +261,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 3b5eb2c8798a..477fedd5cc91 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,43 +1,38 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-11-13 06:36:42 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -111,11 +111,11 @@ +@@ -111,7 +111,7 @@ #include "ui/gfx/gdi_util.h" #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "content/browser/accessibility/browser_accessibility_auralinux.h" - #endif - --#if 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 @@ -492,7 +492,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) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2224,7 +2224,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2234,7 +2234,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) return NeedsInputGrab(); #else return false; -@@ -2388,7 +2388,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2398,7 +2398,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 3a7cce8a4cdd..abebef800d04 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2020-11-16 14:34:56 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-01-18 21:28:57 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -1211,7 +1211,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1198,7 +1198,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. 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 deleted file mode 100644 index 5ab8e698b5fe..000000000000 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2020-11-13 06:36:42 UTC -+++ content/browser/webui/shared_resources_data_source.cc -@@ -120,13 +120,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_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || 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_MAC) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) || defined(OS_ANDROID) - }; - } diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc new file mode 100644 index 000000000000..fdda6429cbb2 --- /dev/null +++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc @@ -0,0 +1,28 @@ +--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2021-01-18 21:28:57 UTC ++++ content/browser/webui/web_ui_main_frame_observer.cc +@@ -10,7 +10,7 @@ + #include "content/browser/webui/web_ui_impl.h" + #include "content/public/browser/navigation_handle.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "base/callback_helpers.h" + #include "base/feature_list.h" + #include "base/logging.h" +@@ -41,7 +41,7 @@ void WebUIMainFrameObserver::DidFinishNavigation( + web_ui_->DisallowJavascriptOnAllHandlers(); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void WebUIMainFrameObserver::OnDidAddMessageToConsole( + RenderFrameHost* source_frame, + blink::mojom::ConsoleMessageLevel log_level, +@@ -101,6 +101,6 @@ void WebUIMainFrameObserver::OnDidAddMessageToConsole( + processor->SendErrorReport(std::move(report), base::DoNothing(), + web_contents()->GetBrowserContext()); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + } // namespace content diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h new file mode 100644 index 000000000000..ede64936677d --- /dev/null +++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h @@ -0,0 +1,20 @@ +--- content/browser/webui/web_ui_main_frame_observer.h.orig 2021-01-19 11:37:39 UTC ++++ content/browser/webui/web_ui_main_frame_observer.h +@@ -40,7 +40,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W + + // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL + // thunking issues. Fix & re-enable. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // On official Google builds, capture and report JavaScript error messages on + // WebUI surfaces back to Google. This allows us to fix JavaScript errors and + // exceptions. +@@ -49,7 +49,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W + const base::string16& message, + int32_t line_no, + const base::string16& source_id) override; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + private: + WebUIImpl* web_ui_; diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index e26e41f62838..988c92362b36 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2020-11-16 14:35:28 UTC +--- content/child/child_process.cc.orig 2021-01-18 21:28:57 UTC +++ content/child/child_process.cc -@@ -50,7 +50,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr +@@ -52,7 +52,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - if (IsMojoCoreSharedLibraryEnabled()) { + const bool is_embedded_in_browser_process = diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index ef88eb01f56a..c81339653dd1 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,27 +1,36 @@ ---- content/common/BUILD.gn.orig 2020-11-13 06:36:42 UTC +--- content/common/BUILD.gn.orig 2021-01-18 21:28:57 UTC +++ content/common/BUILD.gn -@@ -328,6 +328,15 @@ source_set("common") { - libs += [ "android" ] +@@ -341,7 +341,7 @@ source_set("common") { + sources -= [ "cursors/webcursor_aura.cc" ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "common_sandbox_support_linux.cc", + "sandbox_init_linux.cc", +@@ -357,6 +357,15 @@ source_set("common") { + ] } + if (is_bsd) { -+ sources -= [ -+ "sandbox_init_linux.cc", ++ sources += [ ++ "common_sandbox_support_linux.cc", + ] + deps += [ + "//third_party/fontconfig", + ] + } + - if (is_debug && !is_component_build && enable_plugins) { - # Content depends on the PPAPI message logging stuff; if this isn't here, - # some unit test binaries won't compile. This only worked in release mode -@@ -345,7 +354,7 @@ source_set("common") { - sources -= [ "cursors/webcursor_aura.cc" ] + if (use_zygote_handle) { + sources += [ + "zygote/zygote_handle_impl_linux.h", +@@ -410,7 +419,7 @@ source_set("common") { } + } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "zygote/sandbox_support_linux.cc", - "zygote/send_zygote_child_ping_linux.cc", +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("set_process_title_linux") { + public = [ "set_process_title_linux.h" ] + sources = [ "set_process_title_linux.cc" ] diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 2cea97121ae9..fb2fb8676825 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2020-11-13 06:36:43 UTC +--- content/common/user_agent.cc.orig 2021-01-18 21:28:57 UTC +++ content/common/user_agent.cc -@@ -214,6 +214,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -213,6 +213,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons ); #endif diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index 717b4a20699b..2d97c09a045c 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,9 +1,9 @@ ---- content/gpu/BUILD.gn.orig 2020-11-13 06:36:43 UTC +--- content/gpu/BUILD.gn.orig 2021-01-18 21:28:57 UTC +++ content/gpu/BUILD.gn -@@ -130,7 +130,7 @@ target(link_target_type, "gpu_sources") { +@@ -128,7 +128,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. - if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && + if (current_cpu != "s390x" && current_cpu != "ppc64" && is_linux && - (!is_chromecast || is_cast_desktop_build)) { + (!is_chromecast || is_cast_desktop_build) && !is_bsd) { configs += [ "//build/config/linux/dri" ] diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 1987886fbd17..dec493c25ae2 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-11-13 06:36:43 UTC +--- content/gpu/gpu_main.cc.orig 2021-01-18 21:28:57 UTC +++ content/gpu/gpu_main.cc -@@ -86,7 +86,7 @@ - #include "ui/gfx/x/x11_types.h" // nogncheck +@@ -84,7 +84,7 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "sandbox/policy/linux/sandbox_linux.h" -@@ -302,7 +302,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -305,7 +305,7 @@ int GpuMain(const MainFunctionParams& parameters) { gpu_preferences.message_pump_type); } #endif 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 f617a67285e1..e00e939bd06d 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-11-13 06:36:43 UTC +--- content/public/common/common_param_traits_macros.h.orig 2021-01-18 21:28:57 UTC +++ content/public/common/common_param_traits_macros.h -@@ -138,7 +138,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -134,7 +134,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/chromium/files/patch-content_public_common_content__constants.cc b/www/chromium/files/patch-content_public_common_content__constants.cc index 0ebd9b159a2c..282478d9c2e1 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.cc +++ b/www/chromium/files/patch-content_public_common_content__constants.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_constants.cc.orig 2020-11-13 06:36:43 UTC +--- content/public/common/content_constants.cc.orig 2021-01-18 21:28:57 UTC +++ content/public/common/content_constants.cc -@@ -56,7 +56,7 @@ std::string GetCorsExemptRequestedWithHeaderName() { +@@ -50,7 +50,7 @@ std::string GetCorsExemptRequestedWithHeaderName() { return base::JoinString(pieces, "-"); } diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h index 9975a358859f..3b866a0eee66 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.h +++ b/www/chromium/files/patch-content_public_common_content__constants.h @@ -1,6 +1,6 @@ ---- content/public/common/content_constants.h.orig 2020-11-13 06:36:43 UTC +--- content/public/common/content_constants.h.orig 2021-01-18 21:28:57 UTC +++ content/public/common/content_constants.h -@@ -70,7 +70,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea +@@ -64,7 +64,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea // it at run time. CONTENT_EXPORT std::string GetCorsExemptRequestedWithHeaderName(); 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 863f2389701e..5b52891efbd6 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2020-11-13 06:36:43 UTC +--- content/public/common/content_features.cc.orig 2021-01-18 21:28:57 UTC +++ content/public/common/content_features.cc -@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ +@@ -49,7 +49,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -776,8 +776,8 @@ const base::Feature kWebAssemblyThreads { +@@ -758,8 +758,8 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -20,7 +20,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -807,7 +807,7 @@ const base::Feature kWebAuth{"WebAuthentication", +@@ -789,7 +789,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 de2c96996248..7a59374c0124 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-11-13 06:36:43 UTC +--- content/public/common/content_switches.cc.orig 2021-01-18 21:28:57 UTC +++ content/public/common/content_switches.cc -@@ -905,7 +905,7 @@ const char kWebXrRuntimeWMR[] = "windows-mixed-reality +@@ -895,7 +895,7 @@ const char kWebXrRuntimeWMR[] = "windows-mixed-reality const char kDisableAcceleratedVideoDecode[] = "disable-accelerated-video-decode"; @@ -9,7 +9,7 @@ // Enables hardware acceleration of video decoding on linux. (defaults to off) const char kEnableAcceleratedVideoDecode[] = "enable-accelerated-video-decode"; #endif -@@ -969,7 +969,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -959,7 +959,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 fc3899dfcf88..66e21308b67c 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-11-13 06:36:43 UTC +--- content/public/common/content_switches.h.orig 2021-01-18 21:28:57 UTC +++ content/public/common/content_switches.h -@@ -248,7 +248,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat +@@ -245,7 +245,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[]; CONTENT_EXPORT extern const char kWebXrRuntimeWMR[]; @@ -9,7 +9,7 @@ CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[]; #endif CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[]; -@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -266,7 +266,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 c27c7664f2a7..29c1791c79a0 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-11-13 06:36:43 UTC +--- content/public/test/browser_test_base.cc.orig 2021-01-18 21:28:57 UTC +++ content/public/test/browser_test_base.cc -@@ -105,6 +105,10 @@ +@@ -106,6 +106,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc index 63b38ac82ada..33a9b78a5d20 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2020-11-13 06:36:43 UTC +--- content/public/test/mock_render_thread.cc.orig 2021-01-18 21:28:57 UTC +++ content/public/test/mock_render_thread.cc -@@ -52,7 +52,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -60,7 +60,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } 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 cd059b17d6b3..252d03eb1a80 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_process_impl.cc.orig 2020-11-13 06:36:43 UTC +--- content/renderer/render_process_impl.cc.orig 2021-01-18 21:28:58 UTC +++ content/renderer/render_process_impl.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -177,7 +177,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -178,7 +178,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 14054a1ffec9..f76375797c3b 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2020-11-13 06:36:43 UTC +--- content/renderer/render_thread_impl.cc.orig 2021-01-18 21:28:58 UTC +++ content/renderer/render_thread_impl.cc -@@ -173,7 +173,7 @@ +@@ -170,7 +170,7 @@ #if defined(OS_MAC) #include <malloc/malloc.h> @@ -9,3 +9,44 @@ #include <malloc.h> #endif +@@ -705,7 +705,7 @@ void RenderThreadImpl::Init() { + DCHECK(parsed_num_raster_threads) << string_value; + DCHECK_GT(num_raster_threads, 0); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + categorized_worker_pool_->SetBackgroundingCallback( + main_thread_scheduler_->DefaultTaskRunner(), + base::BindOnce( +@@ -728,7 +728,7 @@ void RenderThreadImpl::Init() { + base::DiscardableMemoryAllocator::SetInstance( + discardable_memory_allocator_.get()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (base::FeatureList::IsEnabled( + blink::features::kBlinkCompositorUseDisplayThreadPriority)) { + render_message_filter()->SetThreadPriority( +@@ -1103,11 +1103,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + kGpuStreamPriorityMedia); + + const bool enable_video_accelerator = +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) && + #else + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + (gpu_channel_host->gpu_feature_info() + .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] == + gpu::kGpuFeatureStatusEnabled); +@@ -1117,7 +1117,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); + #else + cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); +-#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // defined(OS_WIN) + const bool enable_media_stream_gpu_memory_buffers = + enable_gpu_memory_buffers && 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 049a555c28b5..44fb68dd868c 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-11-13 06:36:43 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2021-01-18 21:28:58 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -97,7 +97,7 @@ +@@ -102,7 +102,7 @@ #if defined(OS_MAC) #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 -@@ -169,7 +169,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -172,7 +172,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -232,7 +232,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -235,7 +235,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( 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); -@@ -245,7 +245,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -248,7 +248,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 1cbaf977d592..4084771e2c02 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2020-11-13 06:36:43 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2021-01-18 21:28:58 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -223,7 +223,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi // Return the mojo interface for making CodeCache calls. blink::mojom::CodeCacheHost& GetCodeCacheHost(); @@ -18,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -244,7 +244,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 2018bba2e725..f27f00c59ffe 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2020-11-13 06:36:43 UTC +--- content/shell/BUILD.gn.orig 2021-01-18 21:28:58 UTC +++ content/shell/BUILD.gn -@@ -94,7 +94,7 @@ static_library("content_shell_app") { +@@ -86,7 +86,7 @@ static_library("content_shell_app") { "//content/web_test:web_test_renderer", ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/app:test_support", -@@ -253,7 +253,7 @@ static_library("content_shell_lib") { +@@ -266,7 +266,7 @@ static_library("content_shell_lib") { if (is_fuchsia) { deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser", "//components/crash/core/app", -@@ -505,7 +505,7 @@ if (is_android) { +@@ -517,7 +517,7 @@ if (is_android) { } } @@ -27,7 +27,7 @@ data_deps += [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] } -@@ -789,7 +789,7 @@ group("content_shell_crash_test") { +@@ -801,7 +801,7 @@ group("content_shell_crash_test") { mac_bin_path + "otool", ] } @@ -36,7 +36,7 @@ data += [ "//components/crash/content/tools/generate_breakpad_symbols.py", "//components/crash/content/tools/dmp2minidump.py", -@@ -798,7 +798,7 @@ group("content_shell_crash_test") { +@@ -810,7 +810,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 c8e68f977a92..8cddfe54d24e 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,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2020-11-13 06:36:43 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2021-01-18 21:28:58 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -54,7 +54,7 @@ #if defined(USE_AURA) && defined(USE_X11) @@ -9,12 +9,12 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -141,7 +141,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { - if (!features::IsUsingOzonePlatform()) - ui::SetDefaultX11ErrorHandlers(); - #endif +@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() + } + + int ShellBrowserMainParts::PreEarlyInitialization() { -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) ++#if (!defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)) || defined(OS_BSD) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 5ff957e1cd4b..308bfc28561e 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-11-13 06:36:43 UTC +--- content/test/BUILD.gn.orig 2021-01-18 21:28:58 UTC +++ content/test/BUILD.gn -@@ -1402,10 +1402,12 @@ test("content_browsertests") { +@@ -1443,10 +1443,12 @@ test("content_browsertests") { } if (is_linux || is_chromeos) { @@ -14,10 +14,10 @@ + "../browser/zygote_host/zygote_browsertest.cc", + ] + } - deps += [ - "//services/service_manager/tests:interfaces", - "//ui/gfx:test_support", -@@ -1625,7 +1627,7 @@ static_library("run_all_unittests") { + deps += [ "//ui/gfx:test_support" ] + + if (use_atk) { +@@ -1685,7 +1687,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -26,3 +26,12 @@ deps += [ "//content/common:set_process_title_linux" ] } } +@@ -2510,7 +2512,7 @@ test("content_unittests") { + deps += [ "//ui/gfx/x" ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "../common/set_process_title_linux_unittest.cc" ] + deps += [ "//content/common:set_process_title_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 e5425d8392da..8991a23b4aa1 100644 --- a/www/chromium/files/patch-content_test_content__test__suite.cc +++ b/www/chromium/files/patch-content_test_content__test__suite.cc @@ -1,4 +1,4 @@ ---- content/test/content_test_suite.cc.orig 2020-11-13 06:36:43 UTC +--- content/test/content_test_suite.cc.orig 2021-01-18 21:28:58 UTC +++ content/test/content_test_suite.cc @@ -83,6 +83,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. @@ -13,6 +13,6 @@ gl::init::InitializeExtensionSettingsOneOffPlatform(); } +#endif - testing::TestEventListeners& listeners = - testing::UnitTest::GetInstance()->listeners(); - listeners.Append(new TestInitializationListener); + // TestEventListeners repeater event propagation is disabled in death test + // child process. + if (command_line->HasSwitch("gtest_internal_run_death_test")) { diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index 0c73128d83a9..a86ad2017462 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,15 +1,15 @@ ---- device/bluetooth/BUILD.gn.orig 2020-11-13 06:36:43 UTC +--- device/bluetooth/BUILD.gn.orig 2021-01-18 21:28:58 UTC +++ device/bluetooth/BUILD.gn -@@ -8,7 +8,7 @@ if (is_android) { +@@ -9,7 +9,7 @@ if (is_android) { } - if (is_chromeos) { + if (is_ash) { import("//chromeos/dbus/use_real_dbus_clients.gni") -} else if (use_dbus) { +} else if (use_dbus && !is_bsd) { use_real_dbus_clients = false } -@@ -294,7 +294,7 @@ component("bluetooth") { +@@ -296,7 +296,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 7f12ad43e7ff..f386022a4c3e 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,20 +1,20 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2020-11-13 06:36:43 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "extensions/browser/api/networking_private/networking_private_chromeos.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif defined(OS_WIN) || defined(OS_MAC) #include "components/wifi/wifi_service.h" -@@ -61,7 +61,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS +@@ -62,7 +62,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS NetworkingPrivateDelegate* delegate; - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS_ASH) delegate = new NetworkingPrivateChromeOS(browser_context); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) delegate = new NetworkingPrivateLinux(); #elif defined(OS_WIN) || defined(OS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); 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 28b9a0db40af..46d4f7c5f097 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-11-13 06:36:43 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -96,7 +96,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - #if defined(OS_CHROMEOS) - NetworkingConfigServiceFactory::GetInstance(); - #endif +@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + HidDeviceManager::GetFactoryInstance(); + IdleManagerFactory::GetInstance(); + ManagementAPI::GetFactoryInstance(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ defined(OS_MAC) 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 75fdfdc7cc54..bcdc000c92ce 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-11-13 06:36:43 UTC +--- extensions/common/api/_permission_features.json.orig 2021-01-18 21:28:59 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 -@@ -473,7 +473,7 @@ +@@ -457,7 +457,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -508,7 +508,7 @@ +@@ -492,7 +492,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index f02a0aab2ed0..d4b4a119e813 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,8 +1,8 @@ ---- extensions/common/features/feature.cc.orig 2020-11-13 06:36:43 UTC +--- extensions/common/features/feature.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/common/features/feature.cc @@ -26,7 +26,7 @@ Feature::Platform Feature::GetCurrentPlatform() { return LACROS_PLATFORM; - #elif defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) + #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) return CHROMEOS_PLATFORM; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) 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 2e8150300bea..428eec2975d7 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 2020-11-13 06:36:43 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -130,6 +130,8 @@ std::string GetPlatformString() { +@@ -131,6 +131,8 @@ std::string GetPlatformString() { return "mac"; #elif defined(OS_WIN) return "win"; diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 1bf65fe32ff7..00eadd305da8 100644 --- a/www/chromium/files/patch-extensions_shell_BUILD.gn +++ b/www/chromium/files/patch-extensions_shell_BUILD.gn @@ -1,11 +1,31 @@ ---- extensions/shell/BUILD.gn.orig 2020-11-13 06:36:43 UTC +--- extensions/shell/BUILD.gn.orig 2021-01-18 21:28:59 UTC +++ extensions/shell/BUILD.gn -@@ -202,7 +202,7 @@ source_set("app_shell_lib") { - } +@@ -209,16 +209,24 @@ source_set("app_shell_lib") { } -- if (is_desktop_linux) { -+ if (is_desktop_linux && !is_bsd) { + if (is_linux || is_chromeos_lacros) { ++ if (!is_bsd) { ++ sources += [ ++ "app/shell_crash_reporter_client.cc", ++ "app/shell_crash_reporter_client.h", ++ ] ++ } sources += [ - "app/shell_crash_reporter_client.cc", - "app/shell_crash_reporter_client.h", +- "app/shell_crash_reporter_client.cc", +- "app/shell_crash_reporter_client.h", + "browser/api/file_system/shell_file_system_delegate.cc", + "browser/api/file_system/shell_file_system_delegate.h", + ] ++ if (!is_bsd) { ++ deps += [ ++ "//components/crash/core/app", ++ "//components/crash/core/common", ++ ] ++ } + deps += [ + "//build:branding_buildflags", +- "//components/crash/core/app", +- "//components/crash/core/common", + "//components/upload_list", + "//components/version_info:generate_version_info", + ] diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index 40070ec0725b..b28ee2775579 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2020-11-13 06:36:43 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -69,7 +69,7 @@ base::FilePath GetDataPath() { +@@ -74,7 +74,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 3c8a1aa478c5..64980b0b0cce 100644 --- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2020-11-13 06:36:43 UTC +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc -@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin +@@ -46,7 +46,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS_ASH) info->os = api::runtime::PLATFORM_OS_CROS; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) info->os = api::runtime::PLATFORM_OS_LINUX; #endif return true; diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index ceb3d1694b28..36a912e90da1 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,20 +1,20 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2020-11-13 06:36:43 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2021-01-18 21:28:59 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc -@@ -16,7 +16,7 @@ - #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" - #include "extensions/shell/browser/shell_web_view_guest_delegate.h" +@@ -19,7 +19,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" #endif -@@ -52,7 +52,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() - return std::make_unique<ShellDisplayInfoProvider>(); - } +@@ -57,7 +57,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { if (!file_system_delegate_) file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>(); diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index fe532e143d36..9774dca85b5b 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,19 +1,20 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2020-11-13 06:36:43 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2021-01-18 21:28:59 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -33,14 +33,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC - content::BrowserContext* browser_context) const override; - std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() +@@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC const override; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) FileSystemDelegate* GetFileSystemDelegate() override; #endif MessagingDelegate* GetMessagingDelegate() override; - FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override; - +@@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC private: --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) std::unique_ptr<FileSystemDelegate> file_system_delegate_; #endif std::unique_ptr<MessagingDelegate> messaging_delegate_; diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index 893371dc19d4..a051cb473837 100644 --- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,53 +1,53 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2020-11-13 06:36:43 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2021-01-18 21:28:59 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc -@@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; +@@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) // The period at which to check if the heartbeat time has passed. Used to // protect against platforms where the timer is delayed by the system being // suspended. Only needed on linux because the other OSes provide a standard // way to be notified of system suspend and resume events. const int kHeartbeatMissedCheckMs = 1000 * 60 * 5; // 5 minutes. --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) } // namespace -@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() { +@@ -192,7 +192,7 @@ void HeartbeatManager::RestartTimer() { base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. -@@ -200,7 +200,7 @@ void HeartbeatManager::RestartTimer() { +@@ -201,7 +201,7 @@ void HeartbeatManager::RestartTimer() { base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, weak_ptr_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) } void HeartbeatManager::CheckForMissedHeartbeat() { -@@ -216,14 +216,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -217,14 +217,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { return; } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) // Otherwise check again later. io_task_runner_->PostDelayedTask( FROM_HERE, base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, weak_ptr_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) } void HeartbeatManager::UpdateHeartbeatInterval() { 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 ad516bbc7f71..f32843ec5ac2 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-11-13 06:36:43 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -583,7 +583,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -606,7 +606,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -18,7 +18,7 @@ auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -602,7 +602,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -625,7 +625,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -27,7 +27,7 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -615,7 +615,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -638,7 +638,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; base::Optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc new file mode 100644 index 000000000000..348db28a062b --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -0,0 +1,17 @@ +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-01-19 11:45:10 UTC ++++ gpu/command_buffer/service/webgpu_decoder_impl.cc +@@ -929,12 +929,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( + static_cast<DawnRequestAdapterSerial>(c.request_adapter_serial); + + if (gr_context_type_ != GrContextType::kVulkan) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SendAdapterProperties(request_adapter_serial, -1, nullptr, + "WebGPU on Linux requires command-line flag " + "--enable-features=Vulkan,UseSkiaRenderer"); + return error::kNoError; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + int32_t requested_adapter_index = GetPreferredAdapterIndex(power_preference); diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc index 631b91856b6e..642ae9c8afb9 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc @@ -258,7 +258,7 @@ void getExpectedColorAndMask(GLenum src_internal_forma @@ -9,7 +9,7 @@ // The alpha channel values for LUMINANCE_ALPHA source don't work OK // on Mac or Linux, so skip comparison of those, see crbug.com/926579 setColor(1, 1, 1, src_internal_format != GL_LUMINANCE_ALPHA, -@@ -643,8 +643,8 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -637,8 +637,8 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); @@ -20,7 +20,7 @@ (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)) // Make sure it's tested; it is safe to assume that the flag is always true // on desktop. -@@ -656,7 +656,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -650,7 +650,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipRGBA16ToRGB10A2() const { DCHECK(!ShouldSkipTest()); 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 index b690a7c50469..7effee358e18 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/webgpu_test.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/command_buffer/tests/webgpu_test.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/command_buffer/tests/webgpu_test.cc @@ -51,8 +51,8 @@ bool WebGPUTest::WebGPUSupported() const { @@ -11,8 +11,8 @@ BUILDFLAG(USE_DAWN) return true; #else -@@ -63,7 +63,7 @@ bool WebGPUTest::WebGPUSharedImageSupported() const { - void WebGPUTest::SetUp() { +@@ -67,7 +67,7 @@ void WebGPUTest::SetUp() { + gpu::GpuPreferences gpu_preferences; gpu_preferences.enable_webgpu = true; -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) 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 c6e1ab16ac2c..694ae99205a4 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,8 +1,8 @@ ---- gpu/config/gpu_control_list.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/config/gpu_control_list.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/config/gpu_control_list.cc -@@ -17,7 +17,11 @@ - #include "base/values.h" +@@ -18,7 +18,11 @@ #include "build/build_config.h" + #include "build/chromeos_buildflags.h" #include "gpu/config/gpu_util.h" +#if defined(OS_BSD) +#include <re2/re2.h> @@ -12,16 +12,16 @@ namespace gpu { namespace { -@@ -275,7 +279,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -276,7 +280,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) return kGLTypeGL; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kGLTypeGL; #elif defined(OS_MAC) return kGLTypeGL; -@@ -781,7 +785,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -782,7 +786,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index 03202ff9b382..3297dcaf8bda 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,8 +1,8 @@ ---- gpu/config/gpu_test_config.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/config/gpu_test_config.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/config/gpu_test_config.cc -@@ -27,7 +27,7 @@ namespace { +@@ -28,7 +28,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) return GPUTestConfig::kOsChromeOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) 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 36aa5093b793..55edf9b80612 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,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -16,7 +16,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" @@ -36,7 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -194,7 +194,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -201,7 +201,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 bed8e2d4079d..612820346264 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,33 +1,61 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/ipc/service/gpu_init.cc @@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +-#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -118,8 +118,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } --#endif // OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST) -+#endif // (OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +-#endif // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && +- // !BUILDFLAG(IS_CHROMECAST)) ++#endif // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) class GpuWatchdogInit { public: -@@ -203,7 +203,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -205,7 +204,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 defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -337,14 +337,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -257,7 +256,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + delayed_watchdog_enable = true; + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // PreSandbox is mainly for resource handling and not related to the GPU + // driver, it doesn't need the GPU watchdog. The loadLibrary may take long + // time that killing and restarting the GPU process will not help. +@@ -297,7 +296,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + + bool attempted_startsandbox = false; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // 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. +@@ -306,7 +305,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + watchdog_thread_.get(), &gpu_info_, gpu_preferences_); + attempted_startsandbox = true; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); + +@@ -334,14 +333,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -44,7 +72,16 @@ } if (!gl_initialized) { -@@ -424,7 +424,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -367,7 +366,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // The ContentSandboxHelper is currently the only one implementation of + // GpuSandboxHelper and it has no dependency. Except on Linux where + // VaapiWrapper checks the GL implementation to determine which display +@@ -421,7 +420,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -53,7 +90,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -438,7 +438,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -435,7 +434,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -62,7 +99,7 @@ } } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -514,7 +514,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -511,7 +510,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -71,7 +108,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. -@@ -533,7 +533,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -530,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -80,7 +117,7 @@ if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -701,7 +701,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -700,7 +699,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -89,7 +126,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. -@@ -721,7 +721,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -720,7 +719,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index 12e75d6fe7f2..ea9def5f066f 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,56 +1,47 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-11-13 06:36:44 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-01-18 21:28:59 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -57,7 +57,7 @@ const int kNewGpuTimeout = 17000; - const int kNewGpuTimeout = 15000; +@@ -77,7 +77,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t + } #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - const base::FilePath::CharType kTtyFilePath[] = - FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); - #endif -@@ -75,7 +75,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() - arm_cpu_time_(), + tty_file_ = base::OpenFile( + base::FilePath(FILE_PATH_LITERAL("/sys/class/tty/tty0/active")), "r"); + UpdateActiveTTY(); +@@ -105,7 +105,7 @@ GpuWatchdogThread::~GpuWatchdogThread() { + CloseHandle(watched_thread_handle_); #endif - suspension_counter_(this) + -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - , - host_tty_(-1) - #endif -@@ -97,7 +97,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() - DCHECK(result); + if (tty_file_) + fclose(tty_file_); #endif +@@ -476,7 +476,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() { + if (foregrounded_event_) + num_of_timeout_after_foregrounded_++; -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); UpdateActiveTTY(); - host_tty_ = active_tty_; -@@ -239,7 +239,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { + #endif - base::PowerMonitor::RemoveObserver(this); +@@ -869,7 +869,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded() + return foregrounded_event_ && num_of_timeout_after_foregrounded_ <= count; + } -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - if (tty_file_) - fclose(tty_file_); - #endif -@@ -388,7 +388,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR - return; - #endif + void GpuWatchdogThread::UpdateActiveTTY() { + last_active_tty_ = active_tty_; --#if defined(USE_X11) -+#if defined(USE_X11) && !defined(OS_BSD) - // Don't crash if we're not on the TTY of our host X11 server. - UpdateActiveTTY(); - if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) { -@@ -548,7 +548,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT - } +@@ -886,7 +886,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { #endif + bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() { -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - void GpuWatchdogThreadImplV1::UpdateActiveTTY() { - last_active_tty_ = active_tty_; + if (host_tty_ == -1 || active_tty_ == -1) + return false; 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 c711d7bec6e5..17f0cf516179 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,20 +1,20 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-11-13 06:36:44 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2021-01-18 21:28:59 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 - base::ThreadTicks GetWatchedThreadTime(); - #endif +@@ -206,7 +206,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi + bool WithinOneMinFromPowerResumed(); + bool WithinOneMinFromForegrounded(); -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) void UpdateActiveTTY(); #endif - -@@ -261,7 +261,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 - base::Time check_time_; - base::TimeTicks check_timeticks_; + // The watchdog continues when it's not on the TTY of our host X11 server. +@@ -278,7 +278,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi + bool less_than_full_thread_time_after_capped_ = false; + #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - FILE* tty_file_; - int host_tty_; + FILE* tty_file_ = nullptr; + int host_tty_ = -1; int active_tty_ = -1; 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 0a2245d10a9b..80384a93a072 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-11-13 06:36:44 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2021-01-18 21:28:59 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -236,10 +236,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; #endif // defined(OS_ANDROID) @@ -13,7 +13,7 @@ #if defined(OS_WIN) VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR; -@@ -247,10 +247,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -246,10 +246,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkImportSemaphoreWin32HandleKHR; #endif // defined(OS_WIN) @@ -26,7 +26,7 @@ #if defined(OS_WIN) VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR; -@@ -955,7 +955,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope +@@ -954,7 +954,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // defined(OS_ANDROID) @@ -35,7 +35,7 @@ ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -969,7 +969,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( +@@ -968,7 +968,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo); } @@ -44,7 +44,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( -@@ -988,7 +988,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -987,7 +987,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // defined(OS_WIN) @@ -53,7 +53,7 @@ ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -1003,7 +1003,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, +@@ -1002,7 +1002,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties); } @@ -62,7 +62,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1083,4 +1083,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1082,4 +1082,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index 0dc7c04448e8..5f2a100292bb 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-11-13 06:36:44 UTC +--- headless/BUILD.gn.orig 2021-01-18 21:28:59 UTC +++ headless/BUILD.gn -@@ -275,7 +275,7 @@ source_set("headless_shared_sources") { +@@ -271,7 +271,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", -@@ -295,7 +295,7 @@ source_set("headless_shared_sources") { +@@ -291,7 +291,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -448,7 +448,7 @@ component("headless_non_renderer") { +@@ -455,7 +455,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,7 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -732,7 +732,7 @@ static_library("headless_shell_lib") { +@@ -746,7 +746,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } 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 008d6bead46c..d8b8549614c1 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-11-13 06:36:44 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2021-01-18 21:28:59 UTC +++ headless/lib/browser/headless_request_context_manager.cc @@ -26,7 +26,7 @@ namespace headless { @@ -18,9 +18,9 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -213,7 +213,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM - proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( - base::ThreadTaskRunnerHandle::Get()); +@@ -218,7 +218,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM + base::ThreadTaskRunnerHandle::Get()); + } } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) 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 56dccc3ff747..41eab8eaa6fd 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-11-13 06:36:44 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2021-01-18 21:28:59 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -323,7 +323,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -326,7 +326,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(); -@@ -352,7 +352,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -355,7 +355,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( crash_reporter::InitializeCrashpadWithEmbeddedHandler( process_type.empty(), process_type, "", base::FilePath()); #endif // defined(HEADLESS_USE_BREAKPAD) diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 7cc7762cf5c9..1350bb0df4fc 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2020-11-13 06:36:44 UTC +--- ipc/ipc_message_utils.cc.orig 2021-01-18 21:29:00 UTC +++ ipc/ipc_message_utils.cc -@@ -356,7 +356,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -357,7 +357,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 48848b25bd1a..6c98239417f5 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-11-13 06:36:44 UTC +--- media/BUILD.gn.orig 2021-01-18 21:29:00 UTC +++ media/BUILD.gn -@@ -65,6 +65,9 @@ config("media_config") { +@@ -66,6 +66,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 0b4e4efe428a..b6a9e9388ee2 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2020-11-13 06:36:44 UTC +--- media/audio/BUILD.gn.orig 2021-01-18 21:29:00 UTC +++ media/audio/BUILD.gn -@@ -236,7 +236,7 @@ source_set("audio") { +@@ -238,7 +238,7 @@ source_set("audio") { ] } @@ -9,7 +9,7 @@ sources += [ "linux/audio_manager_linux.cc" ] } -@@ -299,6 +299,17 @@ source_set("audio") { +@@ -303,6 +303,17 @@ source_set("audio") { } else { deps += [ ":libpulse_stubs" ] } diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc index 1bd001c55cba..bb2dcdca8ef9 100644 --- a/www/chromium/files/patch-media_audio_audio__features.cc +++ b/www/chromium/files/patch-media_audio_audio__features.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_features.cc.orig 2020-11-13 06:36:44 UTC +--- media/audio/audio_features.cc.orig 2021-01-18 21:29:00 UTC +++ media/audio/audio_features.cc -@@ -11,7 +11,7 @@ namespace features { +@@ -12,7 +12,7 @@ namespace features { // detected. It will be restarted when needed. const base::Feature kAudioServiceOutOfProcessKillAtHang{ "AudioServiceOutOfProcessKillAtHang", diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index 5b02680849b4..7dbb84aa80c9 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2020-11-13 06:36:44 UTC +--- media/base/audio_latency.cc.orig 2021-01-18 21:29:00 UTC +++ media/base/audio_latency.cc -@@ -113,7 +113,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -114,7 +114,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in return frames_per_buffer; } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index c6400112c6e7..172e017a3187 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,20 +1,20 @@ ---- media/base/media_switches.cc.orig 2020-11-13 06:36:44 UTC +--- media/base/media_switches.cc.orig 2021-01-18 21:29:00 UTC +++ media/base/media_switches.cc -@@ -361,7 +361,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -348,7 +348,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode + // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT @@ -390,7 +390,7 @@ const base::Feature kGlobalMediaControlsOverlayControl + // Show picture-in-picture button in Global Media Controls. const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 4d515983bf0c..397c394e8812 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2020-11-13 06:36:44 UTC +--- media/base/video_frame.cc.orig 2021-01-18 21:29:00 UTC +++ media/base/video_frame.cc @@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -36,16 +36,16 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -607,7 +607,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM - } - +@@ -612,7 +612,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM + for (size_t i = 0; i < num_planes; ++i) + planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -645,7 +645,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -657,7 +657,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -54,7 +54,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -847,7 +847,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -858,7 +858,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -63,7 +63,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1190,7 +1190,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const +@@ -1198,7 +1198,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const : mailbox_holders_[texture_index]; } @@ -72,7 +72,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1273,7 +1273,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1281,7 +1281,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 2bd506c057b4..47fb06e39d1f 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-11-13 06:36:44 UTC +--- media/base/video_frame.h.orig 2021-01-18 21:29:00 UTC +++ media/base/video_frame.h -@@ -41,9 +41,9 @@ +@@ -40,9 +40,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ namespace gfx { class GpuMemoryBuffer; -@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -82,7 +82,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 -@@ -260,7 +260,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -259,7 +259,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 -@@ -507,7 +507,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -509,7 +509,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 -@@ -696,7 +696,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -695,7 +695,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_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index 83318cc386d4..26a92c7f7aa0 100644 --- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,20 +1,20 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2020-11-13 06:36:44 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2021-01-18 21:29:00 UTC +++ media/capture/video/create_video_capture_device_factory.cc -@@ -10,7 +10,7 @@ +@@ -11,7 +11,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) #include "media/capture/video/linux/video_capture_device_factory_linux.h" - #elif defined(OS_CHROMEOS) + #elif BUILDFLAG(IS_ASH) #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h" -@@ -82,7 +82,7 @@ CreateChromeOSVideoCaptureDeviceFactory( +@@ -83,7 +83,7 @@ CreateChromeOSVideoCaptureDeviceFactory( std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); - #elif defined(OS_CHROMEOS) + #elif BUILDFLAG(IS_ASH) return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {}); diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 8b9c2d879958..8b546992b1f2 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2020-11-13 06:36:44 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2021-01-18 21:29:00 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -318,7 +318,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -319,7 +319,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc index 95b91bba1f90..aa349dc98122 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,4 +1,4 @@ ---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2020-11-13 06:36:44 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2021-01-18 21:29:00 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc @@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( const uint8_t* es; @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (cur_buf[0] != 0xff) continue; -@@ -153,7 +153,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( +@@ -155,7 +155,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( return true; } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index ba12f2052a2d..4d2d1ffbab4a 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-11-13 06:36:44 UTC +--- media/media_options.gni.orig 2021-01-18 21:29:00 UTC +++ media/media_options.gni -@@ -120,6 +120,9 @@ declare_args() { +@@ -123,6 +123,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc index c5f8f2c594c7..6e56e5bfe78e 100644 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -1,6 +1,6 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-11-13 06:36:44 UTC +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2021-01-18 21:29:00 UTC +++ media/mojo/clients/mojo_video_encode_accelerator.cc -@@ -132,7 +132,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< +@@ -134,7 +134,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< DCHECK_EQ(num_planes, frame->layout().num_planes()); DCHECK(vea_.is_bound()); diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 182e87a59a63..02da073d00b6 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,8 +1,8 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-11-13 06:36:44 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2021-01-18 21:29:00 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -21,9 +21,9 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" - #include "ui/gl/mojom/hdr_metadata_mojom_traits.h" + #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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 1ba7d826e18f..a4dc0b3c50ad 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-11-13 06:36:44 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2021-01-18 21:29:00 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -67,7 +67,7 @@ namespace media { +@@ -68,7 +68,7 @@ namespace media { namespace { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ gpu::CommandBufferStub* GetCommandBufferStub( scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, -@@ -298,7 +298,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea +@@ -299,7 +299,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea command_buffer_id->route_id)); } diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index a61fb6029368..8dc533efcb88 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-11-13 06:36:45 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2021-01-18 21:29:01 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -573,7 +573,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc new file mode 100644 index 000000000000..0588a23a6b8a --- /dev/null +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -0,0 +1,20 @@ +--- media/video/video_encode_accelerator_adapter.cc.orig 2021-01-22 12:10:35 UTC ++++ media/video/video_encode_accelerator_adapter.cc +@@ -40,7 +40,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( + opts.bitrate.value_or(opts.frame_size.width() * opts.frame_size.height() * + kVEADefaultBitratePerPixel)); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (storage_type == VideoFrame::STORAGE_DMABUFS || + storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { + config.storage_type = VideoEncodeAccelerator::Config::StorageType::kDmabuf; +@@ -269,7 +269,7 @@ void VideoEncodeAcceleratorAdapter::EncodeOnAccelerato + return; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Linux/ChromeOS require a special configuration to use dmabuf storage. + const bool is_same_storage_type = storage_type_ == frame->storage_type(); + #else 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 3b93a4c33865..537e0507b85c 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-11-13 06:36:45 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2021-01-18 21:29:01 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -59,7 +59,7 @@ - file="${root_gen_dir}/mojo/public/mojom/base/text_direction.mojom-lite.js" +@@ -80,7 +80,7 @@ use_base_dir="false" + resource_path="mojo/mojo/public/mojom/base/text_direction.mojom-lite.js" type="BINDATA" /> - <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" + <include name="IDR_MOJO_PROCESS_ID_MOJOM_WEBUI_JS" + file="${root_gen_dir}/mojom-webui/mojo/public/mojom/base/process_id.mojom-webui.js" use_base_dir="false" diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 99e5c28e7ab8..091c6f752c05 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-11-13 06:36:45 UTC +--- net/BUILD.gn.orig 2021-01-18 21:29:01 UTC +++ net/BUILD.gn @@ -99,7 +99,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1261,6 +1261,16 @@ component("net") { +@@ -1249,6 +1249,16 @@ component("net") { ] } @@ -26,7 +26,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1397,7 +1407,7 @@ component("net") { +@@ -1385,7 +1395,7 @@ component("net") { } } @@ -35,7 +35,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1430,7 +1440,7 @@ component("net") { +@@ -1418,7 +1428,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -44,7 +44,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4770,7 +4780,7 @@ test("net_unittests") { +@@ -4759,7 +4769,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index d168e63e4da2..f106c24e6815 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2020-11-13 06:36:45 UTC +--- net/base/network_change_notifier.cc.orig 2021-01-18 21:29:01 UTC +++ net/base/network_change_notifier.cc -@@ -36,7 +36,7 @@ +@@ -35,7 +35,7 @@ #include "net/base/network_change_notifier_linux.h" #elif defined(OS_APPLE) #include "net/base/network_change_notifier_mac.h" diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index b6b7cfad0efa..8e46f139c1c4 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,8 +1,8 @@ ---- net/dns/dns_util.cc.orig 2020-11-13 06:36:45 UTC +--- net/dns/dns_util.cc.orig 2021-01-18 21:29:02 UTC +++ net/dns/dns_util.cc -@@ -39,6 +39,8 @@ const uint16_t kFlagNamePointer = 0xc000; - - } // namespace +@@ -28,6 +28,8 @@ + #include "net/third_party/uri_template/uri_template.h" + #include "url/url_canon.h" +#include <sys/socket.h> + diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc index 42e0ff1ef406..80c8b2e6d358 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2020-11-13 06:36:46 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2021-01-18 21:29:02 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2114,7 +2114,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa +@@ -2129,7 +2129,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // enabled only on certain platforms. // ChromeOS is disabled due to crbug.com/986904 diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc index 9c985de0331b..2780242e4c74 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,6 +1,6 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-11-13 06:36:46 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2021-01-18 21:29:02 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #elif defined(OS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -60,7 +60,7 @@ namespace net { +@@ -61,7 +61,7 @@ namespace net { namespace { #if defined(OS_WIN) || defined(OS_APPLE) || \ diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 32ca7ec091d9..c28e3197ed7d 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-11-13 06:36:46 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2021-01-18 21:29:02 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -69,7 +69,7 @@ +@@ -68,7 +68,7 @@ #include "ui/gfx/geometry/vector2d.h" #include "v8/include/v8.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -416,7 +416,7 @@ void InitializeSDK(bool enable_v8) { +@@ -400,7 +400,7 @@ void InitializeSDK(bool enable_v8) { FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -475,7 +475,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -459,7 +459,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 -@@ -948,7 +948,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -924,7 +924,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3042,7 +3042,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -3019,7 +3019,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); last_progressive_start_time_ = base::Time::Now(); @@ -45,7 +45,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3529,7 +3529,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3506,7 +3506,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_flash__resource.cc b/www/chromium/files/patch-ppapi_proxy_flash__resource.cc deleted file mode 100644 index 3c8227e6f9b4..000000000000 --- a/www/chromium/files/patch-ppapi_proxy_flash__resource.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ppapi/proxy/flash_resource.cc.orig 2020-11-13 06:36:46 UTC -+++ ppapi/proxy/flash_resource.cc -@@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan - // require filesystem access prohibited by the sandbox. - // TODO(shess): Figure out why OSX needs the access, the sandbox warmup should - // handle it. http://crbug.com/149006 --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) - int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>( - BROWSER, - PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)), diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 3722d8967d42..156cae4c4c23 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2020-11-16 14:50:08 UTC +--- printing/print_settings.cc.orig 2021-01-18 21:29:02 UTC +++ printing/print_settings.cc -@@ -277,9 +277,9 @@ void PrintSettings::Clear() { +@@ -278,9 +278,9 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; @@ -9,6 +9,6 @@ advanced_settings_.clear(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) send_user_info_ = false; username_.clear(); diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index fa3c1bda3d7d..45901a2213dc 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,6 +1,6 @@ ---- printing/print_settings.h.orig 2020-11-13 06:36:46 UTC +--- printing/print_settings.h.orig 2021-01-18 21:29:02 UTC +++ printing/print_settings.h -@@ -19,11 +19,11 @@ +@@ -20,11 +20,11 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -14,7 +14,7 @@ namespace printing { -@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { +@@ -81,9 +81,9 @@ class PRINTING_EXPORT PrintSettings { } }; @@ -26,7 +26,7 @@ PrintSettings(); PrintSettings(const PrintSettings&) = delete; -@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { +@@ -222,12 +222,12 @@ class PRINTING_EXPORT PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -39,9 +39,9 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) void set_send_user_info(bool send_user_info) { -@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { +@@ -321,10 +321,10 @@ class PRINTING_EXPORT PrintSettings { // Number of pages per sheet. int pages_per_sheet_; @@ -52,5 +52,5 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) // Whether to send user info. diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index b0e71bb303b7..d526bb232ce1 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,15 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2020-11-16 14:49:24 UTC +--- printing/print_settings_conversion.cc.orig 2021-01-18 21:29:02 UTC +++ printing/print_settings_conversion.cc -@@ -182,7 +182,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet - return nullptr; - } - --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::Optional<int> dpi_horizontal = - job_settings.FindIntKey(kSettingDpiHorizontal); - base::Optional<int> dpi_vertical = -@@ -212,14 +212,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet #endif } @@ -24,5 +15,5 @@ -#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) +#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_ASH) bool send_user_info = diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc index de84417203a9..37d89b5f9a7b 100644 --- a/www/chromium/files/patch-printing_printing__features.cc +++ b/www/chromium/files/patch-printing_printing__features.cc @@ -1,6 +1,6 @@ ---- printing/printing_features.cc.orig 2020-11-16 14:50:34 UTC +--- printing/printing_features.cc.orig 2021-01-18 21:29:02 UTC +++ printing/printing_features.cc -@@ -47,13 +47,13 @@ bool ShouldPrintUsingXps(bool source_is_pdf) { +@@ -49,13 +49,13 @@ bool ShouldPrintUsingXps(bool source_is_pdf) { } #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-printing_printing__features.h b/www/chromium/files/patch-printing_printing__features.h index f0c1ca5c9cf2..12e34db3e99b 100644 --- a/www/chromium/files/patch-printing_printing__features.h +++ b/www/chromium/files/patch-printing_printing__features.h @@ -1,6 +1,6 @@ ---- printing/printing_features.h.orig 2020-11-16 14:50:53 UTC +--- printing/printing_features.h.orig 2021-01-18 21:29:02 UTC +++ printing/printing_features.h -@@ -37,10 +37,10 @@ PRINTING_EXPORT bool IsXpsPrintCapabilityRequired(); +@@ -38,10 +38,10 @@ PRINTING_EXPORT bool IsXpsPrintCapabilityRequired(); PRINTING_EXPORT bool ShouldPrintUsingXps(bool source_is_pdf); #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc new file mode 100644 index 000000000000..f81007bd8d70 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc @@ -0,0 +1,11 @@ +--- remoting/host/heartbeat_sender.cc.orig 2021-01-19 11:48:10 UTC ++++ remoting/host/heartbeat_sender.cc +@@ -109,7 +109,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = { + }; + + std::string GetHostname() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return net::GetHostName(); + #elif defined(OS_WIN) + wchar_t buffer[MAX_PATH] = {0}; diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index e0c6c02a18c6..99b924ddd85c 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-11-13 06:36:46 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-01-18 21:29:02 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -29,13 +29,13 @@ +@@ -29,12 +29,12 @@ #include "remoting/host/switches.h" #include "remoting/host/usage_stats_consent.h" @@ -10,22 +10,21 @@ #include "base/linux_util.h" #include "ui/events/platform/x11/x11_event_source.h" - #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_APPLE) #include "base/mac/mac_util.h" -@@ -113,7 +113,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Required in order for us to run multiple X11 threads. - XInitThreads(); - -@@ -134,7 +134,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Create an X11EventSource so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -130,7 +130,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); 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 92a68a4d2586..425214016736 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2020-11-13 06:36:46 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-01-18 21:29:02 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -118,7 +118,7 @@ +@@ -118,14 +118,14 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,16 +9,15 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -126,7 +126,7 @@ + #include "remoting/host/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" - #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) #include <commctrl.h> -@@ -161,11 +161,11 @@ const char kApplicationName[] = "chromoting"; +@@ -160,11 +160,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -41,7 +40,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -761,7 +761,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -50,7 +49,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -848,7 +848,7 @@ void HostProcess::StartOnUiThread() { +@@ -850,7 +850,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -59,7 +58,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()-> -@@ -857,7 +857,7 @@ void HostProcess::StartOnUiThread() { +@@ -859,7 +859,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -68,7 +67,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -906,7 +906,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -77,7 +76,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. -@@ -1512,7 +1512,7 @@ void HostProcess::StartHost() { +@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -86,7 +85,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1687,7 +1687,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1722,7 +1722,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__main.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc index fb0c7c1fe120..dd072f90d01b 100644 --- a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/test/it2me_standalone_host_main.cc.orig 2020-11-13 06:36:46 UTC +--- remoting/test/it2me_standalone_host_main.cc.orig 2021-01-18 21:29:02 UTC +++ remoting/test/it2me_standalone_host_main.cc -@@ -9,20 +9,20 @@ +@@ -9,19 +9,19 @@ #include "remoting/proto/event.pb.h" #include "remoting/test/it2me_standalone_host.h" @@ -10,7 +10,6 @@ #include "base/linux_util.h" #include "ui/events/platform/x11/x11_event_source.h" - #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -21,10 +20,10 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Required in order for us to run multiple X11 threads. - XInitThreads(); - -@@ -43,7 +43,7 @@ int main(int argc, const char** argv) { + // Create an X11EventSource so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -39,7 +39,7 @@ int main(int argc, const char** argv) { // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 0df50a887585..02f613747dac 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2020-11-13 06:36:46 UTC +--- sandbox/policy/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ sandbox/policy/BUILD.gn -@@ -27,7 +27,7 @@ component("policy") { +@@ -29,7 +29,7 @@ component("policy") { "//sandbox:common", ] public_deps = [] diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index f7e5ea3832c3..1cb0054e601b 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2020-11-13 06:36:46 UTC +--- sandbox/policy/switches.cc.orig 2021-01-18 21:29:02 UTC +++ sandbox/policy/switches.cc -@@ -81,7 +81,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -82,7 +82,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index 6470be393f73..2bf645bed2b2 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2020-11-13 06:36:46 UTC +--- sandbox/policy/switches.h.orig 2021-01-18 21:29:02 UTC +++ sandbox/policy/switches.h -@@ -53,7 +53,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -54,7 +54,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn index f00f7215529c..eaab28159bd4 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-11-13 06:36:46 UTC +--- services/audio/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ services/audio/BUILD.gn -@@ -73,7 +73,7 @@ source_set("audio") { +@@ -75,7 +75,7 @@ source_set("audio") { "//services/audio/public/mojom", ] diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn index e5ced79573da..6d1eb7190ee1 100644 --- a/www/chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/chromium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2020-11-13 06:36:46 UTC +--- services/device/hid/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ services/device/hid/BUILD.gn -@@ -43,6 +43,15 @@ source_set("hid") { +@@ -45,6 +45,15 @@ source_set("hid") { deps += [ "//device/udev_linux" ] } @@ -13,6 +13,6 @@ + ] + } + - if (is_chromeos) { + if (is_ash) { deps += [ "//chromeos/dbus/permission_broker" ] } diff --git a/www/chromium/files/patch-services_device_serial_BUILD.gn b/www/chromium/files/patch-services_device_serial_BUILD.gn index be3edea49a39..b392ba45cb5e 100644 --- a/www/chromium/files/patch-services_device_serial_BUILD.gn +++ b/www/chromium/files/patch-services_device_serial_BUILD.gn @@ -1,8 +1,8 @@ ---- services/device/serial/BUILD.gn.orig 2020-11-13 06:36:46 UTC +--- services/device/serial/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ services/device/serial/BUILD.gn -@@ -11,7 +11,7 @@ import("//build/config/features.gni") - import("//build/config/deprecated_default_sources_assignment_filter.gni") - set_sources_assignment_filter(deprecated_default_sources_assignment_filter) +@@ -5,7 +5,7 @@ + import("//build/config/chromeos/ui_mode.gni") + import("//build/config/features.gni") -if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { +if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_bsd) { diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 12e644baf348..24bc299c6937 100644 --- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2020-11-13 06:36:46 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2021-01-18 21:29:02 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -37,6 +37,10 @@ struct termios2 { +@@ -38,6 +38,10 @@ struct termios2 { #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -11,7 +11,7 @@ #if defined(OS_MAC) #include <IOKit/serial/ioss.h> #endif -@@ -67,7 +71,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -68,7 +72,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 32cd6093ada7..8325c3447e0e 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-11-13 06:36:46 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2021-01-18 21:29:02 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -127,7 +127,11 @@ class TimeZoneMonitorLinuxImpl +@@ -125,7 +125,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index 23535f348f91..e6814a7ee2ee 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2020-11-13 06:36:46 UTC +--- services/device/usb/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ services/device/usb/BUILD.gn -@@ -125,7 +125,7 @@ static_library("usb") { +@@ -142,7 +142,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 2c5e3d3f6194..286f8a2e6c5e 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-11-13 06:36:46 UTC +--- services/network/BUILD.gn.orig 2021-01-18 21:29:02 UTC +++ services/network/BUILD.gn -@@ -261,9 +261,15 @@ component("network_service") { +@@ -263,9 +263,15 @@ component("network_service") { deps += [ "//components/certificate_transparency" ] } diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index bc2d8c8610d5..02ca797698b8 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,11 +1,11 @@ ---- services/network/network_context.cc.orig 2020-11-13 06:36:46 UTC +--- services/network/network_context.cc.orig 2021-01-18 21:29:02 UTC +++ services/network/network_context.cc -@@ -1916,7 +1916,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -2292,7 +2292,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const - net::CookieCryptoDelegate* crypto_delegate = nullptr; - if (params_->enable_encrypted_cookies) { + net::CookieCryptoDelegate* crypto_delegate = nullptr; + if (params_->enable_encrypted_cookies) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) - DCHECK(network_service_->os_crypt_config_set()) - << "NetworkService::SetCryptConfig must be called before creating a " - "NetworkContext with encrypted cookies."; ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + DCHECK(network_service_->os_crypt_config_set()) + << "NetworkService::SetCryptConfig must be called before creating a " + "NetworkContext with encrypted cookies."; diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 44a28b358f2a..a8db15a95606 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2020-11-13 06:36:46 UTC +--- services/network/network_service.cc.orig 2021-01-18 21:29:02 UTC +++ services/network/network_service.cc -@@ -70,7 +70,7 @@ +@@ -73,7 +73,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) +-#if (defined(OS_LINUX) || BUILDFLAG(IS_LACROS)) && !BUILDFLAG(IS_CHROMECAST) ++#if ((defined(OS_LINUX) || BUILDFLAG(IS_LACROS)) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -670,7 +670,7 @@ void NetworkService::OnCertDBChanged() { +@@ -678,7 +678,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { #if !BUILDFLAG(IS_CHROMECAST) DCHECK(!os_crypt_config_set_); diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 590b643b6ede..5d222e781c5d 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,11 +1,11 @@ ---- services/network/network_service.h.orig 2020-11-13 06:36:46 UTC +--- services/network/network_service.h.orig 2021-01-18 21:29:02 UTC +++ services/network/network_service.h -@@ -196,7 +196,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -197,7 +197,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span<const uint8_t> config, mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; void OnCertDBChanged() override; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif #if defined(OS_WIN) || defined(OS_MAC) 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 index e1dbf5f89ef6..0026f13e9f61 100644 --- 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 @@ -1,6 +1,6 @@ ---- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig 2020-11-13 06:36:46 UTC +--- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig 2021-01-18 21:29:02 UTC +++ services/network/public/cpp/cert_verifier/cert_verifier_creation.cc -@@ -70,7 +70,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro +@@ -71,7 +71,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro bool IsUsingCertNetFetcher() { #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 193a206ad746..edd471f2f81d 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,15 +1,15 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2020-11-13 06:36:46 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2021-01-18 21:29:02 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -45,7 +45,7 @@ namespace { +@@ -50,7 +50,7 @@ namespace { uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; - return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -84,7 +84,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -90,7 +90,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); diff --git a/www/chromium/files/patch-services_service__manager_BUILD.gn b/www/chromium/files/patch-services_service__manager_BUILD.gn index 55d40b8f071a..698821fc8f77 100644 --- a/www/chromium/files/patch-services_service__manager_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/BUILD.gn.orig 2020-11-17 10:19:16 UTC +--- services/service_manager/BUILD.gn.orig 2021-01-18 21:29:03 UTC +++ services/service_manager/BUILD.gn -@@ -65,7 +65,7 @@ source_set("service_manager") { +@@ -66,7 +66,7 @@ source_set("service_manager") { ] } diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index ca75a0ea0c83..a364e6578638 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-11-13 06:42:14 UTC +--- third_party/angle/BUILD.gn.orig 2021-01-18 21:31:44 UTC +++ third_party/angle/BUILD.gn -@@ -141,10 +141,17 @@ config("extra_warnings") { +@@ -162,10 +162,17 @@ config("extra_warnings") { ] } if (is_clang) { @@ -19,7 +19,7 @@ "-Wextra-semi-stmt", "-Wfloat-conversion", "-Winconsistent-missing-destructor-override", -@@ -154,8 +161,6 @@ config("extra_warnings") { +@@ -175,8 +182,6 @@ config("extra_warnings") { "-Wredundant-parens", "-Wreturn-std-move-in-c++11", "-Wshadow-field", @@ -28,7 +28,7 @@ "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", -@@ -396,6 +401,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -425,6 +430,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 97366af14810..d591e0b978f0 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,24 +1,24 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2020-11-13 06:42:14 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2021-01-18 21:31:44 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ - # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" - # elif defined(ANGLE_PLATFORM_IOS) - # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" + # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" + # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) + # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -264,7 +264,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di - impl = new rx::DisplayCGL(state); - # elif defined(ANGLE_PLATFORM_IOS) - impl = new rx::DisplayEAGL(state); +@@ -272,7 +272,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + impl = rx::CreateDisplayCGLOrEAGL(state); + break; + -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -305,7 +305,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -313,7 +313,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -354,7 +354,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di { impl = rx::CreateVulkanWin32Display(state); } @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_X11) if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { -@@ -1612,7 +1612,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1650,7 +1650,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp index 4b89216ca42f..811b82190f61 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2020-11-13 06:42:14 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-01-18 21:31:44 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp @@ -17,7 +17,7 @@ # include <sys/system_properties.h> @@ -9,7 +9,7 @@ # include <sys/utsname.h> #endif -@@ -207,7 +207,7 @@ OSVersion GetMacOSVersion() +@@ -213,7 +213,7 @@ OSVersion GetMacOSVersion() } #endif @@ -18,7 +18,7 @@ bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch) { errno = 0; // reset global error flag. -@@ -219,6 +219,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -225,6 +225,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj } *minor = static_cast<int>(strtol(next + 1, &next, 10)); @@ -33,7 +33,7 @@ if (next == nullptr || *next != '.' || errno != 0) { return false; -@@ -229,6 +237,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -235,6 +243,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } @@ -41,7 +41,7 @@ return true; } -@@ -236,7 +245,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -242,7 +251,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj OSVersion GetLinuxOSVersion() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 18043f6cd60a..c5240018afb1 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-11-13 06:42:14 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-01-18 21:31:44 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -145,7 +145,7 @@ inline bool IsWindows() +@@ -151,7 +151,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index 1d028b65cef8..eb0a23c94bd6 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-11-13 06:42:14 UTC +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2021-01-18 21:31:44 UTC +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h -@@ -19,10 +19,10 @@ bool IsVulkanWin32DisplayAvailable(); +@@ -19,13 +19,13 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); #endif // defined(ANGLE_PLATFORM_WINDOWS) @@ -8,6 +8,9 @@ +#if defined(ANGLE_PLATFORM_POSIX) bool IsVulkanXcbDisplayAvailable(); DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); + + bool IsVulkanSimpleDisplayAvailable(); + DisplayImpl *CreateVulkanSimpleDisplay(const egl::DisplayState &state); -#endif // defined(ANGLE_PLATFORM_LINUX) +#endif // defined(ANGLE_PLATFORM_POSIX) 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 b06ae7262239..55210585897d 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,11 +1,11 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-11-13 06:42:27 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2021-01-18 21:31:55 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c -@@ -250,7 +250,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__) static inline bool IsHighIntegrity() { return geteuid() != getuid() || getegid() != getgid(); diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h index 689f2d76f21b..455a78354622 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,11 +1,11 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2020-11-13 06:42:27 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2021-01-18 21:31:55 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h -@@ -31,7 +31,7 @@ +@@ -35,7 +35,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__) /* Linux-specific common code: */ // Headers: diff --git a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc new file mode 100644 index 000000000000..91e7fd189957 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -0,0 +1,11 @@ +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2021-01-19 11:50:03 UTC ++++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc +@@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat + if (!data.ReadAcceptLanguages(&out->accept_languages)) + return false; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (!data.ReadSystemFontFamilyName(&out->system_font_family_name)) + return false; + #endif diff --git a/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h b/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h deleted file mode 100644 index 8108d552954d..000000000000 --- a/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/public/common/privacy_budget/identifiable_token.h.orig 2020-11-18 10:21:45 UTC -+++ third_party/blink/public/common/privacy_budget/identifiable_token.h -@@ -118,7 +118,7 @@ class IdentifiableToken { - - // Enums. Punt to the underlying type. - template <typename T, -- typename U = typename std::underlying_type<T>::type, -+ typename U = typename std::__sfinae_underlying_type<T>::type, - typename std::enable_if_t<std::is_enum<T>::value>* = nullptr> - constexpr IdentifiableToken(T in) // NOLINT(google-explicit-constructor) - : IdentifiableToken(static_cast<U>(in)) {} diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h new file mode 100644 index 000000000000..7a1fe06c6011 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -0,0 +1,11 @@ +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-01-19 11:50:37 UTC ++++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h +@@ -49,7 +49,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { + bool webrtc_allow_legacy_tls_protocols{false}; + UserAgentOverride user_agent_override; + std::string accept_languages; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + std::string system_font_family_name; + #endif + #if defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h new file mode 100644 index 000000000000..4fab1042acb3 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -0,0 +1,11 @@ +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-01-19 11:50:20 UTC ++++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h +@@ -154,7 +154,7 @@ struct BLINK_COMMON_EXPORT + return data.accept_languages; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + static const std::string& system_font_family_name( + const ::blink::RendererPreferences& data) { + return data.system_font_family_name; diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn index a69ab245ee57..df61d7ae9bb6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/BUILD.gn.orig 2020-11-13 06:36:47 UTC +--- third_party/blink/renderer/BUILD.gn.orig 2021-01-18 21:29:03 UTC +++ third_party/blink/renderer/BUILD.gn -@@ -45,8 +45,8 @@ config("inside_blink") { +@@ -46,8 +46,8 @@ config("inside_blink") { "-Wconversion", "-Wno-float-conversion", "-Wno-sign-conversion", @@ -10,4 +10,4 @@ +# "-Wno-implicit-int-conversion", ] - if (!is_chromeos || default_toolchain != "//build/toolchain/cros:target") { + if (!is_ash || default_toolchain != "//build/toolchain/cros:target") { diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 662760163cd0..8ad371ca25d4 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,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-11-13 06:36:47 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-01-18 21:29:04 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -68,11 +68,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" @@ -23,7 +23,7 @@ defined(OS_MAC) || defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -212,7 +212,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -220,7 +220,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc index 585e9452f272..055a5119e617 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig 2020-11-16 14:53:50 UTC +--- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig 2021-01-18 21:29:04 UTC +++ third_party/blink/renderer/core/clipboard/system_clipboard.cc -@@ -41,10 +41,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame) +@@ -42,10 +42,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame) frame->GetBrowserInterfaceBroker().GetInterface( clipboard_.BindNewPipeAndPassReceiver( frame->GetTaskRunner(TaskType::kUserInteraction))); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) is_selection_buffer_available_ = frame->GetSettings()->GetSelectionClipboardBufferAvailable(); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) } bool SystemClipboard::IsSelectionMode() const { 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 deleted file mode 100644 index 53ac078049c6..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-11-13 06:36:47 UTC -+++ third_party/blink/renderer/core/exported/web_frame_test.cc -@@ -6054,7 +6054,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { - EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); - } - --#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) - TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { - RegisterMockedHttpURLLoad("move_caret.html"); - -@@ -6387,7 +6387,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { - TEST_F(CompositedSelectionBoundsTest, EditableDiv) { - RunTest("composited_selection_bounds_editable_div.html"); - } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || 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_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc new file mode 100644 index 000000000000..ae0455e27a15 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -0,0 +1,26 @@ +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-01-19 11:50:55 UTC ++++ third_party/blink/renderer/core/exported/web_view_impl.cc +@@ -410,7 +410,7 @@ ui::mojom::blink::WindowOpenDisposition NavigationPoli + #if !defined(OS_MAC) && !defined(OS_WIN) + SkFontHinting RendererPreferencesToSkiaHinting( + const blink::RendererPreferences& prefs) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!prefs.should_antialias_text) { + // When anti-aliasing is off, GTK maps all non-zero hinting settings to + // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' +@@ -3185,12 +3185,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs + gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE); + WebFontRenderStyle::SetSubpixelPositioning( + renderer_preferences_.use_subpixel_positioning); +-#if defined(OS_LINUX) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_ANDROID)) || defined(OS_BSD) + if (!renderer_preferences_.system_font_family_name.empty()) { + WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8( + renderer_preferences_.system_font_family_name)); + } +-#endif // defined(OS_LINUX) && !defined(OS_ANDROID) ++#endif // (defined(OS_LINUX) && !defined(OS_ANDROID)) || defined(OS_BSD) + #endif // defined(OS_WIN) + #endif // !defined(OS_MAC) + } 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 1949b0cf6773..4c72c90f8c9f 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-11-13 06:36:47 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2021-01-18 21:29:04 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -62,7 +62,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 -@@ -347,7 +347,7 @@ void LayoutView::UpdateLayout() { +@@ -341,7 +341,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 9f60639f6ca1..5bd1449031ee 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-11-13 06:36:48 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2021-01-18 21:29:04 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop // behavior. Typically, Linux apps do not implement scrollbar snapback (this // is true for at least GTK and QT apps). --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) return false; #else return true; @@ -13,8 +13,8 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc index 169dde0e05b5..689b5f634e28 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc.orig 2020-11-16 14:54:17 UTC +--- third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc.orig 2021-01-18 21:29:05 UTC +++ third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc @@ -33,7 +33,7 @@ WebAudioDeviceFactory* WebAudioDeviceFactory::factory_ + namespace { - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_LACROS) // Due to driver deadlock issues on Windows (http://crbug/422522) there is a // chance device authorization response is never received from the browser side. - // In this case we will time out, to avoid renderer hang forever waiting for 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 4e381229ad4c..fcd9115b325b 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,11 +1,11 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-11-13 06:36:48 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2021-01-18 21:29:05 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -408,7 +408,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -409,7 +409,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MAC) DCHECK_LE(volume, 1.0); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD) // We have a special situation on Linux where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that 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 index f604f1027b1c..b22da5e23a1f 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2020-11-13 06:36:48 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2021-01-18 21:29:05 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -272,7 +272,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, MultipleRenderer +@@ -281,7 +281,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, MultipleRenderer TEST_F(MAYBE_WebRtcAudioRendererTest, VerifySinkParameters) { SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); 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 index db7ad8d0b6ee..2ef085dd524d 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2020-11-13 06:36:48 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2021-01-18 21:29:05 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -373,8 +373,8 @@ class AudioWorkletThreadPriorityTest +@@ -431,8 +431,8 @@ class AudioWorkletThreadPriorityTest base::PlatformThread::GetCurrentThreadPriority(); // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL 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 7ddf0fd9a11c..ba89bfdde0b5 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-11-13 06:36:48 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2021-01-18 21:29:05 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -110,6 +110,7 @@ executable("character_data_generator") { +@@ -104,6 +104,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.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 802a3f44ede2..88a53ee3adfe 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-11-13 06:36:48 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2021-01-18 21:29:05 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 -@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache { +@@ -173,7 +173,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_; } -@@ -242,11 +242,11 @@ class PLATFORM_EXPORT FontCache { +@@ -248,11 +248,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -32,7 +32,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -320,12 +320,12 @@ class PLATFORM_EXPORT FontCache { +@@ -326,12 +326,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -47,7 +47,7 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -365,7 +365,7 @@ class PLATFORM_EXPORT FontCache { +@@ -371,7 +371,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_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index 53f692a2a18d..5f11235f0ec4 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-11-13 06:37:02 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2021-01-18 21:29:44 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -82,6 +82,12 @@ crashpad_static_library("client") { +@@ -77,6 +77,12 @@ crashpad_static_library("client") { sources += [ "crashpad_client_fuchsia.cc" ] } 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 d776669cf847..89d69bcace2d 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-11-13 06:37:03 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2021-01-18 21:29:45 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -39,7 +39,11 @@ +@@ -40,7 +40,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_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h index 66f4ef8af922..6cb449124bfb 100644 --- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h +++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h @@ -1,6 +1,6 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2020-11-13 06:42:19 UTC +--- third_party/libyuv/include/libyuv/row.h.orig 2021-01-18 21:31:49 UTC +++ third_party/libyuv/include/libyuv/row.h -@@ -157,10 +157,14 @@ extern "C" { +@@ -158,10 +158,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 #define HAS_ARGBSUBTRACTROW_SSE2 #define HAS_ARGBUNATTENUATEROW_SSE2 @@ -15,7 +15,7 @@ #define HAS_RGBCOLORTABLEROW_X86 #define HAS_SOBELROW_SSE2 #define HAS_SOBELTOPLANEROW_SSE2 -@@ -206,7 +210,9 @@ extern "C" { +@@ -208,7 +212,9 @@ extern "C" { #define HAS_I422TORGB565ROW_AVX2 #define HAS_I422TORGBAROW_AVX2 #define HAS_I444TOARGBROW_AVX2 @@ -25,7 +25,7 @@ #define HAS_J422TOARGBROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 -@@ -231,7 +237,9 @@ extern "C" { +@@ -233,7 +239,9 @@ extern "C" { #define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2 diff --git a/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h b/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h deleted file mode 100644 index c1f22a922dc3..000000000000 --- a/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h +++ /dev/null @@ -1,23 +0,0 @@ ---- third_party/nearby/src/cpp/core_v2/internal/offline_service_controller.h.orig 2020-11-13 06:42:20 UTC -+++ third_party/nearby/src/cpp/core_v2/internal/offline_service_controller.h -@@ -12,6 +12,20 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - -+// Copyright 2020 Google LLC -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// https://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ - #ifndef CORE_V2_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_ - #define CORE_V2_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_ - diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index 31a2b8f072dc..cf875e532cfa 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2020-11-13 06:42:20 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2021-01-18 21:31:50 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "perfetto/ext/base/string_utils.h" #include "perfetto/ext/base/utils.h" @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -625,7 +625,7 @@ void UnixSocket::ReadPeerCredentials() { +@@ -630,7 +630,7 @@ void UnixSocket::ReadPeerCredentials() { if (sock_raw_.family() != SockFamily::kUnix) return; 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 aafe26caaacb..e2271f7f3fd0 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-11-13 06:42:22 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2021-01-18 21:31:50 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2569,8 +2569,9 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -2564,8 +2564,9 @@ bool TracingServiceImpl::SnapshotClocks( TracingSession::ClockSnapshotData new_snapshot_data; diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h index 5229aee8c858..7f0a27e76514 100644 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,4 +1,4 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2020-11-13 06:42:23 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2021-01-18 21:31:52 UTC +++ third_party/skia/src/sksl/SkSLString.h @@ -17,6 +17,8 @@ #include "include/core/SkString.h" @@ -8,4 +8,4 @@ + namespace SkSL { - // Represents a (not necessarily null-terminated) slice of a string. + class String; diff --git a/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp new file mode 100644 index 000000000000..7e807fa1972c --- /dev/null +++ b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp @@ -0,0 +1,56 @@ +--- third_party/swiftshader/include/vulkan/vulkan.hpp.orig 2021-01-19 12:49:47 UTC ++++ third_party/swiftshader/include/vulkan/vulkan.hpp +@@ -67,7 +67,7 @@ + #endif + + #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + # include <dlfcn.h> + # elif defined( _WIN32 ) + typedef struct HINSTANCE__ * HINSTANCE; +@@ -92157,7 +92157,7 @@ namespace VULKAN_HPP_NAMESPACE + { + if ( !vulkanLibraryName.empty() ) + { +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); + # elif defined( _WIN32 ) + m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); +@@ -92167,7 +92167,7 @@ namespace VULKAN_HPP_NAMESPACE + } + else + { +-# if defined( __linux__ ) ++# if defined( __unix__ ) + m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); + if ( m_library == nullptr ) + { +@@ -92210,7 +92210,7 @@ namespace VULKAN_HPP_NAMESPACE + { + if ( m_library ) + { +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + dlclose( m_library ); + # elif defined( _WIN32 ) + ::FreeLibrary( m_library ); +@@ -92223,7 +92223,7 @@ namespace VULKAN_HPP_NAMESPACE + template <typename T> + T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT + { +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + return (T)dlsym( m_library, function ); + # elif defined( _WIN32 ) + return (T)::GetProcAddress( m_library, function ); +@@ -92235,7 +92235,7 @@ namespace VULKAN_HPP_NAMESPACE + bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } + + private: +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + void * m_library; + # elif defined( _WIN32 ) + ::HINSTANCE m_library; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp index 2709789b81fc..58ded7c02253 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2020-11-13 06:42:23 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2021-01-18 21:31:51 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp -@@ -691,7 +691,7 @@ bool Display::isValidWindow(EGLNativeWindowType window +@@ -684,7 +684,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; } return false; @@ -9,7 +9,7 @@ return false; // Non X11 linux is headless only #elif defined(__APPLE__) return sw::OSX::IsValidWindow(window); -@@ -869,7 +869,7 @@ sw::Format Display::getDisplayFormat() const +@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const { return sw::FORMAT_X8R8G8B8; } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp index 14cef1075818..6d7c01d35c1f 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2020-11-13 06:42:23 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2021-01-18 21:31:51 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp -@@ -362,7 +362,7 @@ bool WindowSurface::checkForResize() +@@ -357,7 +357,7 @@ bool WindowSurface::checkForResize() int windowWidth = windowAttributes.width; int windowHeight = windowAttributes.height; diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index aaa0aa6ea5a3..65ab977b4ee0 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2020-11-13 06:42:25 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2021-01-18 21:31:54 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -62,8 +62,6 @@ rtc_library("system_wrappers") { +@@ -61,8 +61,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { sources += [ "source/cpu_features_linux.cc" ] } diff --git a/www/chromium/files/patch-tools_json__schema__compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py index 13e122e0ed13..e70fc9574102 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/model.py.orig 2020-11-13 06:37:04 UTC +--- tools/json_schema_compiler/model.py.orig 2021-01-18 21:29:47 UTC +++ tools/json_schema_compiler/model.py -@@ -676,7 +676,7 @@ class Platforms(object): +@@ -735,7 +735,7 @@ class Platforms(object): CHROMEOS = _PlatformInfo("chromeos") CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") LACROS = _PlatformInfo("lacros") 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 index bce728b292f7..e85bd282df88 100644 --- a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc +++ b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc @@ -1,4 +1,4 @@ ---- ui/aura/test/aura_test_helper.cc.orig 2020-11-13 06:37:05 UTC +--- ui/aura/test/aura_test_helper.cc.orig 2021-01-18 21:29:48 UTC +++ ui/aura/test/aura_test_helper.cc @@ -29,7 +29,7 @@ #include "ui/wm/core/default_activation_client.h" @@ -9,7 +9,7 @@ #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck #endif -@@ -59,7 +59,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con +@@ -63,7 +63,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con DCHECK(!g_instance); g_instance = this; diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h b/www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h index cf7b9405a23b..967905ede3c7 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h +++ b/www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h @@ -1,14 +1,14 @@ ---- ui/base/clipboard/clipboard_data_endpoint.h.orig 2020-11-16 14:59:26 UTC -+++ ui/base/clipboard/clipboard_data_endpoint.h -@@ -15,9 +15,9 @@ namespace ui { - // destination trying to read the clipboard data. - // Whenever a new format is supported, a new enum should be added. +--- ui/base/data_transfer_policy/data_transfer_endpoint.h.orig 2021-01-19 11:52:05 UTC ++++ ui/base/data_transfer_policy/data_transfer_endpoint.h +@@ -17,9 +17,9 @@ namespace ui { enum class EndpointType { + kDefault = 0, // This type shouldn't be used if any of the following types is + // a better match. -#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) +#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD) - kGuestOs = 0, // Guest OS: PluginVM, Crostini. + kGuestOs = 1, // Guest OS: PluginVM, Crostini. -#endif // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) +#endif // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD) #if defined(OS_CHROMEOS) - kArc = 1, // ARC. + kArc = 2, // ARC. #endif // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h new file mode 100644 index 000000000000..7098ceb0ae7d --- /dev/null +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h @@ -0,0 +1,11 @@ +--- ui/base/dragdrop/os_exchange_data_provider.h.orig 2021-01-19 11:53:11 UTC ++++ ui/base/dragdrop/os_exchange_data_provider.h +@@ -73,7 +73,7 @@ class COMPONENT_EXPORT(UI_BASE_DATA_EXCHANGE) OSExchan + virtual bool HasFile() const = 0; + virtual bool HasCustomFormat(const ClipboardFormatType& format) const = 0; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + virtual void SetFileContents(const base::FilePath& filename, + const std::string& file_contents) = 0; + #endif diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc new file mode 100644 index 000000000000..dff0cf71e63d --- /dev/null +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -0,0 +1,28 @@ +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2021-01-19 11:52:33 UTC ++++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc +@@ -93,14 +93,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData( + } + + bool OSExchangeDataProviderNonBacked::GetString(base::string16* data) const { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (HasFile()) { + // Various Linux file managers both pass a list of file:// URIs and set the + // string representation to the URI. We explicitly don't want to return use + // this representation. + return false; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + if ((formats_ & OSExchangeData::STRING) == 0) + return false; +@@ -177,7 +177,7 @@ bool OSExchangeDataProviderNonBacked::HasCustomFormat( + return base::Contains(pickle_data_, format); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void OSExchangeDataProviderNonBacked::SetFileContents( + const base::FilePath& filename, + const std::string& file_contents) { diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h new file mode 100644 index 000000000000..cbf4e873b75e --- /dev/null +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h @@ -0,0 +1,11 @@ +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.h.orig 2021-01-19 11:52:55 UTC ++++ ui/base/dragdrop/os_exchange_data_provider_non_backed.h +@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeDataProvider + bool HasURL(FilenameToURLPolicy policy) const override; + bool HasFile() const override; + bool HasCustomFormat(const ClipboardFormatType& format) const override; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void SetFileContents(const base::FilePath& filename, + const std::string& file_contents) override; + #endif diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index cd5442a9e5c8..d02a959a1942 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2020-11-13 06:37:05 UTC +--- ui/base/resource/resource_bundle.cc.orig 2021-01-18 21:29:48 UTC +++ ui/base/resource/resource_bundle.cc -@@ -844,7 +844,7 @@ void ResourceBundle::ReloadFonts() { +@@ -851,7 +851,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -897,7 +897,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -904,7 +904,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index 721586a85508..120b31e94538 100644 --- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2020-11-16 15:00:36 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2021-01-18 21:29:48 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -127,7 +127,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -165,7 +165,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { return "windows"; #elif defined(OS_APPLE) return "macOS"; 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 e3e050ba4a56..56e299361bf2 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,15 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2020-11-13 06:37:05 UTC +--- ui/base/ui_base_features.cc.orig 2021-01-18 21:29:48 UTC +++ ui/base/ui_base_features.cc -@@ -100,7 +100,7 @@ const base::Feature kCompositorThreadedScrollbarScroll - // native apps on Windows. +@@ -109,7 +109,7 @@ const base::Feature kCompositorThreadedScrollbarScroll 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) + #if defined(OS_WIN) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -132,7 +132,7 @@ const base::Feature kPrecisionTouchpadLogging{ +@@ -141,7 +141,7 @@ const base::Feature kPrecisionTouchpadLogging{ "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_WIN) @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { -@@ -143,7 +143,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -152,7 +152,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; @@ -27,7 +27,7 @@ // defined(OS_CHROMEOS) // Enables forced colors mode for web content. -@@ -182,7 +182,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { +@@ -198,7 +198,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { // 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 a51b73f52c89..3a96ac62858d 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-11-13 06:37:05 UTC +--- ui/base/ui_base_features.h.orig 2021-01-18 21:29:48 UTC +++ ui/base/ui_base_features.h -@@ -60,11 +60,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: +@@ -62,11 +62,11 @@ 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_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index e0dc17d6ff3d..9a4f3d2d6243 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,20 +1,11 @@ ---- ui/base/webui/web_ui_util.cc.orig 2020-11-13 06:37:05 UTC +--- ui/base/webui/web_ui_util.cc.orig 2021-01-18 21:29:48 UTC +++ ui/base/webui/web_ui_util.cc -@@ -34,7 +34,7 @@ - #include "base/win/windows_version.h" - #endif +@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { + std::string GetFontFamily() { + std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "ui/base/ui_base_features.h" - #endif - -@@ -232,7 +232,7 @@ std::string GetFontFamily() { - - // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced - // into Ozone: crbug.com/320050 --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (!features::IsUsingOzonePlatform()) { - font_family = ui::ResourceBundle::GetSharedInstance() - .GetFont(ui::ResourceBundle::BaseFont) + std::string font_name = ui::ResourceBundle::GetSharedInstance() + .GetFont(ui::ResourceBundle::BaseFont) + .GetFontName(); diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index e9567833c6e0..9b393d78bdb0 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2020-11-13 06:37:05 UTC +--- ui/compositor/compositor.cc.orig 2021-01-18 21:29:48 UTC +++ ui/compositor/compositor.cc -@@ -730,7 +730,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -732,7 +732,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr throughput_tracker_map_.erase(tracker_id); } diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h index 2cf8672f4cd6..7df38637df8b 100644 --- a/www/chromium/files/patch-ui_compositor_compositor__observer.h +++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor_observer.h.orig 2020-11-13 06:37:05 UTC +--- ui/compositor/compositor_observer.h.orig 2021-01-18 21:29:48 UTC +++ ui/compositor/compositor_observer.h -@@ -42,11 +42,11 @@ class COMPOSITOR_EXPORT CompositorObserver { +@@ -43,11 +43,11 @@ class COMPOSITOR_EXPORT CompositorObserver { // Called when a child of the compositor is resizing. virtual void OnCompositingChildResizing(Compositor* compositor) {} 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 c6419d873b6a..492057ba008a 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 2020-11-13 06:37:05 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2021-01-18 21:29:48 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -841,6 +841,9 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -840,6 +840,9 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { @@ -10,7 +10,7 @@ blocked_devices_.set(static_cast<uint32_t>(deviceid), true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -850,6 +853,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D +@@ -849,6 +852,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index f9b84f85695b..f4ecb14ba839 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,6 +1,6 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2020-11-13 06:37:05 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2021-01-18 21:29:48 UTC +++ ui/events/keycodes/dom/keycode_converter.cc -@@ -20,7 +20,7 @@ namespace { +@@ -24,7 +24,7 @@ namespace { #if defined(OS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index e81bbe71adb4..622b171df9b4 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-11-13 06:37:06 UTC +--- ui/gfx/BUILD.gn.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/BUILD.gn -@@ -572,7 +572,7 @@ source_set("memory_buffer_sources") { +@@ -580,7 +580,7 @@ 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 2a90003eb96c..53b5921b1a99 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 2020-11-13 06:37:06 UTC +--- ui/gfx/font_render_params.h.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/font_render_params.h -@@ -111,7 +111,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); @@ -9,7 +9,7 @@ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -120,7 +120,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); +@@ -118,7 +118,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc index 4ab5f32555c1..9d01aa71f324 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2020-11-13 06:37:06 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/gpu_memory_buffer.cc @@ -34,7 +34,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); #elif defined(OS_MAC) - handle.mach_port = mach_port; + handle.io_surface = io_surface; diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index f2596ed3a36a..0c2c2eac5903 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2020-11-13 06:37:06 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" @@ -17,4 +17,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) NativePixmapHandle native_pixmap_handle; #elif defined(OS_MAC) - ScopedRefCountedIOSurfaceMachPort mach_port; + gfx::ScopedIOSurface io_surface; diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index aa7f7cfbdda4..e6a5849cbe76 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,4 +1,4 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2020-11-13 06:37:06 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -17,7 +17,7 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_APPLE) - IPC_STRUCT_TRAITS_MEMBER(mach_port) + IPC_STRUCT_TRAITS_MEMBER(io_surface) @@ -63,12 +63,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index 66f3859b250c..813b759cdd6f 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2020-11-13 06:37:06 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2021-01-18 21:29:48 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( @@ -9,7 +9,7 @@ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -109,7 +109,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat +@@ -112,7 +112,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index df51e69658ea..caf5253098a1 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-11-13 06:37:06 UTC +--- ui/gl/BUILD.gn.orig 2021-01-18 21:29:48 UTC +++ ui/gl/BUILD.gn -@@ -225,7 +225,7 @@ component("gl") { +@@ -221,7 +221,7 @@ 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 54acbdabd02d..442d74261e15 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-11-13 06:37:06 UTC +--- ui/gl/generate_bindings.py.orig 2021-01-18 21:29:48 UTC +++ ui/gl/generate_bindings.py -@@ -2836,6 +2836,9 @@ GLX_FUNCTIONS = [ +@@ -2840,6 +2840,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h index b0cfc47e5fd9..af6fc25cb4f4 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2020-11-13 06:37:06 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2021-01-18 21:29:48 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -41,7 +41,7 @@ enum class PlatformWindowOpacity { @@ -9,7 +9,7 @@ class X11ExtensionDelegate; #endif -@@ -82,7 +82,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -83,7 +83,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo WorkspaceExtensionDelegate* workspace_extension_delegate = nullptr; 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 deleted file mode 100644 index 18108b4d64b4..000000000000 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-11-13 06:37:06 UTC -+++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -319,7 +319,7 @@ Widget* BubbleDialogDelegate::CreateBubble( - bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); - Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); - --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_APPLE) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_APPLE) || defined(OS_BSD) - // Linux clips bubble windows that extend outside their parent window bounds. - // Mac never adjusts. - bubble_delegate->set_adjust_if_offscreen(false); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 872cc0914544..4089af1be891 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-11-13 06:37:06 UTC +--- ui/views/controls/label.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/controls/label.cc -@@ -726,7 +726,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -773,7 +773,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 -@@ -913,7 +913,7 @@ bool Label::PasteSelectionClipboard() { +@@ -960,7 +960,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 62bc835c01ea..aad44bd5be98 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-11-13 06:37:06 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -65,7 +65,7 @@ +@@ -68,7 +68,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 -@@ -192,14 +192,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -195,14 +195,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; -@@ -267,7 +267,7 @@ bool IsControlKeyModifier(int flags) { +@@ -270,7 +270,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -758,7 +758,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -765,7 +765,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -805,7 +805,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -812,7 +812,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; -@@ -957,7 +957,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -966,7 +966,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(); -@@ -2241,7 +2241,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2256,7 +2256,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 7f2b2ce741c3..32badab39ea2 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-11-13 06:37:06 UTC +--- ui/views/examples/widget_example.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/examples/widget_example.cc -@@ -67,7 +67,7 @@ void WidgetExample::CreateExampleView(View* container) - DIALOG); - BuildButton(container, GetStringUTF16(IDS_WIDGET_MODAL_BUTTON_LABEL), - MODAL_DIALOG); +@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) + modal_button->SetCallback( + base::BindRepeating(&WidgetExample::CreateDialogWidget, + base::Unretained(this), modal_button, true)); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Windows does not support TYPE_CONTROL top-level widgets. - BuildButton(container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL), - CHILD); + LabelButton* control_button = BuildButton( + container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL)); diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 59288d3f5fd8..38b7984f204b 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2020-11-16 15:06:05 UTC +--- ui/views/focus/focus_manager.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/focus/focus_manager.cc -@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi if (!focus_manager->IsAcceleratorRegistered(accelerator)) return false; @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -637,7 +637,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -636,7 +636,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi const bool accelerator_processed = focus_manager->ProcessAccelerator(accelerator); diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index c3685fb3bca3..fd8e991137e1 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,15 @@ ---- ui/views/style/platform_style.cc.orig 2020-11-13 06:37:06 UTC +--- ui/views/style/platform_style.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/style/platform_style.cc -@@ -75,7 +75,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const +@@ -54,7 +54,7 @@ const bool PlatformStyle::kInactiveWidgetControlsAppea + // Linux clips bubble windows that extend outside their parent window + // bounds. + const bool PlatformStyle::kAdjustBubbleIfOffscreen = +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + false; + #else + true; +@@ -89,7 +89,7 @@ View::FocusBehavior PlatformStyle::DefaultFocusBehavio #endif // OS_APPLE #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ 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 b958b9a2072e..3b5da6f0409d 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-11-13 06:37:06 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/widget/native_widget_aura.cc @@ -65,7 +65,7 @@ #endif @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif -@@ -1075,7 +1075,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS +@@ -1090,7 +1090,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS namespace { #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ @@ -18,7 +18,7 @@ void CloseWindow(aura::Window* window) { if (window) { Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1106,14 +1106,14 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1121,14 +1121,14 @@ void Widget::CloseAllSecondaryWidgets() { #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 7e7199e51ae5..1ca243e8f057 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2020-11-13 06:37:06 UTC +--- ui/views/window/custom_frame_view.cc.orig 2021-01-18 21:29:49 UTC +++ ui/views/window/custom_frame_view.cc -@@ -261,7 +261,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -257,7 +257,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index a3578b7bd798..319111e9f825 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2020-11-13 06:37:06 UTC +--- ui/webui/resources/js/cr.js.orig 2021-01-18 21:29:49 UTC +++ ui/webui/resources/js/cr.js -@@ -430,6 +430,11 @@ var cr = cr || function(global) { +@@ -450,6 +450,11 @@ var cr = cr || function(global) { get isMac() { return /Mac/.test(navigator.platform); }, diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 0081dbc24080..91e9002d7449 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-11-17 18:42:05 UTC +--- v8/BUILD.gn.orig 2021-01-18 21:31:57 UTC +++ v8/BUILD.gn -@@ -4068,9 +4068,15 @@ v8_component("v8_libbase") { +@@ -4157,9 +4157,15 @@ v8_component("v8_libbase") { } } @@ -17,7 +17,7 @@ "src/base/platform/platform-linux.cc", ] -@@ -4476,6 +4482,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4575,6 +4581,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.cc", "src/interpreter/bytecodes.h", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index c1134e0077f3..a7fa74edb32c 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-11-13 06:42:28 UTC +--- v8/src/api/api.cc.orig 2021-01-18 21:31:57 UTC +++ v8/src/api/api.cc -@@ -5760,7 +5760,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5775,7 +5775,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index bfc10259159a..76c63894d6a3 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2020-11-13 06:42:28 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2021-01-18 21:31:57 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -466,7 +466,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -464,7 +464,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -597,6 +597,12 @@ int OS::GetCurrentThreadId() { +@@ -595,6 +595,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-v8_src_d8_d8.cc b/www/chromium/files/patch-v8_src_d8_d8.cc new file mode 100644 index 000000000000..161e17c7cb6f --- /dev/null +++ b/www/chromium/files/patch-v8_src_d8_d8.cc @@ -0,0 +1,62 @@ +--- v8/src/d8/d8.cc.orig 2021-01-19 11:56:19 UTC ++++ v8/src/d8/d8.cc +@@ -71,7 +71,7 @@ + #include "unicode/locid.h" + #endif // V8_INTL_SUPPORT + +-#ifdef V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + #include <sys/mman.h> // For MultiMappedAllocator. + #endif + +@@ -233,7 +233,7 @@ class MockArrayBufferAllocatiorWithLimit : public Mock + std::atomic<size_t> space_left_; + }; + +-#ifdef V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + + // This is a mock allocator variant that provides a huge virtual allocation + // backed by a small real allocation that is repeatedly mapped. If you create an +@@ -326,7 +326,7 @@ class MultiMappedAllocator : public ArrayBufferAllocat + base::Mutex regions_mutex_; + }; + +-#endif // V8_OS_LINUX ++#endif // V8_OS_LINUX || V8_OS_FREEBSD + + v8::Platform* g_default_platform; + std::unique_ptr<v8::Platform> g_platform; +@@ -3532,7 +3532,7 @@ bool Shell::SetOptions(int argc, char* argv[]) { + options.mock_arraybuffer_allocator = i::FLAG_mock_arraybuffer_allocator; + options.mock_arraybuffer_allocator_limit = + i::FLAG_mock_arraybuffer_allocator_limit; +-#if V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + options.multi_mapped_mock_allocator = i::FLAG_multi_mapped_mock_allocator; + #endif + +@@ -4147,19 +4147,19 @@ int Shell::Main(int argc, char* argv[]) { + memory_limit >= options.mock_arraybuffer_allocator_limit + ? memory_limit + : std::numeric_limits<size_t>::max()); +-#if V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + MultiMappedAllocator multi_mapped_mock_allocator; +-#endif // V8_OS_LINUX ++#endif // V8_OS_LINUX || V8_OS_FREEBSD + if (options.mock_arraybuffer_allocator) { + if (memory_limit) { + Shell::array_buffer_allocator = &mock_arraybuffer_allocator_with_limit; + } else { + Shell::array_buffer_allocator = &mock_arraybuffer_allocator; + } +-#if V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + } else if (options.multi_mapped_mock_allocator) { + Shell::array_buffer_allocator = &multi_mapped_mock_allocator; +-#endif // V8_OS_LINUX ++#endif // V8_OS_LINUX || V8_OS_FREEBSD + } else { + Shell::array_buffer_allocator = &shell_array_buffer_allocator; + } diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 56363d5726ca..628cbe0a1be7 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-11-13 06:37:06 UTC +--- weblayer/BUILD.gn.orig 2021-01-18 21:29:49 UTC +++ weblayer/BUILD.gn -@@ -671,6 +671,14 @@ source_set("weblayer_lib_base") { +@@ -677,6 +677,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 c8f5664b18aa..a686f93d32f1 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-11-13 06:37:06 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2021-01-18 21:29:49 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -225,7 +225,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -221,7 +221,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( void ContentMainDelegateImpl::PreSandboxStartup() { #if defined(ARCH_CPU_ARM_FAMILY) && \ 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 b982662d1be4..5851976fc7c1 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-11-13 06:37:06 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2021-01-18 21:29:49 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -63,7 +63,7 @@ +@@ -68,7 +68,7 @@ #include "ui/base/ui_base_features.h" #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,10 +9,10 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -157,7 +157,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { - if (!features::IsUsingOzonePlatform()) - ui::SetDefaultX11ErrorHandlers(); - #endif +@@ -191,7 +191,7 @@ void BrowserMainPartsImpl::PreMainMessageLoopStart() { + int BrowserMainPartsImpl::PreEarlyInitialization() { + browser_process_ = std::make_unique<BrowserProcess>(std::move(local_state_)); + -#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) +#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ui::InitializeInputMethodForTesting(); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index b524c1924790..86019960cd50 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -135,16 +135,50 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png +%%DATADIR%%/resources/inspector/Images/dropdown_7x6_icon.svg +%%DATADIR%%/resources/inspector/Images/elements_panel_icon.svg +%%DATADIR%%/resources/inspector/Images/baseline-icon.svg +%%DATADIR%%/resources/inspector/Images/breaking_change_icon.svg %%DATADIR%%/resources/inspector/Images/errorWave.svg +%%DATADIR%%/resources/inspector/Images/feedback_thin_16x16_icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-center-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-end-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-space-around-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-space-between-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-space-evenly-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-start-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-content-stretch-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-items-center-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-items-flex-end-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-items-flex-start-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-items-stretch-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-self-center-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-self-flex-end-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-self-flex-start-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-align-self-stretch-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-direction-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-center-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-flex-end-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-flex-start-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-space-around-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-space-between-icon.svg +%%DATADIR%%/resources/inspector/Images/flex-justify-content-space-evenly-icon.svg %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg +%%DATADIR%%/resources/inspector/Images/ic_page_next_16x16_icon.svg +%%DATADIR%%/resources/inspector/Images/ic_page_prev_16x16_icon.svg +%%DATADIR%%/resources/inspector/Images/ic_redo_16x16_icon.svg %%DATADIR%%/resources/inspector/Images/ic_show_node_16x16.svg %%DATADIR%%/resources/inspector/Images/ic_suggest_color.svg +%%DATADIR%%/resources/inspector/Images/ic_undo_16x16_icon.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg %%DATADIR%%/resources/inspector/Images/largeIcons.svg %%DATADIR%%/resources/inspector/Images/lighthouse_logo.svg +%%DATADIR%%/resources/inspector/Images/link_icon.svg %%DATADIR%%/resources/inspector/Images/mediumIcons.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png +%%DATADIR%%/resources/inspector/Images/network_panel_icon.svg +%%DATADIR%%/resources/inspector/Images/node_search_icon.svg %%DATADIR%%/resources/inspector/Images/nodeIcon.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png @@ -152,6 +186,7 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/radioDot-dark-theme.png +%%DATADIR%%/resources/inspector/Images/refresh_12x12_icon.svg %%DATADIR%%/resources/inspector/Images/resizeDiagonal.svg %%DATADIR%%/resources/inspector/Images/resizeHorizontal.svg %%DATADIR%%/resources/inspector/Images/resizeVertical.svg @@ -165,6 +200,7 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/securityIcons.svg +%%DATADIR%%/resources/inspector/Images/settings_14x14_icon.svg %%DATADIR%%/resources/inspector/Images/smallIcons.svg %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png @@ -276,7 +312,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js.map %%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/IssuesManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js @@ -358,6 +393,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/common/SimpleHistoryManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/SimpleHistoryManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/StringOutputStream.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/StringOutputStream.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js @@ -371,6 +408,10 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js.map %%DATADIR%%/resources/inspector/component_helpers/component_helpers.js +%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/component-server-setup.js +%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/component-server-setup.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/get-stylesheet.js +%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/get-stylesheet.js.map %%DATADIR%%/resources/inspector/components/components.js %%DATADIR%%/resources/inspector/components/components-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js @@ -426,6 +467,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/ModuleUIStrings.js +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/ModuleUIStrings.js.map %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js @@ -475,6 +518,8 @@ bin/chrome %%DATADIR%%/resources/inspector/devices/devices.js %%DEBUG%%%%DATADIR%%/resources/inspector/devices/DevicesView.js %%DEBUG%%%%DATADIR%%/resources/inspector/devices/DevicesView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/devices/ModuleUIStrings.js +%%DEBUG%%%%DATADIR%%/resources/inspector/devices/ModuleUIStrings.js.map %%DATADIR%%/resources/inspector/devtools_app.html %%DATADIR%%/resources/inspector/devtools_app.js %%DATADIR%%/resources/inspector/devtools_compatibility.js @@ -510,6 +555,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/CSSPropertyIconResolver.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/CSSPropertyIconResolver.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js @@ -538,6 +585,10 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js @@ -762,10 +813,30 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleEditor.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleRegex.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleRegex.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleSwatch.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleSwatch.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/Swatches.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/Swatches.js.map %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor.js @@ -797,10 +868,10 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueSurveyLink.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueSurveyLink.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView_bridge.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView_bridge.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js.map %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js @@ -817,6 +888,7 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js %%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js.map %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js +%%DATADIR%%/resources/inspector/js_profiler/js_profiler.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js @@ -857,6 +929,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthousePanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseProtocolService.js %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseProtocolService.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReporterTypes.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReporterTypes.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportRenderer.js %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportRenderer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportSelector.js @@ -867,6 +941,24 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js.map +%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector_module.js +%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorUtils.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryNavigator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryNavigator.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryValueInterpreter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryValueInterpreter.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryViewer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryViewer.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplay.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplay.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplayUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplayUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js %%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js.map %%DATADIR%%/resources/inspector/main/main-legacy.js @@ -875,8 +967,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/main/MainImpl.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/main/SimpleApp.js %%DEBUG%%%%DATADIR%%/resources/inspector/main/SimpleApp.js.map -%%DATADIR%%/resources/inspector/marked/marked_module.js -%%DATADIR%%/resources/inspector/marked/marked.js %%DATADIR%%/resources/inspector/media/media.js %%DATADIR%%/resources/inspector/media/media-legacy.js %%DATADIR%%/resources/inspector/media/media_module.js @@ -974,6 +1064,7 @@ bin/chrome %%DATADIR%%/resources/inspector/node_app.html %%DATADIR%%/resources/inspector/node_app.js %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js +%%DATADIR%%/resources/inspector/node_debugger/node_debugger.js %%DATADIR%%/resources/inspector/node_main/node_main-legacy.js %%DATADIR%%/resources/inspector/node_main/node_main.js %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js @@ -1060,6 +1151,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/date-utilities.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/date-utilities.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/map-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/map-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js @@ -1184,12 +1277,10 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js %%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js.map -%%DATADIR%%/resources/inspector/root.js %%DATADIR%%/resources/inspector/root/root-legacy.js %%DATADIR%%/resources/inspector/root/root.js %%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js %%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js.map -%%DATADIR%%/resources/inspector/RuntimeInstantiator.js %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js.map %%DATADIR%%/resources/inspector/screencast/screencast.js @@ -1361,6 +1452,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js %%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/settings/ModuleUIStrings.js +%%DEBUG%%%%DATADIR%%/resources/inspector/settings/ModuleUIStrings.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js %%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js.map %%DATADIR%%/resources/inspector/shell.js @@ -1443,8 +1536,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js @@ -1473,6 +1564,9 @@ bin/chrome %%DATADIR%%/resources/inspector/sources_test_runner/LiveEditTestRunner.js %%DATADIR%%/resources/inspector/sources_test_runner/SearchTestRunner.js %%DATADIR%%/resources/inspector/sources_test_runner/SourcesTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/startup/RuntimeInstantiator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/startup/RuntimeInstantiator.js.map +%%DATADIR%%/resources/inspector/startup/startup.js %%DATADIR%%/resources/inspector/test_runner/test_runner.js %%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js %%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js.map @@ -1638,6 +1732,8 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report-generator.js %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lit-html/directives.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lit-html/directives.js.map %%DATADIR%%/resources/inspector/third_party/lit-html/lit-html-tsconfig.json %%DATADIR%%/resources/inspector/third_party/lit-html/lit-html.js %%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.d.ts @@ -1685,6 +1781,7 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.d.ts %%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.js %%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.js.map +%%DATADIR%%/resources/inspector/third_party/marked/marked.js %%DATADIR%%/resources/inspector/third_party/marked/marked-tsconfig.json %%DATADIR%%/resources/inspector/third_party/marked/package/lib/marked.esm.d.ts %%DATADIR%%/resources/inspector/third_party/marked/package/lib/marked.esm.js @@ -1694,12 +1791,21 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/AriaQueryHandler.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/AriaQueryHandler.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/AriaQueryHandler.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserConnector.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserConnector.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserConnector.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserWebSocketTransport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserWebSocketTransport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserWebSocketTransport.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.js @@ -1742,6 +1848,9 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/fetch.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/fetch.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/fetch.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.js @@ -1775,6 +1884,9 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Product.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Product.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Product.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.js @@ -1799,42 +1911,54 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-node.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-node.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-node.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-web.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-web.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize-web.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node-puppeteer-core.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node-puppeteer-core.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node-puppeteer-core.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/install.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/install.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/install.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/NodeWebSocketTransport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/NodeWebSocketTransport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/NodeWebSocketTransport.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/web.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/web.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/web.js %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.d.ts %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.d.ts.map %%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.js @@ -1905,6 +2029,14 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsLane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsLane.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimelineUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimelineUtils.js.map %%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js @@ -1916,6 +2048,15 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/components.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridController.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridRenderers.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridRenderers.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js @@ -1982,8 +2123,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SettingsUI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js @@ -2096,15 +2235,8 @@ bin/chrome %%DATADIR%%/resources/inspector/workspace/workspace-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js %%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js.map -%%DATADIR%%/resources/inspector_overlay/common.css %%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd -%%DATADIR%%/resources/inspector_overlay/tool_distances.js -%%DATADIR%%/resources/inspector_overlay/tool_highlight.js -%%DATADIR%%/resources/inspector_overlay/tool_highlight_grid.js -%%DATADIR%%/resources/inspector_overlay/tool_paused.js -%%DATADIR%%/resources/inspector_overlay/tool_screenshot.js -%%DATADIR%%/resources/inspector_overlay/tool_source_order.js -%%DATADIR%%/resources/inspector_overlay/tool_viewport_size.js +%%DATADIR%%/resources/inspector_overlay/main.js %%DATADIR%%/snapshot_blob.bin %%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so |