diff options
| author | Matthias Wolf <matthias@rheinwolf.de> | 2021-06-17 09:22:35 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-06-17 09:32:02 +0000 |
| commit | 9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0 (patch) | |
| tree | bd5ba927b4a7b2e0fc9aeef18b17d738079b2edd | |
| parent | ccd805d32e3522eee71501f122f41f59f99fd1b5 (diff) | |
| download | ports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.tar.gz ports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.zip | |
www/chromium: update to 91.0.4472.101
Security: https://vuxml.freebsd.org/freebsd/20b3ab21-c9df-11eb-8558-3065ec8fd3ec.html
(cherry picked from commit 06317815238060a3a7f5911f18a3dd7c95779c83)
380 files changed, 2278 insertions, 4000 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index d623cdc57569..80b981b2feed 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 90.0.4430.212 -PORTREVISION= 1 +PORTVERSION= 91.0.4472.101 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -72,7 +71,8 @@ USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg l CPE_VENDOR= google CPE_PRODUCT= chrome -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h \ + third_party/vulkan_memory_allocator/src/vk_mem_alloc.h USE_GL= gbm gl USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt INSTALLS_ICONS= yes @@ -96,11 +96,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ + enable_js_type_check=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ + optimize_webui=false \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ @@ -219,11 +221,6 @@ PLIST_SUB+= NOT_AARCH64="@comment " PLIST_SUB+= NOT_AARCH64="" .endif -# Make better javascript with java -JAVA_BUILD= yes -JAVA_VERSION= 1.8 -USE_JAVA= yes - # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext @@ -243,9 +240,12 @@ post-extract-TEST-on: @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ post-patch: + @${MKDIR} ${WRKSRC}/sandbox/policy/freebsd @${CP} ${FILESDIR}/dir_reader_freebsd.h ${WRKSRC}/base/files @${CP} ${FILESDIR}/device_info_fetcher_freebsd.h ${WRKSRC}/chrome/browser/enterprise/signals @${CP} ${FILESDIR}/device_info_fetcher_freebsd.cc ${WRKSRC}/chrome/browser/enterprise/signals + @${CP} ${FILESDIR}/sandbox_freebsd.h ${WRKSRC}/sandbox/policy/freebsd + @${CP} ${FILESDIR}/sandbox_freebsd.cc ${WRKSRC}/sandbox/policy/freebsd post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @@ -282,12 +282,6 @@ do-configure: @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node - # Setup java dependency on amd64 and i386 -.if ${ARCH} == amd64 || ${ARCH} == i386 - @${MKDIR} ${WRKDIR}/bin - ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java -.endif - # Setup buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 8be9f1212a33..5a0fe5716fa8 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1620717235 -SHA256 (chromium-90.0.4430.212.tar.xz) = abe11d0cb1ff21278aad2eec1a1e279d59176b15331804d7df1807446786d59e -SIZE (chromium-90.0.4430.212.tar.xz) = 917430448 +TIMESTAMP = 1623320688 +SHA256 (chromium-91.0.4472.101.tar.xz) = 78146192aaae7771d9130c2828e1081d940da32af3aadcb73578521683307eb4 +SIZE (chromium-91.0.4472.101.tar.xz) = 950228560 +SHA256 (chromium-91.0.4472.101-testdata.tar.xz) = cd590860745d352c2de3737e188ab6dbd0c7ee179e34275c2b8fad03861266e8 +SIZE (chromium-91.0.4472.101-testdata.tar.xz) = 256763876 +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 158b7269d92f..6e19cd7c7da5 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,4 +1,4 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-04-20 18:58:23 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-06-09 22:13:52 UTC +++ build/config/compiler/pgo/pgo.gni @@ -16,7 +16,7 @@ declare_args() { # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once 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 9a2964553490..d13e0e3e592a 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 2021-04-20 19:05:14 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-06-09 22:16:18 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 d1b7c835627e..4a38e2e73dcf 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-04-14 18:40:47 UTC +--- BUILD.gn.orig 2021-05-12 22:05:39 UTC +++ BUILD.gn -@@ -425,7 +425,7 @@ group("gn_all") { +@@ -429,7 +429,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -468,8 +468,6 @@ group("gn_all") { +@@ -474,8 +474,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -524,10 +522,6 @@ group("gn_all") { +@@ -530,10 +528,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", -@@ -586,10 +580,6 @@ group("gn_all") { +@@ -592,10 +586,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -667,7 +657,7 @@ group("gn_all") { +@@ -673,7 +663,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -682,7 +672,7 @@ group("gn_all") { +@@ -688,7 +678,7 @@ group("gn_all") { } } @@ -58,7 +58,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -793,7 +783,6 @@ group("gn_all") { +@@ -803,7 +793,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +66,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1086,7 +1075,7 @@ if (!is_ios) { +@@ -1102,7 +1091,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1095,7 +1084,7 @@ if (!is_ios) { +@@ -1111,7 +1100,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +84,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1321,9 +1310,6 @@ group("chromium_builder_perf") { +@@ -1355,9 +1344,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index edc279a61b6b..f18542dec520 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- base/BUILD.gn.orig 2021-05-24 22:05:31 UTC +++ base/BUILD.gn -@@ -948,7 +948,7 @@ component("base") { +@@ -963,7 +963,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -959,6 +959,11 @@ component("base") { +@@ -974,6 +974,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1364,7 +1369,7 @@ component("base") { +@@ -1377,7 +1382,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -30,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1414,7 +1419,7 @@ component("base") { +@@ -1430,7 +1435,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -39,7 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -2045,6 +2050,34 @@ component("base") { +@@ -2064,6 +2069,34 @@ component("base") { } } @@ -74,7 +74,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3231,7 +3264,7 @@ if (build_base_unittests) { +@@ -3273,7 +3306,7 @@ if (build_base_unittests) { } } @@ -83,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc" ] } -@@ -3272,7 +3305,7 @@ if (build_base_unittests) { +@@ -3313,7 +3346,7 @@ if (build_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.gni b/www/chromium/files/patch-base_allocator_allocator.gni index f3f2ae41d6a1..460eda24c41a 100644 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ b/www/chromium/files/patch-base_allocator_allocator.gni @@ -1,6 +1,6 @@ ---- base/allocator/allocator.gni.orig 2021-04-14 18:40:48 UTC +--- base/allocator/allocator.gni.orig 2021-05-24 22:05:31 UTC +++ base/allocator/allocator.gni -@@ -60,7 +60,7 @@ declare_args() { +@@ -63,7 +63,7 @@ declare_args() { # not, and redesign or remove the flag accordingly. We may want to assert a # possible conflict between |use_allocator = "partition"| and # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h new file mode 100644 index 000000000000..20ff541d2e02 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -0,0 +1,17 @@ +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-05-18 13:58:13 UTC ++++ base/allocator/partition_allocator/partition_alloc_config.h +@@ -34,9 +34,13 @@ static_assert(sizeof(void*) != 8, ""); + #define PA_HAS_LINUX_KERNEL + #endif + ++#if defined(OS_FREEBSD) ++#define PA_HAS_FREEBSD_KERNEL ++#endif ++ + // SpinningMutex uses either futex(2) on Linux, or a fast userspace "try" + // operation, which is available on Windows. +-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) + #define PA_HAS_SPINNING_MUTEX + #endif + 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 45fa7177cd36..8f6488a80bd6 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 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1644,7 +1644,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1659,7 +1659,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { // cause flake. #if !defined(OS_WIN) && \ (!defined(ARCH_CPU_64_BITS) || \ @@ -9,7 +9,7 @@ // The following four tests wrap a called function in an expect death statement // to perform their test, because they are non-hermetic. Specifically they are -@@ -1695,7 +1695,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1710,7 +1710,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe } #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index 5c97ae660a7b..147faa94e4b7 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-04-15 11:28:02 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-05-12 22:05:40 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -34,7 +34,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) @@ -18,7 +18,7 @@ // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -87,7 +87,7 @@ void AfterForkInChild() { +@@ -89,7 +89,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } @@ -27,7 +27,7 @@ std::atomic<bool> g_global_init_called; void PartitionAllocMallocInitOnce() { -@@ -97,7 +97,7 @@ void PartitionAllocMallocInitOnce() { +@@ -99,7 +99,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -36,7 +36,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -122,7 +122,7 @@ void PartitionAllocMallocInitOnce() { +@@ -124,7 +124,7 @@ void PartitionAllocMallocInitOnce() { int err = pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); PA_CHECK(err == 0); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h index e40dd3c13a0e..c33dc5dc8adc 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h @@ -1,19 +1,6 @@ ---- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-05-12 22:05:40 UTC +++ base/allocator/partition_allocator/spinning_mutex.h -@@ -22,7 +22,11 @@ - #define PA_HAS_LINUX_KERNEL - #endif - --#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) -+#if defined(OS_FREEBSD) -+#define PA_HAS_FREEBSD_KERNEL -+#endif -+ -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) - #define PA_HAS_SPINNING_MUTEX - #endif - -@@ -66,7 +70,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { +@@ -59,7 +59,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { // as the slow path has better characteristics than SpinLocks's. static constexpr int kSpinCount = 1000; @@ -22,7 +9,7 @@ void FutexWait(); void FutexWake(); -@@ -111,7 +115,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() { +@@ -104,7 +104,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() { inline constexpr SpinningMutex::SpinningMutex() = default; @@ -30,4 +17,4 @@ +#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) ALWAYS_INLINE bool SpinningMutex::Try() { - int expected = kUnlocked; + // Using the weak variant of compare_exchange(), which may fail spuriously. On diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc new file mode 100644 index 000000000000..fb0af07cb8d8 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/starscan/pcscan.cc.orig 2021-05-25 11:07:18 UTC ++++ base/allocator/partition_allocator/starscan/pcscan.cc +@@ -67,7 +67,7 @@ namespace internal { + + namespace { + +-#if DCHECK_IS_ON() && defined(OS_LINUX) ++#if DCHECK_IS_ON() && (defined(OS_LINUX) || defined(OS_BSD)) + // Currently, check reentracy only on Linux. On Android TLS is emulated by the + // runtime lib, which can allocate and therefore cause reentrancy. + struct ReentrantScannerGuard final { diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 5b612f9cd666..c7fd2e4d641b 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,6 +1,6 @@ ---- base/base_switches.cc.orig 2021-04-14 18:40:48 UTC +--- base/base_switches.cc.orig 2021-05-12 22:05:40 UTC +++ base/base_switches.cc -@@ -120,8 +120,8 @@ const char kDisableUsbKeyboardDetect[] = "disable +@@ -125,8 +125,8 @@ const char kDisableUsbKeyboardDetect[] = "disable // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -11,7 +11,7 @@ // The /dev/shm partition is too small in certain VM environments, causing // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to // work-around this issue (a temporary directory will always be used to create -@@ -156,7 +156,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria +@@ -161,7 +161,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index 106fbd5599dc..f878cbc00f2d 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,6 +1,6 @@ ---- base/base_switches.h.orig 2021-04-14 18:40:48 UTC +--- base/base_switches.h.orig 2021-05-12 22:05:40 UTC +++ base/base_switches.h -@@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[]; +@@ -42,8 +42,8 @@ extern const char kDisableUsbKeyboardDetect[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -11,7 +11,7 @@ extern const char kDisableDevShmUsage[]; #endif -@@ -58,7 +58,7 @@ extern const char kEnableIdleTracing[]; +@@ -59,7 +59,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif diff --git a/www/chromium/files/patch-base_bind.h b/www/chromium/files/patch-base_bind.h deleted file mode 100644 index f2715eccde4d..000000000000 --- a/www/chromium/files/patch-base_bind.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/bind.h.orig 2021-04-15 11:29:10 UTC -+++ base/bind.h -@@ -313,7 +313,7 @@ inline OnceCallback<MakeUnboundRunType<Functor, Args.. - !std::is_const<std::remove_reference_t<Functor>>()), - "BindOnce requires non-const rvalue for OnceCallback binding." - " I.e.: base::BindOnce(std::move(callback))."); --#if defined(OS_LINUX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(NCTEST_BIND_ONCE_WITH_PASSED) - // TODO(https://crbug.com/1180750): Enable this everywhere. - static_assert( diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index f638d3146191..c885c484f31d 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/files/file_path_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_path_unittest.cc -@@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1179,7 +1179,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index a19163383934..71d6ea460ea5 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 2021-04-14 18:40:48 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -444,12 +444,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -452,12 +452,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -15,8 +15,8 @@ ASSERT_TRUE(base::DeleteFile(file1)); VLOG(1) << "Waiting for file1 deletion"; -@@ -822,7 +822,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { - ASSERT_TRUE(WaitForEvents()); +@@ -1034,7 +1034,7 @@ TEST_F(FilePathWatcherTest, InotifyLimitInUpdateRecurs + } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -24,7 +24,7 @@ enum Permission { Read, -@@ -830,7 +830,7 @@ enum Permission { +@@ -1042,7 +1042,7 @@ enum Permission { Execute }; @@ -33,7 +33,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -859,9 +859,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1071,9 +1071,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -45,7 +45,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -897,7 +897,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -1109,7 +1109,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 7c1f77514e28..40aae8f579de 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2021-04-14 18:40:48 UTC +--- base/files/file_util.h.orig 2021-05-12 22:05:40 UTC +++ base/files/file_util.h -@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat +@@ -283,14 +283,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); @@ -17,7 +17,7 @@ #endif // OS_POSIX -@@ -603,7 +603,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -602,7 +602,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 b6fc1193f750..ca0e4d4a8e28 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 2021-04-14 18:40:48 UTC +--- base/files/file_util_posix.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_util_posix.cc -@@ -380,7 +380,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -384,7 +384,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]; -@@ -928,8 +928,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -932,8 +932,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) -@@ -1099,7 +1103,7 @@ int GetMaximumPathComponentLength(const FilePath& path +@@ -1103,7 +1107,7 @@ int GetMaximumPathComponentLength(const FilePath& path #if !defined(OS_ANDROID) // This is implemented in file_util_android.cc for that platform. bool GetShmemTempDir(bool executable, FilePath* path) { @@ -32,7 +32,7 @@ bool disable_dev_shm = false; #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( -@@ -1115,7 +1119,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) +@@ -1119,7 +1123,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) *path = FilePath("/dev/shm"); return true; } @@ -41,7 +41,7 @@ return GetTempDir(path); } #endif // !defined(OS_ANDROID) -@@ -1153,7 +1157,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1157,7 +1161,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. @@ -50,7 +50,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1189,7 +1193,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1193,7 +1197,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -59,7 +59,7 @@ // __ANDROID_API__ >= 21) } -@@ -1224,7 +1228,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1263,7 +1267,7 @@ bool CopyFileContentsWithSendfile(File& infile, #endif // !defined(OS_NACL_NONSFI) @@ -68,7 +68,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1245,6 +1249,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1284,6 +1288,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 875f22e7e743..c7da7bc3c69c 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2021-04-14 18:40:48 UTC +--- base/i18n/icu_util.cc.orig 2021-05-12 22:05:40 UTC +++ base/i18n/icu_util.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -342,7 +342,7 @@ void InitializeIcuTimeZone() { +@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index 0bc1fa1271a9..b0860eea0c36 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,6 +1,6 @@ ---- base/memory/discardable_memory.cc.orig 2021-04-14 18:40:48 UTC +--- base/memory/discardable_memory.cc.orig 2021-05-12 22:05:40 UTC +++ base/memory/discardable_memory.cc -@@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ +@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_POSIX) @@ -9,7 +9,7 @@ const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -41,13 +41,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> +@@ -42,13 +42,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> DiscardableMemoryTrialGroup::kEmulatedSharedMemory, &kDiscardableMemoryBackingParamOptions}; @@ -25,7 +25,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -61,11 +61,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -62,11 +62,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } NOTREACHED(); } @@ -39,7 +39,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -87,18 +87,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin +@@ -88,18 +88,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); return features::kDiscardableMemoryBackingParam.Get(); } diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 567e4ba035e0..a70ddacfd021 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2021-04-14 18:40:48 UTC +--- base/posix/unix_domain_socket.cc.orig 2021-06-09 22:13:52 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" @@ -7,7 +7,7 @@ +#include <sys/param.h> #include <sys/socket.h> +#include <sys/types.h> -+#include <sys/ucred.h>a ++#include <sys/ucred.h> #if !defined(OS_NACL_NONSFI) #include <sys/un.h> #endif diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index f9695cb9f7f7..6c44c2cac20b 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2021-04-14 18:40:48 UTC +--- base/process/launch.h.orig 2021-05-12 22:05:40 UTC +++ base/process/launch.h @@ -190,7 +190,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; @@ -18,7 +18,7 @@ #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -418,7 +418,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -415,7 +415,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index a51cddeb2ed4..a5b9652c888b 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/memory.cc.orig 2021-05-12 22:05:40 UTC +++ base/process/memory.cc -@@ -68,7 +68,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +@@ -69,7 +69,7 @@ void TerminateBecauseOutOfMemory(size_t size) { } // Defined in memory_mac.mm for Mac. diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index e8b37cab59d8..54e191de70b0 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,15 @@ ---- base/process/process_metrics.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics.cc.orig 2021-06-09 22:13:52 UTC +++ base/process/process_metrics.cc -@@ -50,7 +50,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -17,7 +17,7 @@ namespace base { + + namespace { + +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + int CalculateEventsPerSecond(uint64_t event_count, + uint64_t* last_event_count, +@@ -53,7 +53,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -9,7 +18,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -69,7 +69,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const +@@ -72,7 +72,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const std::unique_ptr<DictionaryValue> res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -18,7 +27,7 @@ std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -120,7 +120,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -123,7 +123,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif @@ -27,7 +36,7 @@ defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { -@@ -133,7 +133,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -136,7 +136,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 2705a62eb1a9..9ca0b2333067 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics.h.orig 2021-05-12 22:05:40 UTC +++ base/process/process_metrics.h @@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -45,7 +45,7 @@ // defined(OS_AIX) // Returns the number of average idle cpu wakeups per second since the last -@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -208,14 +208,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -62,7 +62,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -227,7 +227,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MAC) @@ -71,7 +71,7 @@ defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif -@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -238,10 +238,10 @@ class BASE_EXPORT ProcessMetrics { uint64_t absolute_package_idle_wakeups); #endif @@ -84,7 +84,7 @@ // defined(OS_AIX) #if defined(OS_WIN) -@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -263,7 +263,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -93,7 +93,7 @@ defined(OS_AIX) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; -@@ -323,7 +323,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -102,7 +102,7 @@ defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on -@@ -358,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -111,7 +111,7 @@ defined(OS_AIX) // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 -@@ -373,7 +373,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -365,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif @@ -120,7 +120,7 @@ defined(OS_AIX) || defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -383,7 +383,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -375,7 +375,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; @@ -129,7 +129,7 @@ // defined(OS_AIX) defined(OS_FUCHSIA) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -398,11 +398,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -143,7 +143,7 @@ defined(OS_AIX) // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. -@@ -485,7 +485,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -477,7 +477,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); @@ -152,7 +152,7 @@ // defined(OS_AIX) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics { +@@ -589,7 +589,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc index 60f317885f8b..909703eed7db 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2021-04-14 18:40:48 UTC +--- base/profiler/stack_copier_signal.cc.orig 2021-05-12 22:05:40 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include <signal.h> #include <sys/ucontext.h> #include <syscall.h> -@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { +@@ -36,8 +43,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { +@@ -47,8 +59,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -221,11 +237,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -222,11 +238,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 18f8ca8e64a4..46256e1091d1 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 2021-04-14 18:40:48 UTC +--- base/test/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ base/test/BUILD.gn -@@ -421,7 +421,11 @@ if (is_linux || is_chromeos) { +@@ -423,7 +423,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index db96223b4238..ee31c754a5a0 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,4 +1,4 @@ ---- base/test/test_suite.cc.orig 2021-04-20 18:58:23 UTC +--- base/test/test_suite.cc.orig 2021-05-12 22:05:40 UTC +++ base/test/test_suite.cc @@ -68,7 +68,7 @@ #include "base/test/test_support_android.h" @@ -18,7 +18,7 @@ class CheckProcessPriority : public testing::EmptyTestEventListener { public: CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { +@@ -399,14 +399,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -35,7 +35,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -657,7 +657,7 @@ void TestSuite::Initialize() { +@@ -680,7 +680,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); @@ -44,7 +44,7 @@ SetUpFontconfig(); #endif -@@ -670,7 +670,7 @@ void TestSuite::Initialize() { +@@ -693,7 +693,7 @@ void TestSuite::Initialize() { if (check_for_leaked_globals_) listeners.Append(new CheckForLeakedGlobals); if (check_for_thread_and_process_priority_) { diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 73d12e31ceb6..bb8888d61b1e 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-06-09 22:13:52 UTC +++ base/threading/platform_thread_posix.cc @@ -32,6 +32,10 @@ #include <sys/syscall.h> @@ -11,38 +11,6 @@ #if defined(OS_FUCHSIA) #include <zircon/process.h> #else -@@ -141,7 +145,7 @@ bool CreateThread(size_t stack_size, - return success; - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // Store the thread ids in local storage since calling the SWI can be - // expensive and PlatformThread::CurrentId is used liberally. Clear -@@ -159,11 +163,11 @@ class InitAtFork { - InitAtFork() { pthread_atfork(nullptr, nullptr, internal::ClearTidCache); } - }; - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - } // namespace - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - namespace internal { - -@@ -173,7 +177,7 @@ void ClearTidCache() { - - } // namespace internal - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // static - PlatformThreadId PlatformThread::CurrentId() { @@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc index 0507cf7347c6..b23c3958b13c 100644 --- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/threading/scoped_blocking_call_unittest.cc -@@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA +@@ -274,7 +274,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { @@ -9,7 +9,7 @@ internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; -@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh +@@ -531,7 +531,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh // First one starting at 10 seconds (can't start later than that or we'll trip // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() // with pending blocked tasks). diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc index 79f46256e239..4014b577f727 100644 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -1,6 +1,6 @@ ---- base/time/time_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/time/time_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/time/time_unittest.cc -@@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { +@@ -2074,6 +2074,7 @@ TEST(TimeDelta, Overflows) { EXPECT_TRUE((kLargeDelta / 0.5).is_max()); EXPECT_TRUE((kLargeDelta / -0.5).is_min()); @@ -8,7 +8,7 @@ static_assert( TimeDelta::Max() / kOneSecond == std::numeric_limits<double>::infinity(), ""); -@@ -1997,6 +1998,7 @@ TEST(TimeDelta, Overflows) { +@@ -2102,6 +2103,7 @@ TEST(TimeDelta, Overflows) { static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); 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 4f094d046bd0..cf882af43d79 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,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-04-14 18:40:48 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-05-12 22:05:40 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -17,6 +17,8 @@ +@@ -20,6 +20,8 @@ #if defined(OS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -185,6 +187,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -199,6 +201,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 2d3d5a52f78c..a33f302f5f91 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 2021-04-14 18:40:48 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-05-12 22:05:40 UTC +++ base/trace_event/process_memory_dump.cc -@@ -101,7 +101,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden +@@ -102,7 +102,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc deleted file mode 100644 index 9c506c990d39..000000000000 --- a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2021-04-14 18:40:48 UTC -+++ base/util/memory_pressure/system_memory_pressure_evaluator.cc -@@ -17,7 +17,7 @@ - #include "base/win/windows_version.h" - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h" - #endif - -@@ -50,7 +50,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval - return evaluator; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - return std::make_unique<util::os_linux::SystemMemoryPressureEvaluator>( - monitor->CreateVoter()); - #endif diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 35b0684f9256..bd6a0ed90cff 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ build/config/BUILD.gn -@@ -232,9 +232,7 @@ config("default_libs") { +@@ -227,9 +227,7 @@ config("default_libs") { ] } else if (is_linux || is_chromeos) { libs = [ @@ -10,7 +10,7 @@ ] } } -@@ -313,7 +311,7 @@ config("executable_config") { +@@ -308,7 +306,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 a9a78e5cf361..a9ad6db86deb 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-05-12 22:05:40 UTC +++ build/config/BUILDCONFIG.gn -@@ -183,8 +183,8 @@ if (host_toolchain == "") { +@@ -184,8 +184,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -11,7 +11,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -221,7 +221,7 @@ if (target_os == "android") { +@@ -222,7 +222,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" @@ -20,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" -@@ -282,10 +282,11 @@ if (custom_toolchain != "") { +@@ -284,10 +284,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 13b39bd99279..ef52986708aa 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 2021-04-14 18:40:48 UTC +--- build/config/compiler/BUILD.gn.orig 2021-06-09 22:13:52 UTC +++ build/config/compiler/BUILD.gn -@@ -132,7 +132,7 @@ declare_args() { +@@ -133,7 +133,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. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -324,7 +324,7 @@ config("compiler") { +@@ -333,7 +333,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -419,7 +419,7 @@ config("compiler") { +@@ -428,7 +428,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", -@@ -509,7 +509,7 @@ config("compiler") { +@@ -518,7 +518,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,21 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -848,7 +848,7 @@ config("compiler_cpu_abi") { +@@ -661,7 +661,12 @@ config("compiler") { + # and let it use all cores. + # TODO(thakis): Check if '=0' (that is, number of cores, instead + # of "all" which means number of hardware threads) is faster. +- ldflags += [ "-Wl,--thinlto-jobs=all" ] ++ if (is_bsd) { ++ # FreeBSD < 13 uses LLVM 10, which doesn't support --thinlto-jobs=all ++ ldflags += [ "-Wl,--thinlto-jobs=2" ] ++ } else { ++ ldflags += [ "-Wl,--thinlto-jobs=all" ] ++ } + + ldflags += [ + "-Wl,--thinlto-cache-dir=" + +@@ -851,7 +856,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +59,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1198,7 +1198,7 @@ config("compiler_deterministic") { +@@ -1201,7 +1206,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +68,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1581,7 +1581,7 @@ config("default_warnings") { +@@ -1584,7 +1589,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +77,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1622,6 +1622,18 @@ config("default_warnings") { +@@ -1625,6 +1630,18 @@ config("default_warnings") { cflags += [ "-Wno-max-tokens" ] } } @@ -82,7 +96,7 @@ } } } -@@ -1751,7 +1763,7 @@ config("no_chromium_code") { +@@ -1754,7 +1771,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -91,7 +105,7 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1829,7 +1841,7 @@ config("export_dynamic") { +@@ -1832,7 +1849,7 @@ config("export_dynamic") { config("thin_archive") { # The macOS and iOS default linker ld64 does not support reading thin # archives. @@ -100,7 +114,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2374,7 +2386,7 @@ config("symbols") { +@@ -2373,7 +2390,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) { @@ -109,7 +123,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2407,7 +2419,7 @@ config("symbols") { +@@ -2406,7 +2423,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 653a3fce454e..66d5dcf2d2d4 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 2021-04-14 18:40:48 UTC +--- build/config/compiler/compiler.gni.orig 2021-05-12 22:05:40 UTC +++ build/config/compiler/compiler.gni -@@ -201,7 +201,7 @@ declare_args() { +@@ -202,7 +202,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 5fc7d6d58dc3..1613bd73a406 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 2021-04-14 18:40:48 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-06-09 22:13:52 UTC +++ build/toolchain/gcc_toolchain.gni @@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -12,7 +12,20 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -646,13 +651,23 @@ template("clang_toolchain") { +@@ -647,20 +652,32 @@ template("gcc_toolchain") { + # actually just be doing a native compile. The invoker can optionally override + # use_gold too. + template("clang_toolchain") { +- if (defined(invoker.toolprefix)) { +- toolprefix = invoker.toolprefix +- } else { +- toolprefix = "" ++ if (!is_bsd) { ++ if (defined(invoker.toolprefix)) { ++ toolprefix = invoker.toolprefix ++ } else { ++ toolprefix = "" ++ } } gcc_toolchain(target_name) { @@ -22,7 +35,7 @@ - ld = cxx - readelf = "${toolprefix}readelf" - ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" +- nm = "${prefix}/llvm-nm" + if (is_bsd) { + prefix = "/usr/local/bin" + cc = "cc" @@ -30,7 +43,7 @@ + ld = cxx + readelf = "readelf" + ar = "${prefix}/ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/nm" + } else { + prefix = rebase_path("$clang_base_path/bin", root_build_dir) + cc = "$prefix/clang" @@ -38,7 +51,7 @@ + ld = cxx + readelf = "${toolprefix}readelf" + ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/llvm-nm" + } forward_variables_from(invoker, diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index e2710a5019fd..f4d88ae95db0 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,6 +1,17 @@ ---- build/toolchain/linux/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-06-09 22:13:52 UTC +++ build/toolchain/linux/BUILD.gn -@@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { +@@ -15,7 +15,9 @@ clang_toolchain("clang_ppc64") { + } + + clang_toolchain("clang_arm") { +- toolprefix = "arm-linux-gnueabihf-" ++ if (!is_bsd) { ++ toolprefix = "arm-linux-gnueabihf-" ++ } + toolchain_args = { + current_cpu = "arm" + current_os = "linux" +@@ -23,7 +25,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 266840d1ea45..d3301d156f48 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 2021-04-14 18:40:48 UTC +--- cc/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ cc/BUILD.gn -@@ -639,7 +639,7 @@ cc_test_static_library("test_support") { +@@ -640,7 +640,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -856,7 +856,6 @@ cc_test("cc_unittests") { +@@ -857,7 +857,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc deleted file mode 100644 index f70fd5aaebe8..000000000000 --- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/trees/frame_rate_estimator.cc.orig 2021-04-14 18:40:48 UTC -+++ cc/trees/frame_rate_estimator.cc -@@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now) - // frequency is lower than that, then using a lower frame rate is permitted. - // The delta below is to account for minor offsets in frame times. - constexpr auto kFudgeDelta = base::TimeDelta::FromMilliseconds(1); -- constexpr auto kMinDelta = -+ auto kMinDelta = - (viz::BeginFrameArgs::DefaultInterval() * 2) + kFudgeDelta; - if (draw_delta < kMinDelta) - num_of_consecutive_frames_with_min_delta_++; diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 6df141ba9bcf..91e75d0d389f 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 2021-04-14 18:40:48 UTC +--- chrome/BUILD.gn.orig 2021-05-12 22:05:41 UTC +++ chrome/BUILD.gn -@@ -1249,6 +1249,10 @@ group("browser_dependencies") { +@@ -1335,6 +1335,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 24fe0c956d1d..2c74fdad393e 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 2021-04-14 18:40:49 UTC +--- chrome/app/BUILD.gn.orig 2021-05-12 22:05:41 UTC +++ chrome/app/BUILD.gn -@@ -140,7 +140,7 @@ static_library("test_support") { +@@ -141,7 +141,7 @@ static_library("test_support") { "//v8:v8_headers", ] diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 0a4f96b13554..4ada1cf4bc66 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-05-12 22:05:41 UTC +++ chrome/app/chrome_main_delegate.cc @@ -150,12 +150,12 @@ #include "v8/include/v8.h" @@ -78,7 +78,7 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -730,7 +730,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -735,7 +735,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -87,7 +87,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -743,7 +743,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -748,7 +748,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -96,7 +96,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -952,7 +952,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -957,7 +957,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -105,7 +105,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -970,7 +970,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -114,7 +114,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1083,7 +1083,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1088,7 +1088,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -123,7 +123,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1104,7 +1104,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1109,7 +1109,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -132,7 +132,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1124,7 +1124,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1129,7 +1129,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. @@ -141,7 +141,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1166,7 +1166,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1171,7 +1171,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -150,7 +150,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1199,7 +1199,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -159,7 +159,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1231,7 +1231,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1236,7 +1236,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 1f414e0346fa..a9584c2b8f57 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chromium_strings.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/chromium_strings.grd -@@ -722,7 +722,7 @@ Chromium is unable to recover your settings. +@@ -703,7 +703,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -851,7 +851,7 @@ Chromium is unable to recover your settings. +@@ -833,7 +833,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 677c44f8549e..7b58b87c724f 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 2021-04-14 18:40:49 UTC +--- chrome/app/generated_resources.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/generated_resources.grd -@@ -5254,7 +5254,7 @@ Keep your key file in a safe place. You will need it t +@@ -5271,7 +5271,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> -@@ -7345,7 +7345,7 @@ Keep your key file in a safe place. You will need it t +@@ -7432,7 +7432,7 @@ Keep your key file in a safe place. You will need it t 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> -@@ -8336,7 +8336,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8443,7 +8443,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 9b525aa17e80..442cb826ae67 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-04-14 18:40:49 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/google_chrome_strings.grd -@@ -729,7 +729,7 @@ Google Chrome is unable to recover your settings. +@@ -711,7 +711,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -858,7 +858,7 @@ Google Chrome is unable to recover your settings. +@@ -841,7 +841,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 9fde56f272f5..fe05c6f9aa33 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2021-04-14 18:40:52 UTC +--- chrome/app/settings_strings.grdp.orig 2021-05-12 22:05:42 UTC +++ chrome/app/settings_strings.grdp -@@ -117,7 +117,7 @@ +@@ -123,7 +123,7 @@ Theme </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -131,7 +131,7 @@ +@@ -137,7 +137,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 224e5620b074..14b4d3fa05c5 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 2021-04-20 18:58:25 UTC +--- chrome/browser/BUILD.gn.orig 2021-05-12 22:05:42 UTC +++ chrome/browser/BUILD.gn -@@ -2458,9 +2458,18 @@ static_library("browser") { +@@ -2427,9 +2427,18 @@ static_library("browser") { ] } } @@ -20,7 +20,7 @@ if (use_ozone) { deps += [ "//ui/events/ozone", -@@ -5123,6 +5132,17 @@ static_library("browser") { +@@ -5134,6 +5143,17 @@ static_library("browser") { } } @@ -38,7 +38,7 @@ if (is_chromeos_ash) { if (use_allocator == "tcmalloc") { deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -5350,7 +5370,7 @@ static_library("browser") { +@@ -5361,7 +5381,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 2956ec69e1c6..90d337fb7e23 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2021-04-20 18:58:25 UTC +--- chrome/browser/about_flags.cc.orig 2021-06-09 22:13:54 UTC +++ chrome/browser/about_flags.cc -@@ -967,7 +967,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -937,7 +937,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -9,34 +9,34 @@ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1239,7 +1239,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP - }, - }; +@@ -1225,7 +1225,7 @@ const FeatureEntry::FeatureVariation + nullptr, + }}; -#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) const FeatureEntry::FeatureVariation -@@ -3074,7 +3074,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3076,7 +3076,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // defined(OS_CHROMEOS) --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3090,7 +3090,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsCrOS | kOsAndroid, +@@ -3094,7 +3094,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, --#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -+#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && - // !defined(OS_ANDROID) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) { "disable-accelerated-video-encode", -@@ -3456,7 +3456,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAcceleratedVideoEncodeName, +@@ -3439,7 +3439,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, @@ -45,16 +45,16 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3470,7 +3470,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableNavigationPredictorRendererWarmupName, - flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription, - kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)}, +@@ -3449,7 +3449,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableNavigationPredictorDescription, + kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, -#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || defined(OS_BSD) ++#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || OS_BSD {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4308,7 +4308,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4307,7 +4307,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -63,16 +63,16 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4398,7 +4398,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxDisableCGIParamMatchingName, - flag_descriptions::kOmniboxDisableCGIParamMatchingDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kDisableCGIParamMatching)}, +@@ -4410,7 +4410,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kKeywordSpaceTriggering, + kOmniboxKeywordSpaceTriggeringVariations, + "OmniboxBundledExperimentV1")}, -#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) {"enable-speculative-service-worker-start-on-query-input", -@@ -4715,14 +4715,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4706,14 +4706,14 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -89,16 +89,16 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5381,7 +5381,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(kClickToCallUI)}, - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) +@@ -5350,7 +5350,7 @@ const FeatureEntry kFeatureEntries[] = { + chromeos::assistant::features::kAssistantBetterOnboarding)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#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) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -107,7 +107,25 @@ // defined(OS_CHROMEOS) {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5955,7 +5955,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { + kSharingDeviceExpirationVariations, + "SharingDeviceExpiration")}, + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + {"sharing-hub-desktop-app-menu", + flag_descriptions::kSharingHubDesktopAppMenuName, + flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, +@@ -5407,7 +5407,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingHubDesktopOmniboxName, + flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, + FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(IS_CHROMEOS_ASH) + {"ash-enable-pip-rounded-corners", +@@ -5889,7 +5889,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, @@ -116,7 +134,7 @@ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5996,7 +5996,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5930,7 +5930,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -125,7 +143,7 @@ // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -6191,7 +6191,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6122,7 +6122,7 @@ const FeatureEntry kFeatureEntries[] = { kPasswordsAccountStorageVariations, "ButterForPasswords")}, @@ -134,7 +152,7 @@ defined(OS_CHROMEOS) {"passwords-account-storage-iph", flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -6199,7 +6199,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6130,7 +6130,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, @@ -143,7 +161,16 @@ // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6858,7 +6858,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6731,7 +6731,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kEnableIncognitoShortcutOnDesktop)}, + #endif // defined(OS_WIN) + +-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"incognito-brand-consistency-for-desktop", + flag_descriptions::kIncognitoBrandConsistencyForDesktopName, +@@ -6823,7 +6823,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)}, #endif @@ -152,7 +179,7 @@ {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6895,7 +6895,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6860,7 +6860,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, #endif @@ -161,7 +188,7 @@ defined(OS_CHROMEOS) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6927,14 +6927,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6879,14 +6879,14 @@ const FeatureEntry kFeatureEntries[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -178,12 +205,21 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_ANDROID) -@@ -7215,7 +7215,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7162,7 +7162,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) { "ui-debug-tools", +@@ -7243,7 +7243,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)}, + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + {"use-ozone-platform", flag_descriptions::kUseOzonePlatformName, + flag_descriptions::kUseOzonePlatformDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kUseOzonePlatform)}, diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index 795304853d01..21d70b5fc31e 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-05-12 22:05:42 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -35,7 +35,7 @@ @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -122,7 +122,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -113,7 +113,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = -@@ -131,7 +131,7 @@ void SetBrowserStartupIsComplete() { +@@ -122,7 +122,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); -@@ -143,7 +143,7 @@ void SetBrowserStartupIsComplete() { +@@ -134,7 +134,7 @@ void SetBrowserStartupIsComplete() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc index bf8c003c3fe7..dc4902fe60fa 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc -@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT +@@ -299,7 +299,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux // (dbg)(1)(32). See crbug.com/354425. @@ -9,7 +9,7 @@ #define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess #else #define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess -@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse +@@ -337,7 +337,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux // (dbg)(1)(32). See crbug.com/354425. diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc index e244d0669bc1..ab2df2289660 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc -@@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe +@@ -234,7 +234,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe // Test is flaky on windows and linux: crbug.com/1150017. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 7070f4f94f60..1161c330736d 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 2021-04-14 18:40:52 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -871,7 +871,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -882,7 +882,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 edee9a8f2b22..e0b0b128c4c6 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/browser_resources.grd.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/browser_resources.grd -@@ -115,7 +115,7 @@ +@@ -41,7 +41,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> diff --git a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc index 30503001330b..f597a4167eba 100644 --- a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-04-23 20:21:42 UTC +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -640,7 +640,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder +@@ -635,7 +635,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder } #endif @@ -9,4 +9,4 @@ +#endif FindBarStateFactory::GetForBrowserContext(profile_)->SetLastSearchText( - base::string16()); + std::u16string()); 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 9cc31760eb57..67fb12045ff0 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 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -144,7 +144,7 @@ +@@ -148,7 +148,7 @@ #include "mojo/public/cpp/bindings/self_owned_receiver.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,16 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -841,7 +841,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -612,7 +612,7 @@ void PopulateChromeFrameBinders( + base::BindRepeating(&BindCaptionContextHandler)); + #endif + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + if (base::FeatureList::IsEnabled(features::kWebAppWindowControlsOverlay) && + !render_frame_host->GetParent()) { + map->Add<chrome::mojom::DraggableRegions>( +@@ -846,7 +846,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 c549c86141d9..1adca260583c 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 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-05-24 22:05:33 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -250,7 +250,7 @@ +@@ -251,7 +251,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #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" -@@ -932,7 +932,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -946,7 +946,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 . -@@ -941,7 +941,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -955,7 +955,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) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -965,7 +965,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -980,7 +980,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,15 +36,15 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1125,6 +1125,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1142,6 +1142,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { - web_usb_detector_.reset(new WebUsbDetector()); + web_usb_detector_ = std::make_unique<WebUsbDetector>(); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1132,6 +1133,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1149,6 +1150,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 24ac8dc37b4d..5276a2ff105d 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 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -450,7 +450,7 @@ +@@ -446,7 +446,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" -@@ -510,7 +510,7 @@ +@@ -507,7 +507,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,19 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -543,7 +543,7 @@ +@@ -526,9 +526,9 @@ + + // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the + // migration is complete. +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + // TODO(crbug.com/939205): Once the upcoming App Service is available, use a + // single navigation throttle to display the intent picker on all platforms. +@@ -546,7 +546,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +39,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -903,11 +903,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -957,11 +957,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -41,7 +53,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1325,7 +1327,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1381,7 +1383,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, &startup_data_); @@ -50,7 +62,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1356,7 +1358,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1412,7 +1414,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +71,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2137,7 +2139,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2190,7 +2192,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -68,7 +80,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2431,7 +2433,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2493,7 +2495,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -77,7 +89,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3747,7 +3749,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3821,7 +3823,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -86,7 +98,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3782,7 +3784,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3856,7 +3858,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -95,7 +107,21 @@ #if defined(OS_WIN) std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4143,7 +4145,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4210,11 +4212,11 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + &throttles); + } + +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: + MaybeCreateThrottleFor(handle), + &throttles); +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + #if !defined(OS_ANDROID) + MaybeAddThrottle(DevToolsWindow::MaybeCreateNavigationThrottle(handle), +@@ -4236,7 +4238,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index bf28d2ce6a19..6a512952dacb 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -401,12 +401,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -395,12 +395,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index cd4be27a0a22..a54db09784be 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,11 +1,11 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -39,7 +39,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { - // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, - // which isn't compatible with CrashUploadListCrashpad. crash_sender continues +@@ -48,7 +48,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // to log uploads in CrashUploadList::kReporterLogFilename. --#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + // Linux is handled below. + #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- defined(OS_LINUX)) ++ defined(OS_LINUX) || defined(OS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc index ef3e8c247889..11a187a00238 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler( +@@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index efb531c3a5cd..c15238834196 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa +@@ -47,7 +47,7 @@ This file specifies browser resources for developer-fa <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index fe349a509975..a6fa5e8db1ce 100644 --- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -29,7 +29,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform +@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); #elif defined(OS_WIN) || defined(OS_MAC) || \ 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 4f56136f04f9..e29a9b3a51fb 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 2021-04-20 18:58:26 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1444,7 +1444,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1436,7 +1436,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 -@@ -1497,7 +1497,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1489,7 +1489,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { @@ -18,7 +18,7 @@ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); -@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1586,7 +1586,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow bool content_initiated, content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -27,7 +27,7 @@ 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. -@@ -1636,7 +1636,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection +@@ -1628,7 +1628,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index beb145301193..c84859608113 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_commands.h.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_commands.h -@@ -48,7 +48,7 @@ class DownloadCommands { +@@ -49,7 +49,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index 87e3b7dc8e0a..2c676690db0d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_query.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_query.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_query.cc -@@ -28,7 +28,11 @@ +@@ -27,7 +27,11 @@ #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 6f46d677272f..7460978af18f 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -148,7 +148,7 @@ std::u16string DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc new file mode 100644 index 000000000000..7b2bb199cc08 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc @@ -0,0 +1,38 @@ +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig 2021-06-10 11:07:22 UTC ++++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc +@@ -21,9 +21,9 @@ DeviceTrustService::DeviceTrustService(Profile* profil + signal_report_callback_( + base::BindOnce(&DeviceTrustService::OnSignalReported, + base::Unretained(this))) { +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_pair_ = std::make_unique<DeviceTrustKeyPair>(); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + pref_observer_.Init(prefs_); + pref_observer_.Add(kContextAwareAccessSignalsAllowlistPref, +@@ -53,9 +53,9 @@ void DeviceTrustService::OnPolicyUpdated() { + + if (!first_report_sent_ && + IsEnabled()) { // Policy enabled for the first time. +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_pair_->Init(); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + reporter_->Init( + base::BindRepeating( + [](DeviceTrustService* self) { return self->IsEnabled(); }, +@@ -76,9 +76,9 @@ void DeviceTrustService::OnReporterInitialized(bool su + + base::Value val(base::Value::Type::DICTIONARY); + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + val.SetStringKey("machine_attestion_key", key_pair_->ExportPEMPublicKey()); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + reporter_->SendReport(std::move(val), std::move(signal_report_callback_)); + } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h new file mode 100644 index 000000000000..9b16792e67b6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h @@ -0,0 +1,26 @@ +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service.h.orig 2021-06-10 11:08:08 UTC ++++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.h +@@ -16,9 +16,9 @@ + + #include <memory> + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/device_trust_key_pair.h" +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + class KeyedService; + class Profile; +@@ -59,9 +59,9 @@ class DeviceTrustService : public KeyedService { + + PrefService* prefs_; + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + std::unique_ptr<DeviceTrustKeyPair> key_pair_; +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + PrefChangeRegistrar pref_observer_; + bool first_report_sent_; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index d0feb92bfc22..d89cd2e9eb0b 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 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1249,6 +1249,12 @@ static_library("extensions") { +@@ -1269,6 +1269,12 @@ static_library("extensions") { ] } 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 1543833016c1..bac5f1c1f447 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 2021-04-20 18:58:26 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc index 0852451ff108..1bb1f9c1f806 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 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -282,7 +282,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 dbea0f3529c3..7e13554a197d 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 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -176,7 +176,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -178,7 +178,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,8 +9,8 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - settings_api::PrefType::PREF_TYPE_STRING; +@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + settings_api::PrefType::PREF_TYPE_NUMBER; // 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) diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index e75d7cb276d0..b2daa01497ed 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -571,7 +571,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -572,7 +572,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { @@ -27,7 +27,7 @@ // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -594,9 +594,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -595,9 +595,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 7bbf834f4b59..9e0811f6ef6a 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -794,7 +794,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -796,7 +796,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -824,7 +824,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index a8133b9ed86c..41242761d61c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/flag_descriptions.cc -@@ -4949,7 +4949,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -5007,7 +5007,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -8,8 +8,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4993,20 +4993,20 @@ const char kRemoteCopyProgressNotificationDescription[ + const char kEnableOopPrintDriversName[] = +@@ -5040,20 +5040,20 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -34,7 +34,7 @@ const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5022,7 +5022,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5069,7 +5069,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; @@ -43,7 +43,7 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5049,13 +5049,13 @@ const char kWebShareDescription[] = +@@ -5096,20 +5096,20 @@ const char kWebShareDescription[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -58,8 +58,17 @@ +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + const char kUseOzonePlatformName[] = "Use ozone."; + const char kUseOzonePlatformDescription[] = + "Use the Ozone/X11 platform implementation on X11."; +-#endif // defined(OS_LINUX) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // Feature flags -------------------------------------------------------------- -@@ -5139,7 +5139,7 @@ const char kAutofillCreditCardUploadDescription[] = + +@@ -5190,7 +5190,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -68,7 +77,7 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5148,7 +5148,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription +@@ -5199,7 +5199,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription "will be sent to Google."; #endif diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 409546d0dbfd..59b088eed300 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,8 +1,8 @@ ---- chrome/browser/flag_descriptions.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/flag_descriptions.h -@@ -21,9 +21,9 @@ - #include "ppapi/buildflags/buildflags.h" +@@ -22,9 +22,9 @@ #include "printing/buildflags/buildflags.h" + #include "third_party/blink/public/common/buildflags.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2900,7 +2900,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2919,7 +2919,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- @@ -20,8 +20,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - extern const char kEnableMediaFeedsName[]; -@@ -2927,10 +2927,10 @@ extern const char kRemoteCopyProgressNotificationDescr + extern const char kEnableOopPrintDriversName[]; +@@ -2940,10 +2940,10 @@ extern const char kRemoteCopyProgressNotificationDescr extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; @@ -34,7 +34,7 @@ extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -2941,7 +2941,7 @@ extern const char kDesktopRestructuredLanguageSettings +@@ -2954,7 +2954,7 @@ extern const char kDesktopRestructuredLanguageSettings extern const char kDesktopDetailedLanguageSettingsName[]; extern const char kDesktopDetailedLanguageSettingsDescription[]; @@ -43,7 +43,7 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -2962,11 +2962,11 @@ extern const char kWebShareDescription[]; +@@ -2975,17 +2975,17 @@ extern const char kWebShareDescription[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -56,8 +56,16 @@ +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + extern const char kUseOzonePlatformName[]; + extern const char kUseOzonePlatformDescription[]; +-#endif // defined(OS_LINUX) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // Feature flags -------------------------------------------------------------- -@@ -3023,12 +3023,12 @@ extern const char kAutofillCreditCardUploadDescription + +@@ -3041,12 +3041,12 @@ extern const char kAutofillCreditCardUploadDescription #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 6701da8634f4..c5f578d2b173 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -737,7 +737,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index da2275f69a1f..5c35f14f9e0a 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -23,10 +23,10 @@ +@@ -24,10 +24,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -272,7 +272,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -273,7 +273,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -318,7 +318,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -319,7 +319,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 85f7e8c0d7a5..733c455f8a0f 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/memory_details.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/memory_details.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -339,7 +339,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -347,7 +347,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index eddecc0854fd..ac30a2c7a052 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 2021-04-14 18:40:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -59,7 +59,9 @@ +@@ -63,7 +63,9 @@ // of lacros-chrome is complete. #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #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" -@@ -68,7 +70,7 @@ +@@ -72,7 +74,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 a3d3fb66fac8..3baffb487384 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 2021-04-14 18:40:53 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -707,10 +707,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -711,10 +711,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) -@@ -998,7 +998,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1002,7 +1002,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 5c3f621d83c1..648e3bfb22ff 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -80,11 +80,11 @@ +@@ -82,11 +82,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -145,10 +145,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -147,10 +147,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -363,10 +363,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -415,10 +415,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -422,10 +422,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( -@@ -512,7 +512,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -521,7 +521,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 1af8bb9914fd..1c0775de4e01 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" #endif @@ -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" -@@ -66,7 +66,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr +@@ -65,7 +65,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index a0fe22fac790..9926d71400ac 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,4 +1,4 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -9,6 +9,10 @@ #include <string> @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -@@ -101,8 +105,11 @@ +@@ -102,8 +106,11 @@ #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" #include "services/network/public/cpp/is_potentially_trustworthy.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 969cc1b4f37c..d68836ddba11 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -166,7 +166,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -167,7 +167,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 feff7c1b7e14..a62ccc3702d6 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 2021-04-14 18:40:54 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2162,7 +2162,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT +@@ -2180,7 +2180,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT const std::string& expected) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ DoActionAndCheckClipboard(std::move(action), ui::ClipboardBuffer::kSelection, expected); #else -@@ -2294,7 +2294,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, +@@ -2312,7 +2312,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, // Flaky on ChromeOS (https://crbug.com/1121446) // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 index ca0285da5f06..b401971734e8 100644 --- 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 @@ -1,11 +1,11 @@ ---- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_manager/policies/policy_features.cc -@@ -126,7 +126,7 @@ const base::Feature kPageFreezingFromPerformanceManage +@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage + const base::Feature kUrgentDiscardingFromPerformanceManager{ "UrgentDiscardingFromPerformanceManager", - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) +-#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_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index cc7af4945e4d..ae857749f61e 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -1,9 +1,9 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc -@@ -42,7 +42,7 @@ ProcessMonitor::Metrics ProcessMetricsHistory::SampleM - #if defined(OS_WIN) - metrics.disk_usage = process_metrics_->GetDiskUsageBytesPerSecond(); - #endif +@@ -39,7 +39,7 @@ ProcessMonitor::Metrics ProcessMetricsHistory::SampleM + ProcessMonitor::Metrics metrics; + + metrics.cpu_usage = process_metrics_->GetPlatformIndependentCPUUsage(); -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc index e55b3b7db91b..b03918f8cc5a 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc @@ -1,29 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-04-22 07:55:58 UTC +--- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_metrics_recorder.cc -@@ -58,7 +58,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - kDiskUsageHistogramMin, kDiskUsageHistogramMax, - kDiskUsageHistogramBucketCount); - #endif +@@ -32,7 +32,7 @@ void RecordProcessHistograms(const char* histogram_suf + ""), + metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, + kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.BrowserProcess", -@@ -82,7 +82,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", - true); - } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.RendererProcess", -@@ -105,7 +105,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - kHistogramMax, kHistogramBucketCount); - if (metrics.cpu_usage > kHighCPUUtilizationThreshold) - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", - metrics.idle_wakeups); + base::UmaHistogramCounts10000( + base::JoinString({"PerformanceMonitor.IdleWakeUps.", histogram_suffix}, diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc index f361a737689c..81a25f3b443b 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc @@ -1,8 +1,8 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-04-22 07:56:37 UTC +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_monitor.cc -@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.disk_usage += rhs.disk_usage; - #endif +@@ -80,7 +80,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + const ProcessMonitor::Metrics& rhs) { + lhs.cpu_usage += rhs.cpu_usage; -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h index c4ab8f7e27c7..c95b87393778 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h @@ -1,8 +1,8 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2021-04-22 07:56:51 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_monitor.h -@@ -51,7 +51,7 @@ class ProcessMonitor { - uint64_t disk_usage = 0; - #endif +@@ -44,7 +44,7 @@ class ProcessMonitor { + // can exceed 100% in multi-thread processes running on multi-core systems. + double cpu_usage = 0.0; -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc new file mode 100644 index 000000000000..fa4fa58a7fe8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -0,0 +1,12 @@ +--- chrome/browser/platform_util_linux.cc.orig 2021-06-11 09:25:25 UTC ++++ chrome/browser/platform_util_linux.cc +@@ -126,7 +126,9 @@ void RunCommand(const std::string& command, + + base::LaunchOptions options; + options.current_directory = working_directory; ++#if !defined(OS_BSD) + options.allow_new_privs = true; ++#endif + // xdg-open can fall back on mailcap which eventually might plumb through + // to a command that needs a terminal. Set the environment variable telling + // it that we definitely don't have a terminal available and that it should diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 6adc6fb7993f..9167be6cb070 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -45,9 +45,9 @@ +@@ -43,9 +43,9 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ #if defined(OS_WIN) #include "chrome/browser/policy/browser_dm_token_storage_win.h" -@@ -178,7 +178,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -75,7 +75,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if defined(OS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); 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 920247d2dfe6..a4bfbcde9c17 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,8 +1,8 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1242,11 +1242,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1293,11 +1293,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) + #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -14,30 +14,29 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1594,7 +1594,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1650,14 +1650,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); + #endif // defined(OS_ANDROID) - // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the - // migration is complete. --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) handlers->AddHandler( std::make_unique< -@@ -1602,7 +1602,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + enterprise_connectors::EnterpriseConnectorsPolicyHandler>( key::kContextAwareAccessSignalsAllowlist, enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, chrome_schema)); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - std::vector<std::unique_ptr<ConfigurationPolicyHandler>> -@@ -1950,13 +1950,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #if defined(OS_CHROMEOS) + handlers->AddHandler(std::make_unique<extensions::ExtensionListPolicyHandler>( +@@ -2012,13 +2012,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); - // TODO(crbug.com/1175651): Remove BUILDFLAG(IS_CHROMEOS_LACROS) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || 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) handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, SCHEMA_ALLOW_UNKNOWN, @@ -48,7 +47,7 @@ #endif // BUILDFLAG(ENABLE_EXTENSIONS) -@@ -1969,7 +1969,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2031,7 +2031,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -57,7 +56,7 @@ handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -1977,7 +1977,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2039,7 +2039,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); 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 d01c259ba409..1dec6f86d1c6 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 2021-04-20 18:58:26 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -383,14 +383,14 @@ +@@ -386,14 +386,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -17,16 +17,29 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -865,7 +865,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -840,10 +840,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) + + // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the + // migration is complete. +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + enterprise_connectors::RegisterLocalPrefs(registry); +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + #if defined(OS_MAC) + confirm_quit::RegisterLocalState(registry); +@@ -871,7 +871,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - web_app::UrlHandlerPrefs::RegisterLocalStatePrefs(registry); + web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1140,7 +1140,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1153,7 +1153,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 6d673f8961bc..12561beaa09d 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/process_singleton_posix.cc @@ -95,12 +95,12 @@ #include "net/base/network_interfaces.h" @@ -21,8 +21,8 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::string16 relaunch_button_text = l10n_util::GetStringUTF16( - IDS_PROFILE_IN_USE_LINUX_RELAUNCH); + std::u16string relaunch_button_text = + l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); @@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif return PROCESS_NONE; 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 c34407ab3782..39db6078c3c7 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 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -345,7 +345,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -349,7 +349,7 @@ void ChromeBrowserMainExtraPartsProfiles:: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #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 index 412795ec22f9..33250bb38305 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/profile.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profile.cc -@@ -356,7 +356,7 @@ bool Profile::IsIncognitoProfile() const { +@@ -376,7 +376,7 @@ bool Profile::IsIncognitoProfile() const { bool Profile::IsEphemeralGuestProfileEnabled() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 9bae83b9550b..304842f01f61 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 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -157,7 +157,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -159,7 +159,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 index 1ad037961f9b..58fabfe570e8 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -227,7 +227,7 @@ bool IsRegularOrGuestSession(Browser* browser) { bool IsGuestModeRequested(const base::CommandLine& command_line, PrefService* local_state, bool show_warning) { 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 13da6c20f8e0..0fb329c8fca4 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 2021-04-14 18:40:54 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2144,7 +2144,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2148,7 +2148,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 0b18255916a3..e702f0d14fd8 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -38,7 +38,7 @@ +@@ -42,7 +42,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -167,7 +167,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -171,7 +171,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()) { -@@ -186,7 +186,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -190,7 +190,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js b/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js new file mode 100644 index 000000000000..ee9ff1a103bf --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js @@ -0,0 +1,11 @@ +--- chrome/browser/resources/media_router/extension/src/utils/platform_utils.js.orig 2021-06-11 09:26:56 UTC ++++ chrome/browser/resources/media_router/extension/src/utils/platform_utils.js +@@ -58,5 +58,8 @@ mr.PlatformUtils.getCurrentOS = function() { + if (userAgent.includes('Linux')) { + return mr.PlatformUtils.OS.LINUX; + } ++ if (userAgent.includes('FreeBSD')) { ++ return mr.PlatformUtils.OS.LINUX; ++ } + return mr.PlatformUtils.OS.OTHER; + }; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 3d7f4b65abe4..1733158d82fe 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,15 +1,15 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -137,7 +137,7 @@ Polymer({ - 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', - 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', +@@ -150,7 +150,7 @@ Polymer({ + 'themeChanged_(' + + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', - // <if expr="is_linux and not chromeos"> + // <if expr="is_bsd and not chromeos"> // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -222,7 +222,7 @@ Polymer({ +@@ -239,7 +239,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -299,10 +299,10 @@ Polymer({ +@@ -322,10 +322,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html new file mode 100644 index 000000000000..2c4c2b72475e --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html @@ -0,0 +1,11 @@ +--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2021-06-11 09:29:24 UTC ++++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html +@@ -64,7 +64,7 @@ + * necessary to prevent Chrome from using the operating system's font + * instead of the Material Design font. + * TODO(dbeam): why not font: inherit? */ +-<if expr="chromeos or is_linux"> ++<if expr="chromeos or is_posix"> + font-family: 'DejaVu Sans Mono', monospace; + </if> + <if expr="is_win"> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.js b/www/chromium/files/patch-chrome_browser_resources_settings_route.js new file mode 100644 index 000000000000..e813d2950790 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.js @@ -0,0 +1,11 @@ +--- chrome/browser/resources/settings/route.js.orig 2021-06-11 09:29:55 UTC ++++ chrome/browser/resources/settings/route.js +@@ -183,7 +183,7 @@ function createBrowserSettingsRoutes() { + + r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); + +- // <if expr="chromeos or is_linux"> ++ // <if expr="chromeos or is_posix"> + r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions'); + // </if> + diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html new file mode 100644 index 000000000000..c76a00d636c6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html @@ -0,0 +1,11 @@ +--- chrome/browser/resources/signin/signin_shared_css.html.orig 2021-06-11 09:30:40 UTC ++++ chrome/browser/resources/signin/signin_shared_css.html +@@ -30,7 +30,7 @@ + margin-inline-start: 8px; + } + +-<if expr="is_macosx or is_linux"> ++<if expr="is_macosx or is_posix"> + .action-container { + flex-flow: row-reverse; + justify-content: flex-start; 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 86974e3f1868..11c23a9331f6 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 2021-04-14 18:40:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -709,7 +709,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_drive_drive__service.cc b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc new file mode 100644 index 000000000000..9a7c1b397c42 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/search/drive/drive_service.cc.orig 2021-06-10 11:15:16 UTC ++++ chrome/browser/search/drive/drive_service.cc +@@ -19,6 +19,8 @@ namespace { + constexpr char kDriveScope[] = "https://www.googleapis.com/auth/drive.readonly"; + #if OS_LINUX + constexpr char kPlatform[] = "LINUX"; ++#elif OS_FREEBSD ++constexpr char kPlatform[] = "FREEBSD"; + #elif OS_WIN + constexpr char kPlatform[] = "WINDOWS"; + #elif OS_MAC diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc new file mode 100644 index 000000000000..c26096a11622 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sessions/session_restore.cc.orig 2021-06-10 11:16:08 UTC ++++ chrome/browser/sessions/session_restore.cc +@@ -931,7 +931,7 @@ void SessionRestore::RestoreSessionAfterCrash(Browser* + // On linux, apps can be restored without the proper app frame, + // disabling restorations on linux for now. http://crbug.com/1199109 + #if BUILDFLAG(ENABLE_APP_SESSION_SERVICE) +-#if !defined(OS_MAC) && !defined(OS_LINUX) ++#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_BSD) + // Apps should always be restored on crash restore. + behavior |= SessionRestore::RESTORE_APPS; + #endif diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index 01e986c150bb..d179dddc441f 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -324,7 +324,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -321,7 +321,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } bool SharingDeviceRegistration::IsRemoteCopySupported() const { diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 63f168cacefd..e4a2e7c328c7 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -23,10 +23,10 @@ +@@ -21,10 +21,10 @@ #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h" #endif // defined(OS_ANDROID) @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS) SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( -@@ -71,14 +71,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -67,14 +67,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); } diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc new file mode 100644 index 000000000000..e7129c08dc6b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2021-06-11 09:31:26 UTC ++++ chrome/browser/sync/device_info_sync_client_impl.cc +@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD + // in lacros-chrome once build flag switch of lacros-chrome is + // complete. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + syncer::SyncPrefs prefs(profile_->GetPrefs()); + if (prefs.IsLocalSyncEnabled()) { + return "local_device"; 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 deleted file mode 100644 index cf4cb01fbfb1..000000000000 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/sync/device_info_sync_service_factory.cc -@@ -47,12 +47,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo - // in lacros-chrome once build flag switch of lacros-chrome is - // complete. - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || 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) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) - - return GetSigninScopedDeviceIdForProfile(profile_); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 6c8134e4b4e3..f0cd5ce5aa31 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) @@ -37,7 +37,7 @@ base::BindRepeating(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -301,14 +301,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index ef9fd285356a..2c0a5994a470 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -222,11 +222,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -213,11 +213,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 6fa40461748e..77111779aba6 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -43,11 +43,11 @@ enum RefreshType { +@@ -47,11 +47,11 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc index f6805c0e87df..35fc615debb8 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2021-04-22 07:57:50 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -304,7 +304,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl +@@ -289,7 +289,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl ui::NativeTheme* native_theme) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index cd77d16a18c9..5a6da10d2346 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 2021-04-20 18:58:27 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/BUILD.gn -@@ -642,11 +642,18 @@ static_library("ui") { +@@ -648,11 +648,18 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } 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 new file mode 100644 index 000000000000..697b2f071ad3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-06-10 11:17:17 UTC ++++ chrome/browser/ui/startup/startup_browser_creator.cc +@@ -125,7 +125,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #include "chrome/browser/web_applications/components/url_handler_launch_params.h" + #include "chrome/browser/web_applications/components/url_handler_manager_impl.h" + #include "third_party/blink/public/common/features.h" +@@ -510,7 +510,7 @@ bool MaybeLaunchApplication( + } + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + // If |command_line| contains a single URL argument and that URL matches URL + // handling registration from installed web apps, show app options to user and + // launch one if accepted. +@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + + // Web app URL handling. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + if (MaybeLaunchUrlHandlerWebApp(command_line, cur_dir, + std::make_unique<LaunchModeRecorder>())) { + return true; diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc new file mode 100644 index 000000000000..cb016f1c3bf2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2021-06-10 11:16:56 UTC ++++ chrome/browser/ui/startup/startup_browser_creator_impl.cc +@@ -106,7 +106,7 @@ namespace { + bool ShouldRestoreApps(bool is_post_restart) { + #if BUILDFLAG(IS_CHROMEOS_ASH) + return true; +-#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) ++#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + // TODO(stahon@microsoft.com) + // Even when app restores are enabled on mac, don't actually restore apps + // because they do not restore correctly. http://crbug.com/1194201 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 4966039cccd7..4847977ad5ef 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 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -151,7 +151,7 @@ +@@ -150,7 +150,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" -@@ -425,11 +425,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -414,11 +414,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -22,4 +22,4 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktop) || + features::kHappinessTrackingSurveysForDesktopDemo)) { diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index b6721c152744..169bdfe15f85 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -449,13 +449,13 @@ std::u16string TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -616,7 +616,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -25,7 +25,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -624,7 +624,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } @@ -34,7 +34,7 @@ default: NOTREACHED(); -@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -789,11 +789,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc index fcab24a1e6e7..38b1bd7d5c54 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc -@@ -117,7 +117,7 @@ bool TestBrowserDialog::VerifyUi() { +@@ -115,7 +115,7 @@ bool TestBrowserDialog::VerifyUi() { // TODO(https://crbug.com/958242) support Mac for pixel tests. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc index 3a0eacf363b7..efbc5821608a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc -@@ -1856,7 +1856,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv +@@ -1857,7 +1857,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } void Step3() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc new file mode 100644 index 000000000000..45793b210fbd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2021-06-10 11:18:23 UTC ++++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc +@@ -104,7 +104,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos + SetModalType(ui::MODAL_TYPE_WINDOW); + SetOwnedByWidget(false); + SetPreferredSize(GetSize()); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed + // above the color picker. + views::Widget::InitParams params(views::Widget::InitParams::TYPE_MENU); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc new file mode 100644 index 000000000000..47cdcd94121d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2021-06-10 11:18:04 UTC ++++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc +@@ -38,7 +38,7 @@ void EyeDropperView::MoveViewToFront() { + } + + void EyeDropperView::CaptureInputIfNeeded() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The eye dropper needs to capture input since it is not activated + // in order to avoid dismissing the color picker. + GetWidget()->GetNativeWindow()->SetCapture(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index ae803bbe2d04..0dc665cd252d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -52,7 +52,7 @@ namespace { +@@ -53,7 +53,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -220,7 +220,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -221,7 +221,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 73885e860515..f3bbeb57a328 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 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1532,7 +1532,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1563,7 +1563,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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 -@@ -1915,7 +1915,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1951,7 +1951,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT bool must_regenerate_frame; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 09e14b33a1e0..055568693ddc 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 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -424,7 +424,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -413,7 +413,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 b3df7da806b0..fe26cd435c31 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 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -577,7 +577,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. - // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove + // TODO(crbug.com/978134): Once Linux/CrOS widget transparency is solved, 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 67961ab45de3..c39053d48c6e 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 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -447,7 +447,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -456,7 +456,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()); -@@ -898,7 +898,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -918,7 +918,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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. -@@ -2117,7 +2117,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2145,7 +2145,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 7e385e9e4c4f..37296e596a29 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,4 +1,4 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-04-20 18:58:27 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -30,7 +30,9 @@ #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" @@ -10,7 +10,7 @@ #include "chrome/browser/ui/webui/device_log_ui.h" #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h" #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" -@@ -266,12 +268,12 @@ +@@ -272,12 +274,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -25,7 +25,7 @@ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -478,7 +480,7 @@ bool IsAboutUI(const GURL& url) { +@@ -496,7 +498,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -34,7 +34,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -527,8 +529,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -545,8 +547,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ComponentsUI>; if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL) return &NewWebUI<ConstrainedWebDialogUI>; @@ -45,7 +45,7 @@ if (url.host_piece() == chrome::kChromeUIDeviceLogHost) return &NewWebUI<chromeos::DeviceLogUI>; if (url.host_piece() == chrome::kChromeUIDomainReliabilityInternalsHost) -@@ -892,7 +896,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -927,7 +931,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -54,7 +54,7 @@ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; -@@ -936,13 +940,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -971,13 +975,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif @@ -70,7 +70,7 @@ defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; -@@ -950,7 +954,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -985,7 +989,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -79,7 +79,7 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif -@@ -1153,8 +1157,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -1181,8 +1185,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return ConflictsUI::GetFaviconResourceBytes(scale_factor); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index a4a298381dfe..3e444821332d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-04-22 07:58:52 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -1395,7 +1395,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1396,7 +1396,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = false; options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ 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 414df95e8591..5c31faca434c 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 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -344,7 +344,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -338,7 +338,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -352,7 +352,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -346,7 +346,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h index 892c8040b07c..5097be46172b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h @@ -1,8 +1,8 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/components/web_app_file_handler_registration.h -@@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id, - // If a shim app was required, also removes the shim app. - void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile); +@@ -42,7 +42,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, + std::unique_ptr<ShortcutInfo> info, + base::OnceCallback<void()> callback); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc new file mode 100644 index 000000000000..edb22367ca2c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc.orig 2021-06-10 11:20:20 UTC ++++ chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc +@@ -10,7 +10,7 @@ + + namespace web_app { + +-#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)) ++#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)) + // Registers a protocol handler for the web app with the OS. + void RegisterProtocolHandlersWithOs( + const AppId& app_id, diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc deleted file mode 100644 index 0dd4c547935a..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_run_on_os_login.cc.orig 2021-04-14 18:40:56 UTC -+++ chrome/browser/web_applications/components/web_app_run_on_os_login.cc -@@ -34,7 +34,7 @@ namespace internals { - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) -+#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)) - // This boilerplate function is used for platforms that don't support Run On OS - // Login. Currently the feature is supported on Windows, Linux and MacOS. - bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info) { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc index 50f989917fef..0d5abcf7e73b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/pending_app_install_task.cc.orig 2021-04-22 07:59:39 UTC +--- chrome/browser/web_applications/pending_app_install_task.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/pending_app_install_task.cc -@@ -310,7 +310,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ +@@ -311,7 +311,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + options.os_hooks[OsHookType::kUrlHandlers] = true; #else - options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; + options.os_hooks[OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc index de19d3869086..cd86b668259c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-04-22 08:00:04 UTC +--- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/web_app_install_task.cc -@@ -845,7 +845,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -861,7 +861,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + options.os_hooks[OsHookType::kUrlHandlers] = true; #else - options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; + options.os_hooks[OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 1aa3f92b85ac..ff3a3f95bf8c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2021-04-22 08:00:21 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -236,7 +236,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* +@@ -237,7 +237,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* std::unique_ptr<UrlHandlerManager> url_handler_manager = nullptr; #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index c8ca0a74d71f..f946906ed434 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 2021-04-14 18:40:56 UTC +--- chrome/common/BUILD.gn.orig 2021-05-12 22:05:46 UTC +++ chrome/common/BUILD.gn -@@ -251,6 +251,10 @@ static_library("common") { +@@ -253,6 +253,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } @@ -11,7 +11,7 @@ if (enable_extensions) { sources += [ "extensions/api/commands/commands_handler.cc", -@@ -482,13 +486,21 @@ static_library("common") { +@@ -480,13 +484,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index 082fde50493b..731571657861 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,6 +1,6 @@ ---- chrome/common/channel_info.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/channel_info.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/channel_info.h -@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -91,7 +91,7 @@ std::string GetChannelSuffixForDataDir(); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index 2d60a836e827..c3d10dbcde87 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- chrome/common/channel_info_posix.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/channel_info_posix.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/channel_info_posix.cc -@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -90,7 +90,7 @@ std::string GetChannelSuffixForDataDir() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name -@@ -99,7 +99,7 @@ std::string GetDesktopName(base::Environment* env) { +@@ -120,7 +120,7 @@ std::string GetDesktopName(base::Environment* env) { return "chromium-browser.desktop"; #endif } @@ -17,4 +17,4 @@ +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) version_info::Channel GetChannel() { - return GetChannelImpl(nullptr); + return GetChannelImpl().channel; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 91bace58c4d2..9e7679b1e5ba 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_features.cc.orig 2021-06-09 22:13:57 UTC +++ chrome/common/chrome_features.cc -@@ -96,13 +96,13 @@ const base::Feature kAsyncDns { +@@ -81,13 +81,13 @@ const base::Feature kAsyncDns { #endif }; @@ -16,7 +16,16 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -360,13 +360,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll +@@ -265,7 +265,7 @@ const base::Feature kDesktopPWAsFlashAppNameInsteadOfO + // Enables or disables Desktop PWAs to be auto-started on OS login. + const base::Feature kDesktopPWAsRunOnOsLogin { + "DesktopPWAsRunOnOsLogin", +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -356,13 +356,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,3 +41,12 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) +@@ -544,7 +544,7 @@ const base::Feature kIncompatibleApplicationsWarning{ + "IncompatibleApplicationsWarning", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // When enabled, removes any theme or background customization done by the user + // on the Incognito UI. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 3f2ed04d65a8..a10edda0168a 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_features.h.orig 2021-06-09 22:13:57 UTC +++ chrome/common/chrome_features.h -@@ -81,10 +81,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -70,10 +70,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -13,7 +13,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -243,11 +243,11 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -234,11 +234,11 @@ extern const base::Feature kEnableAmbientAuthenticatio // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,3 +27,12 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) +@@ -358,7 +358,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncompatibleApplicationsWarning; + #endif // defined(OS_ANDROID) + +-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncognitoBrandConsistencyForDesktop; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index bab1a710972c..2a4679643445 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 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_switches.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/chrome_switches.cc -@@ -804,7 +804,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -803,7 +803,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 27badac84914..971ef7da360d 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 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_switches.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/chrome_switches.h -@@ -254,7 +254,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -253,7 +253,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 69f2468179fe..b787e20781bc 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 2021-04-20 18:58:28 UTC +--- chrome/common/pref_names.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/pref_names.cc -@@ -1100,7 +1100,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe +@@ -1123,7 +1123,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1251,7 +1251,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1264,7 +1264,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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"; -@@ -1709,7 +1709,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1722,7 +1722,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -1980,7 +1980,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = +@@ -1993,7 +1993,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = const char kWebAppsPreferences[] = "web_apps.web_app_ids"; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif -@@ -2096,12 +2096,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2109,12 +2109,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -51,7 +51,7 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2994,7 +2994,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3015,7 +3015,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index b87998edfec4..1bf5efd122d4 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 2021-04-20 18:58:28 UTC +--- chrome/common/pref_names.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/pref_names.h -@@ -360,7 +360,7 @@ extern const char kForceYouTubeRestrict[]; +@@ -366,7 +366,7 @@ extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -389,7 +389,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -395,7 +395,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -561,7 +561,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -567,7 +567,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -665,7 +665,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -671,7 +671,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -801,9 +801,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -807,9 +807,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -48,7 +48,7 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -1033,7 +1033,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1042,7 +1042,7 @@ extern const char kBlockAutoplayEnabled[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 f2bc902825c7..9554246a4f3e 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/webui_url_constants.cc -@@ -350,12 +350,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; +@@ -358,12 +358,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; const char kChromeUIOSSettingsURL[] = "chrome://os-settings/"; #endif @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; -@@ -372,7 +372,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -378,7 +378,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif -@@ -380,7 +380,7 @@ const char kChromeUISandboxHost[] = "sandbox"; +@@ -386,7 +386,7 @@ const char kChromeUISandboxHost[] = "sandbox"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -32,8 +32,8 @@ + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIProfileCustomizationHost[] = "profile-customization"; -@@ -391,7 +391,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro + const char kChromeUIEnterpriseProfileWelcomeHost[] = +@@ -401,7 +401,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -42,7 +42,7 @@ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -569,14 +569,14 @@ const char* const kChromeHostURLs[] = { +@@ -583,14 +583,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -59,7 +59,7 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -635,7 +635,7 @@ const char* const kChromeDebugURLs[] = { +@@ -649,7 +649,7 @@ const char* const kChromeDebugURLs[] = { content::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 8f64142c25a6..c1ed02dde8ec 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/webui_url_constants.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/webui_url_constants.h -@@ -302,12 +302,12 @@ extern const char kChromeUIOSSettingsHost[]; +@@ -308,12 +308,12 @@ extern const char kChromeUIOSSettingsHost[]; extern const char kChromeUIOSSettingsURL[]; #endif @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -324,7 +324,7 @@ extern const char kChromeUINearbyShareURL[]; +@@ -328,7 +328,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif -@@ -332,7 +332,7 @@ extern const char kChromeUISandboxHost[]; +@@ -336,7 +336,7 @@ extern const char kChromeUISandboxHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -32,8 +32,8 @@ + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIProfileCustomizationHost[]; -@@ -342,7 +342,7 @@ extern const char kChromeUIProfilePickerUrl[]; + extern const char kChromeUIEnterpriseProfileWelcomeHost[]; +@@ -348,7 +348,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc new file mode 100644 index 000000000000..4bd38a729df6 --- /dev/null +++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -0,0 +1,11 @@ +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2021-06-10 11:24:44 UTC ++++ chrome/services/speech/audio_source_fetcher_impl.cc +@@ -65,7 +65,7 @@ void AudioSourceFetcherImpl::Start( + + // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and + // Windows. +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + is_started_ = true; + // Initialize the AudioCapturerSource with |this| as the CaptureCallback, + // get the parameters for the device ID, then start audio capture. diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 3685eea5c4ac..62f876089f6a 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 2021-04-20 18:58:28 UTC +--- chrome/test/BUILD.gn.orig 2021-06-09 22:13:57 UTC +++ chrome/test/BUILD.gn -@@ -1661,7 +1661,7 @@ if (!is_android) { +@@ -1666,7 +1666,7 @@ if (!is_android) { ] } @@ -9,7 +9,7 @@ sources += [ "../browser/error_reporting/webui_js_error_reporting_browsertest.cc", ] -@@ -5174,7 +5174,7 @@ test("unit_tests") { +@@ -5193,7 +5193,7 @@ test("unit_tests") { ] } @@ -18,7 +18,7 @@ deps += [ "//chrome/browser/error_reporting:unit_test" ] } -@@ -6980,7 +6980,7 @@ test("chrome_app_unittests") { +@@ -7031,7 +7031,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] 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 5801cd90e4a7..5e0ce19ad492 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 2021-04-14 18:40:56 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -82,6 +82,10 @@ +@@ -83,6 +83,10 @@ #include "services/device/public/cpp/test/fake_geolocation_system_permission.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -332,7 +336,7 @@ void InProcessBrowserTest::SetUp() { +@@ -334,7 +338,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 -@@ -395,7 +399,7 @@ void InProcessBrowserTest::TearDown() { +@@ -400,7 +404,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 dbb3f022e4a7..3f2c50aabc0e 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 2021-04-14 18:40:56 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/base/interactive_ui_tests_main.cc @@ -17,7 +17,7 @@ #if defined(USE_AURA) @@ -8,8 +8,8 @@ +#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" - #include "ui/views/test/ui_controls_factory_desktop_aura_ozone.h" -@@ -55,7 +55,7 @@ class InteractiveUITestSuite : public ChromeTestSuite + #include "ui/platform_window/common/platform_window_defaults.h" +@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); @@ -17,4 +17,4 @@ +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if defined(USE_OZONE) if (features::IsUsingOzonePlatform()) { - ui::OzonePlatform::InitParams params; + // Notifies the platform that test config is needed. For Wayland, for 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 40d6a91dca9e..abc7dc942803 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 2021-04-14 18:40:56 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-05-24 22:05:36 UTC +++ chrome/test/base/test_browser_window.h -@@ -176,7 +176,7 @@ class TestBrowserWindow : public BrowserWindow { - bool is_source_keyboard) override {} +@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow { + void MaybeShowProfileSwitchIPH() override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) - void ShowHatsDialog(const std::string& site_id, - base::OnceClosure success_callback, - base::OnceClosure failure_callback) override {} + void ShowHatsDialog( + const std::string& site_id, + base::OnceClosure success_callback, diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index ce3738e20396..5d763323a36c 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -277,7 +277,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -264,7 +264,7 @@ TEST(KeyConverter, AllShorthandKeys) { ->Generate(&key_events); builder.Generate(&key_events); builder.SetKeyCode(ui::VKEY_TAB); @@ -9,7 +9,7 @@ builder.SetText("\t", "\t")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -285,7 +285,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -272,7 +272,7 @@ TEST(KeyConverter, AllShorthandKeys) { key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); #endif builder.SetKeyCode(ui::VKEY_BACK); @@ -18,7 +18,7 @@ builder.SetText("\b", "\b")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -296,7 +296,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -283,7 +283,7 @@ TEST(KeyConverter, AllShorthandKeys) { CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); } @@ -27,7 +27,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -353,7 +353,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -340,7 +340,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index bc452e44d1d1..20078fb5d89a 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2021-04-14 18:40:58 UTC +--- chrome/utility/services.cc.orig 2021-05-12 22:05:48 UTC +++ chrome/utility/services.cc -@@ -84,7 +84,7 @@ +@@ -81,7 +81,7 @@ #endif #if BUILDFLAG(ENABLE_PRINTING) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/services/printing/print_backend_service_impl.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" -@@ -251,7 +251,7 @@ auto RunPaintPreviewCompositor( +@@ -241,7 +241,7 @@ auto RunPaintPreviewCompositor( #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINTING) @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) auto RunPrintBackendService( mojo::PendingReceiver<printing::mojom::PrintBackendService> receiver) { -@@ -374,7 +374,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -355,7 +355,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif #if BUILDFLAG(ENABLE_PRINTING) 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 674fc89cfb00..b9ada070acfd 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -75,7 +75,7 @@ +@@ -77,7 +77,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -131,7 +131,7 @@ +@@ -132,7 +132,7 @@ #include "extensions/browser/extension_prefs.h" // nogncheck #endif @@ -18,7 +18,7 @@ #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -274,7 +274,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -27,7 +27,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -289,7 +289,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -290,7 +290,7 @@ base::FilePath GetApplicationFontsDir() { } } @@ -36,7 +36,7 @@ } // namespace -@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -45,7 +45,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -328,7 +328,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -329,7 +329,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -54,7 +54,7 @@ // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -486,7 +486,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) @@ -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)) { -@@ -666,7 +666,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -668,7 +668,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif @@ -72,10 +72,10 @@ wayland_server_controller_ = std::make_unique<WaylandServerController>(window_manager_.get()); #endif -@@ -748,7 +748,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res - } +@@ -749,7 +749,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { + + cast_browser_process_->cast_service()->Stop(); - void CastBrowserMainParts::PostMainMessageLoopRun() { -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) wayland_server_controller_.reset(); diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h index 68357abc77d7..0bbed18f5686 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.h.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_browser_main_parts.h.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_browser_main_parts.h -@@ -133,7 +133,7 @@ class CastBrowserMainParts : public content::BrowserMa +@@ -134,7 +134,7 @@ class CastBrowserMainParts : public content::BrowserMa std::unique_ptr<PrefService> user_pref_service_; #endif 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 f0d0cdfebdef..fe4e0d43330b 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -131,9 +131,9 @@ +@@ -130,9 +130,9 @@ #include "chromecast/external_mojo/broker_service/broker_service.h" // nogncheck #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_CAST_RENDERER) #include "base/sequenced_task_runner.h" -@@ -478,7 +478,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -479,7 +479,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { @@ -21,7 +21,7 @@ // Necessary for accelerated 2d canvas. By default on Linux, Chromium // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU // canvas apps. -@@ -875,12 +875,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -876,12 +876,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation handle, general_audience_browsing_service_.get())); } diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc index 89517716d9af..45a4797ba07d 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc +++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/metrics/cast_browser_metrics.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/metrics/cast_browser_metrics.cc.orig 2021-06-09 22:13:58 UTC +++ chromecast/browser/metrics/cast_browser_metrics.cc @@ -19,9 +19,9 @@ #include "content/public/browser/network_service_instance.h" @@ -85,3 +85,19 @@ metrics_service_client_->Finalize(); } +@@ -126,13 +126,13 @@ void CastBrowserMetrics::CollectFinalMetricsForLog( + } + + void CastBrowserMetrics::ProcessExternalEvents(base::OnceClosure cb) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + external_metrics_->ProcessExternalEvents( + base::BindOnce(&ExternalMetrics::ProcessExternalEvents, + base::Unretained(platform_metrics_), std::move(cb))); + #else + std::move(cb).Run(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + } // namespace metrics diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index be4951f8422e..08f1d6a0d28f 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -196,7 +196,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -199,7 +199,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index f97b69916482..c01d87f4527e 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2021-04-14 18:40:58 UTC +--- components/BUILD.gn.orig 2021-05-12 22:05:49 UTC +++ components/BUILD.gn -@@ -337,9 +337,13 @@ test("components_unittests") { +@@ -342,9 +342,13 @@ test("components_unittests") { } if (!is_fuchsia) { # !iOS and !Fuchsia 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 2dbac86d1580..b36acf996c2e 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 2021-04-14 18:40:58 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-05-12 22:05:49 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -122,7 +122,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -144,7 +144,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_APPLE) || \ diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index d4e79eb0b777..e6679c548588 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2021-04-14 18:40:58 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2021-05-12 22:05:49 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -170,7 +170,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -171,7 +171,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { diff --git a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc new file mode 100644 index 000000000000..b27003024abd --- /dev/null +++ b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc @@ -0,0 +1,11 @@ +--- components/cast_channel/cast_message_util.cc.orig 2021-06-11 09:34:59 UTC ++++ components/cast_channel/cast_message_util.cc +@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { + return 4; + #elif BUILDFLAG(IS_CHROMEOS_ASH) + return 5; +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + return 6; + #else + return 0; 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 8076ccb7584f..40c6cc00fc51 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/content/browser/BUILD.gn.orig 2021-04-14 18:40:59 UTC +--- components/crash/content/browser/BUILD.gn.orig 2021-05-12 22:05:49 UTC +++ components/crash/content/browser/BUILD.gn @@ -37,7 +37,7 @@ source_set("browser") { @@ -9,7 +9,7 @@ configs += [ "//third_party/breakpad:client_config" ] public_configs = [ "//third_party/breakpad:client_config" ] } -@@ -57,7 +57,7 @@ source_set("browser") { +@@ -59,7 +59,7 @@ source_set("browser") { "//components/crash/android:jni_headers", "//mojo/public/cpp/bindings", ] diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc deleted file mode 100644 index 86f39a6283a1..000000000000 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/download/internal/common/base_file.cc.orig 2021-04-14 18:40:59 UTC -+++ components/download/internal/common/base_file.cc -@@ -607,7 +607,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, - - } // namespace - --#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) - - DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( -@@ -626,7 +626,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn - - return QuarantineFileResultToReason(result); - } --#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS -+#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS && !OS_BSD - DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( - const std::string& client_guid, - const GURL& source_url, 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 5ac2db9c918d..cdc51637ac7f 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/event_constants.cc @@ -10,13 +10,13 @@ namespace feature_engagement { @@ -17,7 +17,7 @@ defined(OS_CHROMEOS) const char kSixthTabOpened[] = "sixth_tab_opened"; const char kTabGroupCreated[] = "tab_group_created"; -@@ -37,7 +37,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c +@@ -39,7 +39,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c const char kWebUITabStripOpened[] = "webui_tab_strip_opened"; const char kDesktopPwaInstalled[] = "desktop_pwa_installed"; 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 2bddf7ac6bce..f3cc7e19c434 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/event_constants.h @@ -12,16 +12,16 @@ namespace feature_engagement { namespace events { @@ -20,7 +20,7 @@ defined(OS_CHROMEOS) // A new tab was opened when 5 (or more) tabs were already open. extern const char kSixthTabOpened[]; -@@ -62,7 +62,7 @@ extern const char kWebUITabStripOpened[]; +@@ -66,7 +66,7 @@ extern const char kWebUITabStripOpened[]; // The PWA was installed by the user. extern const char kDesktopPwaInstalled[]; diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index ab11b162f5e9..39483e8eeea2 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -12,7 +12,7 @@ namespace feature_engagement { @@ -9,8 +9,8 @@ defined(OS_CHROMEOS) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { base::Optional<FeatureConfig> config = FeatureConfig(); -@@ -28,7 +28,7 @@ base::Optional<FeatureConfig> GetClientSideFeatureConf - Comparator(EQUAL, 0), 180, 180)); +@@ -41,7 +41,7 @@ base::Optional<FeatureConfig> GetClientSideFeatureConf + EventConfig("profile_menu_shown", Comparator(EQUAL, 0), 360, 360); return config; } -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || 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 5960bb14d189..41656d31555b 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-05-12 22:05:49 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}; -@@ -34,7 +34,7 @@ const base::Feature kIPHDesktopSnoozeFeature{"IPH_Desk - base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHDesktopPwaInstallFeature{ +@@ -38,7 +38,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHProfileSwitchFeature{"IPH_ProfileSwitch", + 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 09142f430bac..44d3a8d7ba2d 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-05-12 22:05:49 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; -@@ -28,7 +28,7 @@ extern const base::Feature kIPHReopenTabFeature; - extern const base::Feature kIPHWebUITabStripFeature; +@@ -30,7 +30,7 @@ extern const base::Feature kIPHWebUITabStripFeature; extern const base::Feature kIPHDesktopSnoozeFeature; extern const base::Feature kIPHDesktopPwaInstallFeature; + extern const base::Feature kIPHProfileSwitchFeature; -#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 9cc9b96b5b1f..9de0a150036c 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -79,7 +79,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -83,7 +83,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, -@@ -90,7 +90,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHReopenTabFeature, +@@ -96,7 +96,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHWebUITabStripFeature, &kIPHDesktopPwaInstallFeature, + &kIPHProfileSwitchFeature, -#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 bb1401702b3b..e6c4785bc965 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 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-05-24 22:05:38 UTC +++ components/feature_engagement/public/feature_list.h -@@ -148,7 +148,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -155,7 +155,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) @@ -9,16 +9,16 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -162,7 +162,7 @@ DEFINE_VARIATION_PARAM(kIPHReadingListDiscoveryFeature - DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_ReopenTab"); +@@ -172,7 +172,7 @@ DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_Reop DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip"); DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, "IPH_DesktopPwaInstall"); + DEFINE_VARIATION_PARAM(kIPHProfileSwitchFeature, "IPH_ProfileSwitch"); -#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 -@@ -234,7 +234,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -248,7 +248,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), -@@ -245,7 +245,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHReopenTabFeature), +@@ -261,7 +261,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHWebUITabStripFeature), VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), + VARIATION_ENTRY(kIPHProfileSwitchFeature), -#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_proto_v2_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto index b6ce19bc4bc1..96224d006191 100644 --- a/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto +++ b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto @@ -1,13 +1,13 @@ ---- components/feed/core/proto/v2/wire/version.proto.orig 2021-04-14 18:40:59 UTC +--- components/feed/core/proto/v2/wire/version.proto.orig 2021-05-12 22:05:49 UTC +++ components/feed/core/proto/v2/wire/version.proto -@@ -11,8 +11,8 @@ option optimize_for = LITE_RUNTIME; - // Specification of an application or OS version. - // A version string typically looks like: 'major.minor.build.revision' - message Version { +@@ -25,8 +25,8 @@ message Version { + BETA = 3; + RELEASE = 4; + } - optional int32 major = 1; - optional int32 minor = 2; + optional int32 gmajor = 1; + optional int32 gminor = 2; optional int32 build = 3; optional int32 revision = 4; - + optional Architecture architecture = 5; diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 9c586cf0e447..13ceab52451f 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2021-04-14 18:40:59 UTC +--- components/flags_ui/flags_state.cc.orig 2021-05-12 22:05:49 UTC +++ components/flags_ui/flags_state.cc -@@ -688,7 +688,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -633,7 +633,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 7544dc255e61..5b271ad6e474 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 2021-04-14 18:40:59 UTC +--- components/metrics/metrics_log.cc.orig 2021-05-12 22:05:49 UTC +++ components/metrics/metrics_log.cc -@@ -241,7 +241,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -240,7 +240,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); 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 bde094f3653e..4275d94c4cb0 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 2021-04-14 18:40:59 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-05-12 22:05:50 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -802,7 +802,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -788,7 +788,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index ab52135364c9..9280628e7a8a 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,6 +1,6 @@ ---- components/os_crypt/os_crypt.h.orig 2021-04-14 18:40:59 UTC +--- components/os_crypt/os_crypt.h.orig 2021-05-12 22:05:50 UTC +++ components/os_crypt/os_crypt.h -@@ -18,9 +18,9 @@ +@@ -17,9 +17,9 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #if defined(OS_WIN) || defined(OS_MAC) class PrefRegistrySimple; -@@ -39,16 +39,16 @@ class OSCrypt { +@@ -38,16 +38,16 @@ class OSCrypt { public: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,7 +32,7 @@ // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using -@@ -142,7 +142,7 @@ class OSCrypt { +@@ -141,7 +141,7 @@ class OSCrypt { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -41,7 +41,7 @@ // For unit testing purposes, inject methods to be used. // |get_key_storage_mock| provides the desired |KeyStorage| implementation. // If the provider returns |nullptr|, a hardcoded password will be used. -@@ -157,6 +157,6 @@ void UseMockKeyStorageForTesting( +@@ -156,6 +156,6 @@ void UseMockKeyStorageForTesting( // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting(); diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 064fe0bc3cba..54290adcc3e4 100644 --- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2021-04-27 10:13:50 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2021-05-12 22:05:50 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -302,8 +302,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -303,8 +303,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index ba4543fe9658..5ab17d2b3c45 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,8 +1,8 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-04-14 18:41:00 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-05-12 22:05:50 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -285,6 +285,8 @@ class PolicyTestCase { +@@ -279,6 +279,8 @@ class PolicyTestCase { const std::string os("chromeos"); - #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #elif defined(OS_LINUX) const std::string os("linux"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); 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 62dce3d515ac..13e80d1cc49c 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 2021-04-14 18:41:00 UTC +--- components/policy/resources/policy_templates.json.orig 2021-05-12 22:05:50 UTC +++ components/policy/resources/policy_templates.json -@@ -1230,7 +1230,7 @@ +@@ -1246,7 +1246,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1256,7 +1256,7 @@ +@@ -1272,7 +1272,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1277,7 +1277,7 @@ +@@ -1293,7 +1293,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -4588,7 +4588,7 @@ +@@ -4604,7 +4604,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4644,7 +4644,7 @@ +@@ -4660,7 +4660,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8855,7 +8855,7 @@ +@@ -9103,7 +9103,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10466,7 +10466,7 @@ +@@ -10808,7 +10808,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -11264,7 +11264,7 @@ +@@ -11618,7 +11618,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_previews_core_previews__features.cc b/www/chromium/files/patch-components_previews_core_previews__features.cc deleted file mode 100644 index a6f5fac89714..000000000000 --- a/www/chromium/files/patch-components_previews_core_previews__features.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/previews/core/previews_features.cc.orig 2021-04-14 18:41:00 UTC -+++ components/previews/core/previews_features.cc -@@ -14,12 +14,12 @@ namespace features { - // are enabled are controlled by other features. - const base::Feature kPreviews { - "Previews", --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Previews allowed for Android (but also allow on Linux for dev/debug). - base::FEATURE_ENABLED_BY_DEFAULT --#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - }; - - // Provides slow page triggering parameters. diff --git a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc index e81ef091f821..e654271973a2 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc @@ -1,6 +1,6 @@ ---- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2021-04-14 18:41:00 UTC +--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2021-05-12 22:05:51 UTC +++ components/security_interstitials/content/captive_portal_blocking_page.cc -@@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c +@@ -108,7 +108,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c wifi_service->GetConnectedNetworkSSID(&ssid, &error); if (!error.empty()) return std::string(); diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc index ca07e31da6ec..7386bcd6e406 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc @@ -1,6 +1,6 @@ ---- components/security_interstitials/content/utils.cc.orig 2021-04-14 18:41:00 UTC +--- components/security_interstitials/content/utils.cc.orig 2021-05-12 22:05:51 UTC +++ components/security_interstitials/content/utils.cc -@@ -32,7 +32,7 @@ void LaunchDateAndTimeSettings() { +@@ -33,7 +33,7 @@ void LaunchDateAndTimeSettings() { #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc new file mode 100644 index 000000000000..78e3bb5c0e1e --- /dev/null +++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -0,0 +1,20 @@ +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2021-06-11 09:43:41 UTC ++++ components/startup_metric_utils/browser/startup_metric_utils.cc +@@ -343,7 +343,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time + + // Enabling this logic on OS X causes a significant performance regression. + // https://crbug.com/601270 +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) + static bool statics_initialized = false; + + base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL; +@@ -357,7 +357,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time + static const base::Time time_base = base::Time::Now(); + static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now(); + +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) + if (!statics_initialized) { + base::PlatformThread::SetCurrentThreadPriority(previous_priority); + } diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index 332150b8a2fb..b724ec0aea63 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,6 +1,6 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2021-04-14 18:41:00 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2021-05-12 22:05:51 UTC +++ components/storage_monitor/removable_device_constants.h -@@ -15,7 +15,7 @@ namespace storage_monitor { +@@ -16,7 +16,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index c34b972840b0..0feeda6eff71 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2021-04-14 18:41:01 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2021-05-12 22:05:51 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -53,7 +53,7 @@ std::string GetPersonalizableDeviceNameInternal(); +@@ -75,7 +75,7 @@ std::string GetPersonalizableDeviceNameInternal(); sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS_ASH) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index fd418dd48276..bda897b7422e 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-04-14 18:41:02 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-05-12 22:05:51 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index c5ef197121d9..05b7904dd702 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 2021-04-14 18:41:02 UTC +--- components/viz/common/features.cc.orig 2021-05-12 22:05:51 UTC +++ components/viz/common/features.cc -@@ -33,7 +33,7 @@ const base::Feature kEnableOverlayPrioritization { +@@ -38,7 +38,7 @@ const base::Feature kEnableOverlayPrioritization { const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", #if defined(OS_WIN) || defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) 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.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 3934521aaab0..0dc96a5c900e 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -146,7 +146,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -145,7 +145,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 5dbf44275bcc..0a5beadbd1fe 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 2021-04-14 18:41:02 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -59,7 +59,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -60,7 +60,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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); -@@ -476,7 +476,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -479,7 +479,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 4fcdcab539b5..80181cf13beb 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -166,7 +166,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -172,7 +172,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 43e0ea1aa137..79d200357ac4 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 2021-04-14 18:41:02 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/app/content_main_runner_impl.cc -@@ -135,7 +135,7 @@ +@@ -138,7 +138,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" -@@ -155,7 +155,7 @@ +@@ -158,7 +158,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" -@@ -307,7 +307,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -311,7 +311,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 -@@ -398,7 +398,7 @@ void PreSandboxInit() { +@@ -402,7 +402,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ mojo::ScopedMessagePipeHandle MaybeAcceptMojoInvitation() { const auto& command_line = *base::CommandLine::ForCurrentProcess(); -@@ -516,7 +516,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -533,7 +533,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -45,7 +45,7 @@ PreSandboxInit(); #endif -@@ -916,7 +916,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -928,7 +928,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow mojo::core::InitFeatures(); } @@ -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 -@@ -926,7 +926,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -938,7 +938,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow 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 aa414dbc2e64..94516bd6ef97 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 2021-04-14 18:41:02 UTC +--- content/browser/BUILD.gn.orig 2021-05-12 22:05:52 UTC +++ content/browser/BUILD.gn -@@ -2179,6 +2179,15 @@ source_set("browser") { +@@ -2222,6 +2222,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 a2a8d3a2c4f8..81386e0bfb77 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,14 +1,5 @@ ---- content/browser/browser_main_loop.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/browser_main_loop.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/browser_main_loop.cc -@@ -368,7 +368,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) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ defined(OS_BSD) || ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - !BUILDFLAG(IS_CHROMECAST)) - monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); - #endif @@ -562,7 +562,7 @@ int BrowserMainLoop::EarlyInitialization() { // Up the priority of the UI thread unless it was already high (since Mac diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index b3bc16aa03de..7d1b61ffda88 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -111,7 +111,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -112,7 +112,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 8ec1e4c32c84..f05bfe856d34 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,8 +50,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -51,8 +51,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // ASAN builds need more time -- see Issue 1167875. @@ -8,6 +8,6 @@ - !defined(NDEBUG)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)) && \ + !defined(NDEBUG)) || \ - defined(OS_WIN) || defined(ADDRESS_SANITIZER) + defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_OZONE) const int kGPUInfoWatchdogTimeoutMs = 30000; #else 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 index fc9cd8f87fde..2cd41c079f51 100644 --- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/download/download_manager_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/download/download_manager_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/download/download_manager_impl.cc @@ -83,7 +83,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -229,7 +229,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -560,7 +560,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -570,7 +570,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc index e9a75050187b..c1b41fea3c81 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,16 +1,16 @@ ---- content/browser/gpu/compositor_util.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/gpu/compositor_util.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/gpu/compositor_util.cc @@ -127,11 +127,11 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), --#endif // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -+#endif // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && - // !defined(OS_ANDROID) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) DisableInfo::Problem( "Accelerated video decode has been disabled, either via blocklist, " + "about:flags or the command line."), 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 09911906dfc1..aff9c080f205 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -230,8 +230,8 @@ static const char* const kSwitchNames[] = { +@@ -231,8 +231,8 @@ static const char* const kSwitchNames[] = { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -11,7 +11,7 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -@@ -1157,7 +1157,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1177,7 +1177,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 0b9765d2c928..42520b6c2554 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 2021-04-14 18:41:02 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -303,7 +303,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -302,7 +302,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); 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 35f770df4755..a186c499b0e5 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,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -258,7 +258,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -259,7 +259,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { 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 ba4348fb7ff3..4aeed406d409 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 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -437,7 +437,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -438,7 +438,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) { -@@ -458,7 +458,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -472,7 +472,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 c55da29665c1..83450a0db7a4 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 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -70,7 +70,7 @@ +@@ -68,7 +68,7 @@ #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -127,7 +127,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( +@@ -116,7 +116,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -148,7 +148,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -137,7 +137,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 b7f7ebdee01f..458f27226819 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,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -77,14 +77,14 @@ class CONTENT_EXPORT RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; 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 727e7b949d2a..01fe8c07a94f 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 2021-04-20 18:58:32 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -227,7 +227,7 @@ +@@ -223,7 +223,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> -@@ -1324,7 +1324,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1243,7 +1243,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1335,7 +1335,7 @@ size_t GetPlatformProcessLimit() { +@@ -1254,7 +1254,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1409,7 +1409,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1328,7 +1328,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; -@@ -1811,7 +1811,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1748,7 +1748,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -45,7 +45,7 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MAC) -@@ -3225,8 +3225,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3176,8 +3176,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableInProcessStackTraces, sandbox::policy::switches::kDisableSeccompFilterSandbox, sandbox::policy::switches::kNoSandbox, @@ -56,7 +56,7 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_MAC) -@@ -4868,6 +4868,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { +@@ -4806,6 +4806,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { // TODO(https://crbug.com/875933): Fix initial priority on Android to // reflect |priority_.is_background()|. DCHECK_EQ(blink::kLaunchingProcessIsBackgrounded, !priority_.visible); 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 67dd23c68afb..0f8ede625093 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 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -258,7 +258,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -259,7 +259,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__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index d290637741bc..88c5c15955f7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -708,7 +708,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -714,7 +714,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index a785c4bf8161..d40609313f5f 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -333,7 +333,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 6531331067bf..5e8c93642165 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/utility_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/utility_process_host.cc -@@ -62,7 +62,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -67,7 +67,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(sandbox::policy::SandboxType::kUtility), @@ -9,7 +9,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -231,8 +231,8 @@ bool UtilityProcessHost::StartProcess() { +@@ -240,8 +240,8 @@ bool UtilityProcessHost::StartProcess() { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 ab3cb1e85d21..1a6d9325a198 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 2021-04-14 18:41:02 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -151,7 +151,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -152,7 +152,7 @@ class WebDragSourceAura : public content::WebContentsO DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura); }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -234,7 +234,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -235,7 +235,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1209,7 +1209,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1210,7 +1210,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_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 0cf64fe695f9..b79fd5fbe007 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2021-04-14 18:41:02 UTC +--- content/common/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/common/BUILD.gn -@@ -336,7 +336,7 @@ source_set("common") { +@@ -338,7 +338,7 @@ source_set("common") { sources -= [ "cursors/webcursor_aura.cc" ] } @@ -9,7 +9,7 @@ sources += [ "common_sandbox_support_linux.cc", "sandbox_init_linux.cc", -@@ -352,6 +352,15 @@ source_set("common") { +@@ -354,6 +354,15 @@ source_set("common") { ] } @@ -25,7 +25,7 @@ if (use_zygote_handle) { sources += [ "zygote/zygote_handle_impl_linux.h", -@@ -401,7 +410,7 @@ source_set("common") { +@@ -403,7 +412,7 @@ source_set("common") { } } diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index f103239d22ec..8ad3aceeabd6 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2021-04-14 18:41:03 UTC +--- content/gpu/gpu_main.cc.orig 2021-05-12 22:05:53 UTC +++ content/gpu/gpu_main.cc -@@ -85,7 +85,7 @@ +@@ -87,7 +87,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "sandbox/policy/linux/sandbox_linux.h" -@@ -306,7 +306,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& parameters) { gpu_preferences.message_pump_type); } #endif 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 014b4ba01308..f59641fff434 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 2021-04-14 18:41:03 UTC +--- content/public/common/content_constants.h.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_constants.h -@@ -64,7 +64,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea +@@ -61,7 +61,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 d0d8c43cfad8..4516a60d7ece 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_features.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_features.cc @@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -817,8 +817,8 @@ const base::Feature kWebAssemblyThreads { +@@ -821,8 +821,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}; -@@ -840,7 +840,7 @@ const base::Feature kWebAuthCable { +@@ -844,7 +844,7 @@ const base::Feature kWebAuthCable { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. // If updating this, also update kWebAuthCableServerLink. 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 b1ad5d4adac1..573b62c2e6be 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 2021-04-14 18:41:03 UTC +--- content/public/common/content_switches.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_switches.cc -@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -977,7 +977,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 64eaa34f08c2..7e04dd770eca 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,14 +1,5 @@ ---- content/public/common/content_switches.h.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_switches.h.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_switches.h -@@ -246,7 +246,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat - CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[]; - CONTENT_EXPORT extern const char kWebXrRuntimeWMR[]; - --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID) - CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[]; - #endif - CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[]; @@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch 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 74039cee9783..afc7c9b63882 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 2021-04-14 18:41:03 UTC +--- content/public/test/browser_test_base.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/test/browser_test_base.cc -@@ -109,6 +109,10 @@ +@@ -110,6 +110,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index e9bc758a00a9..655e69021770 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 2021-04-14 18:41:03 UTC +--- content/renderer/render_process_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/render_process_impl.cc -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" #endif @@ -9,12 +9,12 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -186,7 +186,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -197,7 +197,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - + if (command_line->HasSwitch(switches::kEnableCrashpad) || + command_line->HasSwitch(switches::kEnableCrashReporter) || 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 0f906f81019b..4a6ee05f3dd8 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 2021-04-14 18:41:03 UTC +--- content/renderer/render_thread_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/render_thread_impl.cc -@@ -175,7 +175,7 @@ +@@ -180,7 +180,7 @@ #if defined(OS_MAC) #include <malloc/malloc.h> @@ -9,16 +9,16 @@ #include <malloc.h> #endif -@@ -686,7 +686,7 @@ void RenderThreadImpl::Init() { - DCHECK(parsed_num_raster_threads) << string_value; - DCHECK_GT(num_raster_threads, 0); +@@ -714,7 +714,7 @@ void RenderThreadImpl::Init() { + compositor_thread_pipeline_.get())); + } -#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( -@@ -709,7 +709,7 @@ void RenderThreadImpl::Init() { +@@ -737,7 +737,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -27,21 +27,21 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1038,11 +1038,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1058,11 +1058,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + const bool enable_video_accelerator = - // 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) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) (gpu_channel_host->gpu_feature_info() .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] == gpu::kGpuFeatureStatusEnabled); -@@ -1052,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1072,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index eb306a39ffd8..46c661ec0b16 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -102,7 +102,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -172,7 +172,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -171,7 +171,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()); -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -181,7 +181,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -250,7 +250,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -249,7 +249,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } @@ -36,7 +36,7 @@ void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -265,7 +265,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -264,7 +264,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 14c4c3130d0e..eb4e05bb9589 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 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2021-05-12 22:05:53 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 -@@ -184,7 +184,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -183,7 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; @@ -18,7 +18,7 @@ void SetDisplayThreadPriority(base::PlatformThreadId thread_id) override; #endif blink::BlameContext* GetTopLevelBlameContext() override; -@@ -229,7 +229,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -230,7 +230,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi // Return the mojo interface for making CodeCache calls. blink::mojom::CodeCacheHost& GetCodeCacheHost(); @@ -27,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -251,7 +251,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_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index a07a72ab0a1d..43c2b524d5ce 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,19 +1,23 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-06-09 22:14:02 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc -@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ +@@ -30,6 +30,11 @@ void RendererMainPlatformDelegate::PlatformUninitializ } bool RendererMainPlatformDelegate::EnableSandbox() { -+#if !defined(OS_BSD) ++#if defined(OS_FREEBSD) ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::SandboxTypeFromCommandLine( ++ *base::CommandLine::ForCurrentProcess())); ++#else // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md // -@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +@@ -65,7 +70,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ - -+#endif // ! OS_BSD ++#endif // OS_FREEBSD return true; } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index f04f13236dd5..d8501b474102 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2021-04-14 18:41:03 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2021-05-12 22:05:53 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,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" -@@ -104,7 +104,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -105,7 +105,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 68a7738a609f..a42b25208fa2 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 2021-04-14 18:41:03 UTC +--- content/test/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/test/BUILD.gn -@@ -1476,10 +1476,12 @@ test("content_browsertests") { +@@ -1502,10 +1502,12 @@ test("content_browsertests") { } if (is_linux || is_chromeos) { @@ -17,7 +17,7 @@ deps += [ "//ui/gfx:test_support" ] if (use_atk) { -@@ -1720,7 +1722,7 @@ static_library("run_all_unittests") { +@@ -1754,7 +1756,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -26,7 +26,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2558,7 +2560,7 @@ test("content_unittests") { +@@ -2613,7 +2615,7 @@ test("content_unittests") { deps += [ "//ui/gfx/x" ] } diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index 73c5e592f36f..c65b8bd9cb49 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,11 +1,11 @@ ---- content/utility/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- content/utility/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/utility/BUILD.gn -@@ -93,7 +93,7 @@ source_set("utility") { +@@ -94,7 +94,7 @@ source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ] - } - + deps += [ + "//content/utility/speech:speech_recognition_sandbox_hook", + "//printing:printing_sandbox_hook", diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc new file mode 100644 index 000000000000..f85f6e097fff --- /dev/null +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -0,0 +1,14 @@ +--- content/utility/utility_main.cc.orig 2021-06-11 14:43:47 UTC ++++ content/utility/utility_main.cc +@@ -89,6 +89,11 @@ int UtilityMain(const MainFunctionParams& parameters) + if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog)) + WaitForDebugger("Utility"); + ++#if defined(OS_FREEBSD) ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::SandboxTypeFromCommandLine(parameters.command_line)); ++#endif ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + // Initializes the sandbox before any threads are created. + // TODO(jorgelo): move this after GTK initialization when we enable a strict diff --git a/www/chromium/files/patch-device_fido_features.cc b/www/chromium/files/patch-device_fido_features.cc new file mode 100644 index 000000000000..0dcdbf16ab9b --- /dev/null +++ b/www/chromium/files/patch-device_fido_features.cc @@ -0,0 +1,11 @@ +--- device/fido/features.cc.orig 2021-06-11 09:50:47 UTC ++++ device/fido/features.cc +@@ -26,7 +26,7 @@ extern const base::Feature kWebAuthCableServerLink { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + // If updating this, also update kWebAuthCable. +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 0d8932315b42..02802f18f9d9 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,9 +1,9 @@ ---- device/gamepad/gamepad_provider.cc.orig 2021-04-14 18:41:03 UTC +--- device/gamepad/gamepad_provider.cc.orig 2021-05-12 22:05:53 UTC +++ device/gamepad/gamepad_provider.cc -@@ -149,7 +149,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -150,7 +150,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) - polling_thread_.reset(new base::Thread("Gamepad polling thread")); + polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 5b216c33754f..7761cf05d50d 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2021-04-14 18:41:03 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -61,7 +61,7 @@ namespace { +@@ -63,7 +63,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; -@@ -392,7 +392,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -394,7 +394,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; @@ -17,8 +17,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) bool has_permission = extension->permissions_data()->HasAPIPermission( - APIPermission::kNativeMessaging); -@@ -443,12 +443,12 @@ void MessageService::OpenChannelToNativeApp( + mojom::APIPermissionID::kNativeMessaging); +@@ -445,12 +445,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); 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 c8f3b658a573..7118ec4f2cee 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -86,7 +86,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() HidDeviceManager::GetFactoryInstance(); IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index b2c885919fd2..554c85e93aeb 100644 --- a/www/chromium/files/patch-extensions_common_api_runtime.json +++ b/www/chromium/files/patch-extensions_common_api_runtime.json @@ -1,6 +1,6 @@ ---- extensions/common/api/runtime.json.orig 2021-04-14 18:41:04 UTC +--- extensions/common/api/runtime.json.orig 2021-05-12 22:05:54 UTC +++ extensions/common/api/runtime.json -@@ -68,7 +68,7 @@ +@@ -77,7 +77,7 @@ "id": "PlatformOs", "type": "string", "description": "The operating system chrome is running on.", diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index b45ae71b4724..36b8c5a07d8c 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,6 +1,6 @@ ---- extensions/common/stack_frame.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/common/stack_frame.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/common/stack_frame.cc -@@ -7,7 +7,11 @@ +@@ -8,7 +8,11 @@ #include <string> #include "base/strings/utf_string_conversions.h" diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 2f0e0d0563fe..938c773a1866 100644 --- a/www/chromium/files/patch-extensions_shell_BUILD.gn +++ b/www/chromium/files/patch-extensions_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- extensions/shell/BUILD.gn.orig 2021-04-14 18:41:04 UTC +--- extensions/shell/BUILD.gn.orig 2021-05-12 22:05:54 UTC +++ extensions/shell/BUILD.gn -@@ -208,16 +208,24 @@ source_set("app_shell_lib") { +@@ -209,16 +209,24 @@ source_set("app_shell_lib") { } if (is_linux || is_chromeos_lacros) { 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 index 3e59bf6e8629..b2ce122eaa29 100644 --- 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 @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -810,12 +810,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -813,12 +813,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( static_cast<DawnRequestAdapterSerial>(c.request_adapter_serial); if (gr_context_type_ != GrContextType::kVulkan) { diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index ffbabd17fd85..a61648c704e1 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -451,7 +451,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -453,7 +453,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } 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 6477ee7614bc..52e2fa773534 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -52,7 +52,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { +@@ -53,7 +53,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { return; } #endif @@ -27,7 +27,7 @@ client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -66,7 +66,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -67,7 +67,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; @@ -36,7 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -201,7 +201,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -207,7 +207,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_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 8f895634741d..7d0ddf6c952d 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -16,7 +16,7 @@ +@@ -18,7 +18,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" @@ -9,7 +9,7 @@ namespace gfx { class ClientNativePixmapFactory; } -@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { +@@ -42,7 +42,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, gfx::BufferUsage usage); @@ -18,8 +18,8 @@ gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } -@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { - GpuMemoryBufferImpl::DestructionCallback callback); +@@ -70,7 +70,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { + scoped_refptr<base::UnsafeSharedMemoryPool> pool = nullptr); private: -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 5034c5008f3b..d33ef4bee500 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -118,7 +118,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in } #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -129,7 +129,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ // !BUILDFLAG(IS_CHROMECAST)) class GpuWatchdogInit { -@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -216,7 +216,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL device_perf_info_ = device_perf_info; } @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -268,7 +268,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL delayed_watchdog_enable = true; #endif @@ -36,7 +36,7 @@ // PreSandbox is mainly for resource handling and not related to the GPU // driver, it doesn't need the GPU watchdog. The loadLibrary may take long // time that killing and restarting the GPU process will not help. -@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -308,7 +308,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -45,7 +45,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -54,7 +54,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -359,7 +359,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -63,7 +63,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL SaveHardwareGpuInfoAndGpuFeatureInfo(); gl::init::ShutdownGL(true); gl_initialized = false; @@ -72,7 +72,7 @@ } if (!gl_initialized) { -@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -81,7 +81,7 @@ // 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 -@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -458,7 +458,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -90,7 +90,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -473,7 +473,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -99,7 +99,7 @@ } } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -535,7 +535,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -549,7 +549,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -108,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. -@@ -554,7 +554,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -568,7 +568,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -117,7 +117,7 @@ if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -737,7 +737,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -755,7 +755,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -126,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. -@@ -758,7 +758,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -776,7 +776,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index 8c94f80eaf0a..21af3b363abf 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -198,7 +198,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -199,7 +199,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread bool WithinOneMinFromPowerResumed(); bool WithinOneMinFromForegrounded(); @@ -9,7 +9,7 @@ void UpdateActiveTTY(); #endif // The watchdog continues when it's not on the TTY of our host X11 server. -@@ -270,7 +270,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -271,7 +271,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread bool less_than_full_thread_time_after_capped_ = false; #endif diff --git a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py new file mode 100644 index 000000000000..edd72c62d052 --- /dev/null +++ b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py @@ -0,0 +1,29 @@ +--- gpu/vulkan/generate_bindings.py.orig 2021-06-11 09:51:44 UTC ++++ gpu/vulkan/generate_bindings.py +@@ -183,7 +183,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'extension': 'VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME', + 'functions': [ + 'vkGetSemaphoreFdKHR', +@@ -199,7 +199,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'extension': 'VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME', + 'functions': [ + 'vkGetMemoryFdKHR', +@@ -250,7 +250,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)', + 'extension': 'VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME', + 'functions': [ + 'vkGetImageDrmFormatModifierPropertiesEXT', 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 39559fbe2177..bfa3f2afe9fe 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,4 +1,4 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2021-04-14 18:41:04 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2021-05-12 22:05:54 UTC +++ gpu/vulkan/vulkan_function_pointers.h @@ -241,10 +241,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; @@ -75,7 +75,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1125,7 +1125,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1140,7 +1140,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -84,7 +84,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1133,6 +1133,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1148,6 +1148,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp return gpu::GetVulkanFunctionPointers() ->vkGetImageDrmFormatModifierPropertiesEXT(device, image, pProperties); } diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index f4ad1aa8d950..99d736cf614e 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 2021-04-14 18:41:04 UTC +--- headless/BUILD.gn.orig 2021-05-12 22:05:54 UTC +++ headless/BUILD.gn -@@ -272,7 +272,7 @@ source_set("headless_shared_sources") { +@@ -290,7 +290,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", -@@ -291,7 +291,7 @@ source_set("headless_shared_sources") { +@@ -309,7 +309,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -461,7 +461,7 @@ component("headless_non_renderer") { +@@ -487,7 +487,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,7 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -778,7 +778,7 @@ static_library("headless_shell_lib") { +@@ -808,7 +808,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h index 71952e20cf77..9cdfcbad4d43 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -1,8 +1,8 @@ ---- headless/lib/browser/headless_browser_main_parts.h.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_browser_main_parts.h.orig 2021-05-12 22:05:54 UTC +++ headless/lib/browser/headless_browser_main_parts.h -@@ -37,7 +37,7 @@ class HeadlessBrowserMainParts : public content::Brows - #if defined(OS_MAC) +@@ -46,7 +46,7 @@ class HeadlessBrowserMainParts : public content::Brows void PreMainMessageLoopStart() override; + device::GeolocationSystemPermissionManager* GetLocationPermissionManager(); #endif -#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_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index c55dc75175ab..5c878606ed24 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2021-05-12 22:05:54 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -279,7 +279,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL +@@ -280,7 +280,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } 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 ec8d229f0175..a32036194727 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 2021-04-14 18:41:04 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2021-05-12 22:05:54 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -326,7 +326,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -323,7 +323,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; @@ -9,12 +9,3 @@ // TODO(fuchsia): Implement this when crash reporting/Breakpad are available // in Fuchsia. (crbug.com/753619) NOTIMPLEMENTED(); -@@ -355,7 +355,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( - crash_reporter::InitializeCrashpadWithEmbeddedHandler( - process_type.empty(), process_type, "", base::FilePath()); - #endif // defined(HEADLESS_USE_BREAKPAD) --#endif // defined(OS_FUCHSIA) -+#endif // defined(OS_FUCHSIA) || defined(OS_BSD) - } - - diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 0d39a926accb..6c36c7ed5a1c 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 2021-04-14 18:41:05 UTC +--- ipc/ipc_message_utils.cc.orig 2021-05-12 22:05:55 UTC +++ ipc/ipc_message_utils.cc -@@ -362,7 +362,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -361,7 +361,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index ea4f9b006b89..2b9e9b6c5654 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2021-04-14 18:41:05 UTC +--- ipc/ipc_message_utils.h.orig 2021-05-12 22:05:55 UTC +++ ipc/ipc_message_utils.h -@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> { +@@ -207,7 +207,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index ca9415f3efbe..7f12cbe4c484 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2021-04-14 18:41:05 UTC +--- media/audio/audio_input_device.cc.orig 2021-05-12 22:05:55 UTC +++ media/audio/audio_input_device.cc -@@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -254,7 +254,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index bac850f88c2f..08d6e8514ebf 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2021-04-20 18:58:34 UTC +--- media/base/media_switches.cc.orig 2021-05-12 22:05:55 UTC +++ media/base/media_switches.cc -@@ -375,7 +375,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -379,7 +379,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -417,7 +417,7 @@ const base::Feature kGlobalMediaControlsOverlayControl +@@ -421,7 +421,7 @@ const base::Feature kGlobalMediaControlsOverlayControl // Show picture-in-picture button in Global Media Controls. const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", @@ -18,21 +18,21 @@ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -461,7 +461,7 @@ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay" +@@ -463,7 +463,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", + const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", + base::FEATURE_ENABLED_BY_DEFAULT}; - // 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) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -469,7 +469,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo +@@ -471,7 +471,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo const base::Feature kVaapiVideoEncodeLinux{"VaapiVideoEncoder", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) // Enable VA-API hardware decode acceleration for AV1. const base::Feature kVaapiAV1Decoder{"VaapiAV1Decoder", diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index ad0568ac2cca..da7306901b73 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,15 +1,15 @@ ---- media/base/media_switches.h.orig 2021-04-22 08:21:12 UTC +--- media/base/media_switches.h.orig 2021-05-12 22:05:55 UTC +++ media/base/media_switches.h -@@ -183,10 +183,10 @@ MEDIA_EXPORT extern const base::Feature kUseR16Texture +@@ -179,10 +179,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice + MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; + MEDIA_EXPORT extern const base::Feature kUseR16Texture; MEDIA_EXPORT extern const base::Feature kUseSodaForLiveCaption; - // 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) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiAV1Decoder; MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoderGen9x; MEDIA_EXPORT extern const base::Feature kVaapiEnforceVideoMinMaxResolution; diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 1ab438e00ca8..c3857eb28113 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 2021-04-14 18:41:05 UTC +--- media/base/video_frame.cc.orig 2021-05-12 22:05:55 UTC +++ media/base/video_frame.cc @@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -628,7 +628,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -623,7 +623,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; @@ -45,7 +45,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -673,7 +673,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -668,7 +668,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -54,7 +54,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -896,7 +896,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -891,7 +891,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_; -@@ -1246,7 +1246,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1242,7 +1242,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -72,7 +72,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1331,7 +1331,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1327,7 +1327,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 9dc8c9cc45b1..68b0710d80ba 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2021-04-14 18:41:05 UTC +--- media/base/video_frame.h.orig 2021-05-12 22:05:55 UTC +++ media/base/video_frame.h @@ -40,9 +40,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -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 -@@ -699,7 +699,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -697,7 +697,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_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 7035452c0a2f..862dabf52fb0 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2021-04-14 18:41:05 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2021-05-12 22:05:55 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -24,10 +26,10 @@ +@@ -25,10 +27,10 @@ using media::mojom::MeteringMode; diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 23e945736691..8303f4963f63 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 2021-04-14 18:41:05 UTC +--- media/media_options.gni.orig 2021-05-12 22:05:56 UTC +++ media/media_options.gni -@@ -124,6 +124,9 @@ declare_args() { +@@ -94,6 +94,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 deleted file mode 100644 index 516797961fc1..000000000000 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2021-04-14 18:41:05 UTC -+++ media/mojo/clients/mojo_video_encode_accelerator.cc -@@ -134,7 +134,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< - DCHECK_EQ(num_planes, frame->layout().num_planes()); - DCHECK(vea_.is_bound()); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF - // in VideoEncodeAccelerator. - if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { 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 c8c9a0dd8205..9a91f584166f 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,4 +1,4 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2021-04-14 18:41:05 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2021-05-12 22:05:56 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -21,9 +21,9 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" @@ -12,21 +12,3 @@ namespace mojo { -@@ -63,7 +63,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( - std::move(offsets))); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { - std::vector<mojo::PlatformHandle> dmabuf_fds; - -@@ -167,7 +167,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, - shared_buffer_data.TakeFrameData(), - shared_buffer_data.frame_data_size(), std::move(offsets), - std::move(strides), timestamp); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - } else if (data.is_dmabuf_data()) { - media::mojom::DmabufVideoFrameDataDataView dmabuf_data; - data.GetDmabufDataDataView(&dmabuf_data); 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 291a99207060..f24be27eca29 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 2021-04-14 18:41:06 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2021-05-12 22:05:56 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -649,7 +649,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -643,7 +643,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 index 3666f1b3fa2c..766aa7f3e841 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2021-04-14 18:41:06 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2021-05-12 22:05:56 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -56,7 +56,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -67,7 +67,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -198,7 +198,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -209,7 +209,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal auto vea_config = SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index b64899acaad5..9ec416f93d34 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-04-14 18:41:06 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-05-12 22:05:56 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -285,7 +285,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -329,7 +329,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes vea()->SetEncodingCallback(base::BindLambdaForTesting( [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { 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 9b202bd0a184..dd62f0f480c3 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,6 +1,6 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2021-04-14 18:41:06 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2021-05-12 22:05:56 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -85,7 +85,7 @@ +@@ -90,7 +90,7 @@ use_base_dir="false" resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" type="BINDATA" /> diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 6d09c27543d7..769e55fee99c 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 2021-04-14 18:41:06 UTC +--- net/BUILD.gn.orig 2021-05-12 22:05:57 UTC +++ net/BUILD.gn @@ -100,7 +100,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1241,6 +1241,16 @@ component("net") { +@@ -1242,6 +1242,16 @@ component("net") { ] } @@ -26,7 +26,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1377,7 +1387,7 @@ component("net") { +@@ -1378,7 +1388,7 @@ component("net") { } } @@ -35,7 +35,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1410,7 +1420,7 @@ component("net") { +@@ -1411,7 +1421,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", -@@ -4746,7 +4756,7 @@ test("net_unittests") { +@@ -4748,7 +4758,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn new file mode 100644 index 000000000000..d90a2991b4c3 --- /dev/null +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -0,0 +1,11 @@ +--- net/dns/BUILD.gn.orig 2021-06-11 08:54:45 UTC ++++ net/dns/BUILD.gn +@@ -114,7 +114,7 @@ source_set("dns") { + "dns_config_service_android.cc", + "dns_config_service_android.h", + ] +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { + sources += [ + "dns_config_service_linux.cc", + "dns_config_service_linux.h", diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc index a85e68905c9f..a95e0fb7179a 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator.cc.orig 2021-04-14 18:41:07 UTC +--- net/nqe/network_quality_estimator.cc.orig 2021-05-12 22:05:57 UTC +++ net/nqe/network_quality_estimator.cc -@@ -109,7 +109,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( +@@ -110,7 +110,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc index dfdfe3587715..2167ed2dda03 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 2021-04-14 18:41:07 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2021-05-12 22:05:57 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2180,9 +2180,9 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa +@@ -2097,9 +2097,9 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // ChromeOS is disabled due to crbug.com/986904 // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 79e0167d4894..69081d7ef256 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 2021-04-14 18:41:07 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2021-05-12 22:05:57 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "net/proxy_resolution/proxy_resolver_mac.h" // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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" -@@ -66,7 +66,7 @@ namespace { +@@ -67,7 +67,7 @@ namespace { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_APPLE) || \ @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1414,7 +1414,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -1415,7 +1415,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 62f02ab5af67..09d20182d1b7 100644 --- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-04-14 18:41:07 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-05-12 22:05:57 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -511,6 +513,7 @@ int StringToIntOrDefault(base::StringPiece value, int +@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int return default_value; } @@ -18,7 +18,7 @@ // This is the KDE version that reads kioslaverc and simulates gsettings. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -1001,6 +1004,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1215,8 +1219,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc index 90d202cdff7d..d2c0cc92a099 100644 --- a/www/chromium/files/patch-net_socket_socket__posix.cc +++ b/www/chromium/files/patch-net_socket_socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/socket_posix.cc -@@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() { +@@ -519,7 +519,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc index f65487be3e58..619ba508bae1 100644 --- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/tcp_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/tcp_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/tcp_socket_posix.cc -@@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -90,6 +90,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index cb7c299019b5..bf286e78bd68 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/udp_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/udp_socket_posix.cc -@@ -72,6 +72,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE +@@ -74,6 +74,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); @@ -33,7 +33,7 @@ #if defined(OS_MAC) // On OSX the file descriptor is guarded to detect the cause of -@@ -631,13 +657,13 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -622,13 +648,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -49,7 +49,7 @@ } int UDPSocketPosix::AllowAddressReuse() { -@@ -926,7 +952,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -920,7 +946,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, @@ -61,7 +61,7 @@ if (rv) return MapSystemError(errno); break; -@@ -1027,9 +1057,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1021,9 +1051,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc index 00a50ef6cd49..e1e396a16bfb 100644 --- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/unix_domain_client_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/unix_domain_client_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/unix_domain_client_socket_posix.cc -@@ -57,7 +57,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st +@@ -59,7 +59,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st return true; } diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 8cad991131dc..8cb672cc38d1 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_request_context_builder.cc.orig 2021-05-12 22:05:58 UTC +++ net/url_request/url_request_context_builder.cc -@@ -484,7 +484,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -493,7 +493,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ConfiguredProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 6aaa23eb3215..5f7c80253a9d 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 2021-04-14 18:41:07 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2021-05-12 22:05:58 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -75,7 +75,7 @@ +@@ -77,7 +77,7 @@ #include "v8/include/cppgc/platform.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -510,7 +510,7 @@ void InitializeSDK(bool enable_v8) { +@@ -511,7 +511,7 @@ void InitializeSDK(bool enable_v8) { FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -541,7 +541,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -542,7 +542,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 -@@ -998,7 +998,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -999,7 +999,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index 61cf4a2909c9..7d03ed8b6362 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,6 +1,6 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2021-04-14 18:41:07 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2021-05-12 22:05:58 UTC +++ ppapi/proxy/file_io_resource.cc -@@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -282,17 +282,19 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; @@ -24,7 +24,7 @@ } if (increase > 0) { -@@ -314,7 +316,7 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -312,7 +314,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else @@ -33,7 +33,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -590,9 +592,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( +@@ -588,9 +590,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn new file mode 100644 index 000000000000..1969545fbf08 --- /dev/null +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -0,0 +1,20 @@ +--- printing/BUILD.gn.orig 2021-06-10 12:12:00 UTC ++++ printing/BUILD.gn +@@ -48,7 +48,7 @@ if (use_cups_ipp && is_chromeos_ash) { + } + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("printing_sandbox_hook") { + sources = [ + "sandbox/print_backend_sandbox_hook_linux.cc", +@@ -297,7 +297,7 @@ component("printing") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ ":printing_sandbox_hook" ] + } + } diff --git a/www/chromium/files/patch-printing_backend_cups__helper.cc b/www/chromium/files/patch-printing_backend_cups__helper.cc new file mode 100644 index 000000000000..6f3d809262b3 --- /dev/null +++ b/www/chromium/files/patch-printing_backend_cups__helper.cc @@ -0,0 +1,38 @@ +--- printing/backend/cups_helper.cc.orig 2021-06-10 11:43:23 UTC ++++ printing/backend/cups_helper.cc +@@ -24,7 +24,7 @@ + #include "printing/units.h" + #include "url/gurl.h" + +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #include <unistd.h> + + #include "base/files/scoped_file.h" +@@ -578,7 +578,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + base::StringPiece printer_capabilities, + PrinterSemanticCapsAndDefaults* printer_info) { + base::FilePath ppd_file_path; +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // A file created while in a sandbox will be automatically deleted once all + // handles to it have been closed. This precludes the use of multiple + // operations against a file path. +@@ -625,7 +625,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + ppd_status_t ppd_status = ppdLastError(&line); + LOG(ERROR) << "Failed to open PDD file: error " << ppd_status << " at line " + << line << ", " << ppdErrorString(ppd_status); +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + if (ppd_status != PPD_FILE_OPEN_ERROR) { + // When the error is not from opening the file then the CUPS library + // internals will have already closed the file descriptor. It is +@@ -716,7 +716,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + } + + ppdClose(ppd); +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // The CUPS library internals close the file descriptor upon successfully + // reading it. Explicitly release the `ScopedFD` to prevent a crash caused + // by a bad file descriptor. diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index 9eb75a7a383a..1c333b09ad0d 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 2021-04-14 18:41:07 UTC +--- printing/print_settings.h.orig 2021-05-12 22:05:58 UTC +++ printing/print_settings.h -@@ -20,11 +20,11 @@ +@@ -19,11 +19,11 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -14,7 +14,7 @@ namespace printing { -@@ -81,9 +81,9 @@ class PRINTING_EXPORT PrintSettings { +@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { } }; @@ -26,7 +26,7 @@ PrintSettings(); PrintSettings(const PrintSettings&) = delete; -@@ -222,12 +222,12 @@ class PRINTING_EXPORT PrintSettings { +@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -41,7 +41,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) void set_send_user_info(bool send_user_info) { -@@ -321,10 +321,10 @@ class PRINTING_EXPORT PrintSettings { +@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc new file mode 100644 index 000000000000..8f081a2ab251 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -0,0 +1,16 @@ +--- remoting/host/chromoting_host_context.cc.orig 2021-06-10 11:44:05 UTC ++++ remoting/host/chromoting_host_context.cc +@@ -139,11 +139,11 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC + // on a UI thread. + scoped_refptr<AutoThreadTaskRunner> input_task_runner = + AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + base::MessagePumpType::UI); + #else + base::MessagePumpType::IO); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + return base::WrapUnique(new ChromotingHostContext( + ui_task_runner, audio_task_runner, file_task_runner, input_task_runner, diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index 3bcdcaf2f0aa..3560ed2ad39c 100644 --- a/www/chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/host_attributes.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/host_attributes.cc -@@ -120,7 +120,7 @@ std::string GetHostAttributes() { +@@ -122,7 +122,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } 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 486f5b55edb6..4812b1888918 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 2021-04-14 18:41:08 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -30,12 +30,12 @@ +@@ -30,13 +30,13 @@ #include "remoting/host/switches.h" #include "remoting/host/usage_stats_consent.h" @@ -10,21 +10,36 @@ #include "base/linux_util.h" #include "ui/events/platform/x11/x11_event_source.h" + #include "ui/gfx/x/xlib_support.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" -@@ -114,7 +114,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -76,11 +76,11 @@ bool CurrentProcessHasUiAccess() { + // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and + // runs the task executor until It2MeNativeMessagingHost signals shutdown. + int It2MeNativeMessagingHostMain(int argc, char** argv) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // This object instance is required by Chrome code (such as + // SingleThreadTaskExecutor). +@@ -121,7 +121,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) - // Create an X11EventSource so the global X11 connection - // (x11::Connection::Get()) can dispatch X events. - auto event_source = -@@ -132,7 +132,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Required for any calls into GTK functions, such as the Disconnect and + // Continue windows. Calling with nullptr arguments because we don't have + // any command line arguments for gtk to consume. +@@ -134,7 +134,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(); @@ -33,3 +48,35 @@ base::File read_file; base::File write_file; +@@ -253,7 +253,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + std::unique_ptr<PolicyWatcher> policy_watcher = + PolicyWatcher::CreateWithTaskRunner(context->file_task_runner()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -262,7 +262,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + new ui::X11EventSource(x11::Connection::Get()); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + std::unique_ptr<extensions::NativeMessageHost> host( + new It2MeNativeMessagingHost(is_process_elevated_, +@@ -275,11 +275,11 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Run the loop until channel is alive. + run_loop.Run(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Block until tasks blocking shutdown have completed their execution. + base::ThreadPoolInstance::Get()->Shutdown(); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 220603bdb00d..a593c82d7abc 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -130,7 +130,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -131,7 +131,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index abcc2d84678c..0eb49af0ad5f 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 2021-04-14 18:41:08 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -120,14 +120,14 @@ +@@ -119,7 +119,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,9 +9,10 @@ #include <gtk/gtk.h> #include "base/linux_util.h" - #include "remoting/host/audio_capturer_linux.h" +@@ -127,7 +127,7 @@ #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" + #include "ui/gfx/x/xlib_support.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -82,6 +83,38 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - std::unique_ptr<ui::X11EventSource> event_source; - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - kReportOfflineReasonSwitchName)) { + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +@@ -1800,7 +1800,7 @@ int HostProcessMain() { + std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( + net::NetworkChangeNotifier::CreateIfNeeded()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -1809,7 +1809,7 @@ int HostProcessMain() { + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + new ui::X11EventSource(x11::Connection::Get()); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Create & start the HostProcess using these threads. + // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). +@@ -1822,11 +1822,11 @@ int HostProcessMain() { + // Run the main (also UI) task executor until the host no longer needs it. + run_loop.Run(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Block until tasks blocking shutdown have completed their execution. + base::ThreadPoolInstance::Get()->Shutdown(); diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index e35cb70cca9f..0f4f3c397925 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,6 +1,6 @@ ---- remoting/resources/remoting_strings.grd.orig 2021-04-14 18:41:08 UTC +--- remoting/resources/remoting_strings.grd.orig 2021-05-12 22:05:58 UTC +++ remoting/resources/remoting_strings.grd -@@ -886,7 +886,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -894,7 +894,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. Open Screen Recording Preferences </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) </message> -@@ -902,7 +902,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -910,7 +910,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> Launch the default XSession </message> diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc index 9451cab2e91e..8d99e94b6dea 100644 --- a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc @@ -1,6 +1,6 @@ ---- remoting/test/it2me_standalone_host.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/test/it2me_standalone_host.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/test/it2me_standalone_host.cc -@@ -49,7 +49,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() +@@ -50,7 +50,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() context_->ui_task_runner()), connection_(base::WrapUnique(new testing::NiceMock<MockSession>())), session_jid_(kSessionJid), diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index d7ba17045504..39e06988de6a 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2021-04-14 18:41:08 UTC +--- sandbox/policy/BUILD.gn.orig 2021-06-09 22:14:06 UTC +++ sandbox/policy/BUILD.gn @@ -29,7 +29,7 @@ component("policy") { "//sandbox:common", @@ -9,3 +9,19 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", +@@ -78,6 +78,15 @@ component("policy") { + "//sandbox/linux:sandbox_services", + "//sandbox/linux:seccomp_bpf", + "//sandbox/linux:suid_sandbox_client", ++ ] ++ } ++ if (is_bsd) { ++ sources += [ ++ "freebsd/sandbox_freebsd.h", ++ "freebsd/sandbox_freebsd.cc", ++ ] ++ deps += [ ++ "//sandbox:sandbox_buildflags", + ] + } + if (is_chromeos_ash) { diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.cc b/www/chromium/files/patch-sandbox_policy_sandbox.cc new file mode 100644 index 000000000000..855f4344dff6 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_sandbox.cc @@ -0,0 +1,35 @@ +--- sandbox/policy/sandbox.cc.orig 2021-06-11 14:21:39 UTC ++++ sandbox/policy/sandbox.cc +@@ -12,6 +12,10 @@ + #include "base/android/jni_android.h" + #endif // defined(OS_ANDROID) + ++#if defined(OS_FREEBSD) ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #include "sandbox/policy/linux/sandbox_linux.h" + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +@@ -29,6 +33,12 @@ + namespace sandbox { + namespace policy { + ++#if defined(OS_FREEBSD) ++bool Sandbox::Initialize(SandboxType sandbox_type) { ++ return SandboxFreeBSD::GetInstance()->InitializeSandbox(sandbox_type); ++} ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + bool Sandbox::Initialize(SandboxType sandbox_type, + SandboxLinux::PreSandboxHook hook, +@@ -89,6 +99,8 @@ bool Sandbox::IsProcessSandboxed() { + base::android::MethodID::Get<base::android::MethodID::TYPE_STATIC>( + env, process_class.obj(), "isIsolated", "()Z"); + return env->CallStaticBooleanMethod(process_class.obj(), is_isolated); ++#elif defined(OS_FREEBSD) ++ return SandboxFreeBSD::GetInstance()->IsSandboxed(); + #elif defined(OS_FUCHSIA) + // TODO(https://crbug.com/1071420): Figure out what to do here. Process + // launching controls the sandbox and there are no ambient capabilities, so diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.h b/www/chromium/files/patch-sandbox_policy_sandbox.h new file mode 100644 index 000000000000..25dabef67f29 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_sandbox.h @@ -0,0 +1,24 @@ +--- sandbox/policy/sandbox.h.orig 2021-06-11 14:23:34 UTC ++++ sandbox/policy/sandbox.h +@@ -9,6 +9,10 @@ + #include "sandbox/policy/export.h" + #include "sandbox/policy/sandbox_type.h" + ++#if defined(OS_FREEBSD) ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #include "sandbox/policy/linux/sandbox_linux.h" + #endif +@@ -30,6 +34,10 @@ namespace policy { + + class SANDBOX_POLICY_EXPORT Sandbox { + public: ++#if defined(OS_FREEBSD) ++ static bool Initialize(SandboxType sandbox_type); ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + static bool Initialize(SandboxType sandbox_type, + SandboxLinux::PreSandboxHook hook, diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 741c6e218282..7ef50037534f 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 2021-04-14 18:41:08 UTC +--- sandbox/policy/switches.cc.orig 2021-05-12 22:05:58 UTC +++ sandbox/policy/switches.cc -@@ -82,7 +82,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -83,7 +83,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 89a43bb5bacb..bbb515944cf3 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 2021-04-14 18:41:08 UTC +--- sandbox/policy/switches.h.orig 2021-05-12 22:05:58 UTC +++ sandbox/policy/switches.h -@@ -54,7 +54,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -55,7 +55,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 440e85364eb3..83a114c79175 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 2021-04-14 18:41:08 UTC +--- services/audio/BUILD.gn.orig 2021-05-12 22:05:58 UTC +++ services/audio/BUILD.gn -@@ -75,7 +75,7 @@ source_set("audio") { +@@ -76,7 +76,7 @@ source_set("audio") { "//services/audio/public/mojom", ] diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc index 5dbb60326b74..2b5f535f82d7 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_service.cc.orig 2021-04-14 18:41:08 UTC +--- services/device/hid/hid_service.cc.orig 2021-05-12 22:05:58 UTC +++ services/device/hid/hid_service.cc @@ -18,6 +18,8 @@ @@ -9,7 +9,7 @@ #elif defined(OS_MAC) #include "services/device/hid/hid_service_mac.h" #elif defined(OS_WIN) -@@ -58,6 +60,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr +@@ -61,6 +63,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc index 67e5b8a7abbc..4c6d4a904196 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2021-04-21 12:19:19 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2021-06-10 13:30:27 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,390 @@ +@@ -0,0 +1,391 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -32,6 +32,7 @@ +#include "base/strings/string_util.h" +#include "base/strings/string_split.h" +#include "base/task/post_task.h" ++#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_task_runner_handle.h" +#include "base/threading/thread_restrictions.h" diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index ef9fe8ceb7d1..25f4ab14f1d0 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,19 +1,20 @@ ---- services/network/BUILD.gn.orig 2021-04-14 18:41:08 UTC +--- services/network/BUILD.gn.orig 2021-06-09 22:14:06 UTC +++ services/network/BUILD.gn -@@ -273,9 +273,15 @@ component("network_service") { - ] - } +@@ -249,7 +249,7 @@ component("network_service") { + "//url", + ] - if (is_linux || is_chromeos) { -+ if ((is_linux && !is_bsd) || is_chromeos) { - deps += [ - "//sandbox/linux:sandbox_services", -+ "//sandbox/policy", -+ ] -+ } -+ -+ if (is_bsd) { -+ deps += [ - "//sandbox/policy", - ] ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ ":network_sandbox_hook" ] } + +@@ -282,7 +282,7 @@ component("network_service") { + defines = [ "IS_NETWORK_SERVICE_IMPL" ] + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("network_sandbox_hook") { + sources = [ + "network_sandbox_hook_linux.cc", diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc new file mode 100644 index 000000000000..3babf4cacbec --- /dev/null +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -0,0 +1,11 @@ +--- services/network/network_context.cc.orig 2021-06-11 09:55:35 UTC ++++ services/network/network_context.cc +@@ -2331,7 +2331,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const + + net::CookieCryptoDelegate* crypto_delegate = nullptr; + if (params_->enable_encrypted_cookies) { +-#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ + !BUILDFLAG(IS_CHROMECAST) + DCHECK(network_service_->os_crypt_config_set()) + << "NetworkService::SetCryptConfig must be called before creating a " diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index e8f0b279a302..e91ce1f04653 100644 --- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2021-04-14 18:41:08 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2021-05-12 22:05:58 UTC +++ services/network/network_sandbox_hook_linux.cc -@@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet; - namespace network { +@@ -32,6 +32,7 @@ std::vector<BrokerFilePermission> GetNetworkFilePermis + } bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { +#if !defined(OS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); - // TODO(tsepez): remove universal permission under filesytem root. -@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin + instance->StartBrokerProcess( +@@ -39,6 +40,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 754d56ea49f2..853383a096db 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2021-04-14 18:41:08 UTC +--- services/network/network_service.cc.orig 2021-05-12 22:05:58 UTC +++ services/network/network_service.cc -@@ -72,7 +72,7 @@ +@@ -71,7 +71,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -661,7 +661,7 @@ void NetworkService::OnCertDBChanged() { +@@ -614,7 +614,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index bc692c905b57..4e8c46106889 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2021-04-14 18:41:08 UTC +--- services/network/network_service.h.orig 2021-05-12 22:05:58 UTC +++ services/network/network_service.h -@@ -193,7 +193,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span<const uint8_t> crl_set, mojom::NetworkService::UpdateCRLSetCallback callback) override; void OnCertDBChanged() override; diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc new file mode 100644 index 000000000000..9e5ad7e849ea --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc @@ -0,0 +1,16 @@ +--- services/service_manager/public/cpp/service_executable/service_executable_environment.cc.orig 2021-06-11 15:03:35 UTC ++++ services/service_manager/public/cpp/service_executable/service_executable_environment.cc +@@ -50,6 +50,13 @@ ServiceExecutableEnvironment::ServiceExecutableEnviron + sandbox::policy::switches::kServiceSandboxType)), + sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox_options); + } ++#elif defined(OS_FREEBSD) ++ if (command_line.HasSwitch(sandbox::policy::switches::kServiceSandboxType)) { ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::UtilitySandboxTypeFromString( ++ command_line.GetSwitchValueASCII( ++ sandbox::policy::switches::kServiceSandboxType))); ++ } + #endif + + mojo::core::Init(); diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc new file mode 100644 index 000000000000..eea94a36b2c6 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2021-06-11 09:57:05 UTC ++++ services/tracing/public/cpp/perfetto/perfetto_config.cc +@@ -88,7 +88,7 @@ void AddDataSourceConfigs( + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ +- (BUILDFLAG(IS_CHROMECAST) && defined(OS_LINUX)) ++ (BUILDFLAG(IS_CHROMECAST) && (defined(OS_LINUX) || defined(OS_BSD))) + if (source_names.empty() || + source_names.count(tracing::mojom::kSystemTraceDataSourceName) == 1) { + AddDataSourceConfig( diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc index 2f60feac6aac..4376cbccdf35 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc @@ -1,24 +1,18 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-04-14 18:41:08 UTC +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-06-14 15:19:11 UTC +++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -12,14 +12,18 @@ namespace tracing { +@@ -12,10 +12,14 @@ namespace tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. -#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_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ defined(OS_FUCHSIA) struct timespec ts; -+ int res = clock_gettime(CLOCK_UPTIME, &ts); +#if defined(OS_BSD) ++ int res = clock_gettime(CLOCK_MONOTONIC, &ts); +#else int res = clock_gettime(CLOCK_BOOTTIME, &ts); +#endif if (res != -1) return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); #endif - return TRACE_TIME_TICKS_NOW().since_origin().InNanoseconds(); - } - --} // namespace tracing -\ No newline at end of file -+} // namespace tracing diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h new file mode 100644 index 000000000000..7e4adcc80d27 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/trace_time.h.orig 2021-06-11 09:59:43 UTC ++++ services/tracing/public/cpp/perfetto/trace_time.h +@@ -10,7 +10,7 @@ + + namespace tracing { + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ + defined(OS_FUCHSIA) + // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 + // about efforts to unify base::TimeTicks across all platforms. diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index f54db5792902..78f33bf35441 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-04-14 18:41:08 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-05-12 22:05:58 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -625,7 +625,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa +@@ -630,7 +630,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index cffa0452aadd..5f100d7f1765 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 2021-04-14 18:42:57 UTC +--- third_party/angle/BUILD.gn.orig 2021-05-12 22:13:33 UTC +++ third_party/angle/BUILD.gn -@@ -200,7 +200,7 @@ config("extra_warnings") { +@@ -201,7 +201,7 @@ config("extra_warnings") { "-Wunreachable-code", "-Wshorten-64-to-32", ] @@ -9,7 +9,7 @@ # Mac catalyst uses a clang version that doesn't have these. cflags += [ "-Wdeprecated-copy", -@@ -439,6 +439,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -454,6 +454,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", 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 f16adbad5b3d..153258696df0 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 2021-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-05-12 22:13:33 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 -@@ -226,7 +226,7 @@ OSVersion GetMacOSVersion() +@@ -230,7 +230,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. -@@ -238,6 +238,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -242,6 +242,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; -@@ -248,6 +256,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -252,6 +260,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } @@ -41,7 +41,7 @@ return true; } -@@ -255,7 +264,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -259,7 +268,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 432f7359823d..7764d946b3ed 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 2021-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-05-12 22:13:33 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -158,7 +158,7 @@ inline bool IsWindows() +@@ -165,7 +165,7 @@ inline bool IsWindows() inline bool IsLinux() { 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 index 13b2d3b641a3..fda961a3c939 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -49,7 +49,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; UserAgentOverride user_agent_override; std::string accept_languages; 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 index b50010ebedf6..caf2ae4e539b 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -154,7 +154,7 @@ struct BLINK_COMMON_EXPORT +@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT return data.accept_languages; } 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 ede6562c0a84..2069ac9aee7e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -67,11 +67,11 @@ +@@ -66,11 +66,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -14,7 +14,7 @@ defined(OS_MAC) || defined(OS_WIN) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" -@@ -153,7 +153,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -147,7 +147,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif @@ -23,7 +23,7 @@ defined(OS_MAC) || defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -218,7 +218,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -212,7 +212,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif 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 index 76ede5d3bde4..4ceedb20724a 100644 --- 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 @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-05-24 22:05:45 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -414,7 +414,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ 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' -@@ -3085,12 +3085,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3089,12 +3089,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index dc4d5203cd72..9ce59642a1b0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-04-22 08:28:10 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6053,7 +6053,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6057,7 +6057,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); } @@ -9,12 +9,12 @@ TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6427,7 +6427,7 @@ TEST_P(CompositedSelectionBoundsTest, Editable) { - TEST_P(CompositedSelectionBoundsTest, EditableDiv) { - RunTest("composited_selection_bounds_editable_div.html"); +@@ -6426,7 +6426,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { + TEST_P(CompositedSelectionBoundsTest, SVGTextWithFragments) { + RunTest("composited_selection_bounds_svg_text_with_fragments.html"); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || 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) #if !defined(OS_ANDROID) TEST_P(CompositedSelectionBoundsTest, Input) { - // This test does not yet pass in CAP due to handling of + RunTest("composited_selection_bounds_input.html"); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 79bc647f5dfd..759373a357e0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -156,7 +156,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -154,7 +154,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 552a93366795..220b7df2f883 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 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -63,7 +63,7 @@ +@@ -62,7 +62,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 -@@ -343,7 +343,7 @@ void LayoutView::UpdateLayout() { +@@ -345,7 +345,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); 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 5af2bc470193..e0f02a6704d4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -409,7 +409,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -413,7 +413,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MAC) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 29c860c35d72..f87e32425587 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 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -284,7 +284,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl +@@ -286,7 +286,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifySinkParameters) { SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index b33946fb9562..676fa5370b72 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2021-04-22 08:29:16 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6035,7 +6035,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid - // TODO(crbug.com/1181993): Even TexImage2D doesn't seem to work reliably with - // the GPU path. - const bool function_supports_gpu_teximage = false; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - // TODO(crbug.com/1181562): TexSubImage2D via the GPU path performs poorly on - // Linux when used with ShMem GpuMemoryBuffer backed frames. We don't have a - // way to differentiate between true texture backed frames and ShMem GMBs, so +@@ -6052,7 +6052,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid + constexpr bool kAllowZeroCopyImages = true; + #endif + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // TODO(crbug.com/1175907): Only TexImage2D seems to work with the GPU path on + // Android M -- appears to work fine on R, but to avoid regressions in <video> + // limit to TexImage2D only for now. Fails conformance test on Nexus 5X: diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index acd1d47043b7..70c18a780b48 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -80,7 +80,7 @@ const char kColorEmojiLocale[] = "und-Zsye"; +@@ -84,7 +84,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -120,7 +120,7 @@ FontCache::FontCache() +@@ -124,7 +124,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 673e7d1a6dab..e709b681c664 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 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2021-05-12 22:06:01 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 -@@ -173,7 +173,7 @@ class PLATFORM_EXPORT FontCache { +@@ -177,7 +177,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_; } -@@ -248,11 +248,11 @@ class PLATFORM_EXPORT FontCache { +@@ -252,11 +252,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -32,7 +32,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -326,12 +326,12 @@ class PLATFORM_EXPORT FontCache { +@@ -330,12 +330,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -47,7 +47,7 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -371,7 +371,7 @@ class PLATFORM_EXPORT FontCache { +@@ -375,7 +375,7 @@ class PLATFORM_EXPORT FontCache { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index d61e41485c27..b4623b2a2170 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -239,7 +239,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -258,7 +258,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc index 5445a26293ce..7c1fa07d4213 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc -@@ -651,7 +651,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) +@@ -668,7 +668,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) HarfBuzzShaper shaper(string); scoped_refptr<ShapeResult> result = ShapeWithParameter(&shaper); EXPECT_EQ(length, result->NumCharacters()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 4cecfdd146dd..9de7722ae0f0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -33,6 +33,6 @@ sk_sp<SkTypeface> typeface; -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (alternate_name == AlternateFontName::kLocalUniqueFace && - RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { - typeface = CreateTypefaceFromUniqueName(creation_params); + bool noto_color_emoji_from_gmscore = false; + #if defined(OS_ANDROID) + // Use the unique local matching pathway for fetching Noto Color Emoji Compat diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 74ad3a138429..0d0ad38e66fc 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2021-04-14 18:41:11 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2021-05-12 22:06:01 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -200,7 +200,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -201,7 +201,7 @@ void VideoFrameSubmitter::OnBeginFrame( if (viz::FrameTokenGT(pair.key, *next_frame_token_)) continue; auto& feedback = pair.value.presentation_feedback; diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c new file mode 100644 index 000000000000..54c0135975b6 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c @@ -0,0 +1,13 @@ +--- third_party/boringssl/src/crypto/refcount_c11.c.orig 2021-06-10 13:07:35 UTC ++++ third_party/boringssl/src/crypto/refcount_c11.c +@@ -24,6 +24,10 @@ + + #include <openssl/type_check.h> + ++#if !defined(__cplusplus) && !defined(static_assert) ++#define static_assert _Static_assert ++#endif ++ + + // See comment above the typedef of CRYPTO_refcount_t about these tests. + static_assert(alignof(CRYPTO_refcount_t) == alignof(_Atomic CRYPTO_refcount_t), diff --git a/www/chromium/files/patch-third__party_dawn_src_common_Platform.h b/www/chromium/files/patch-third__party_dawn_src_common_Platform.h new file mode 100644 index 000000000000..94b318f64a4e --- /dev/null +++ b/www/chromium/files/patch-third__party_dawn_src_common_Platform.h @@ -0,0 +1,14 @@ +--- third_party/dawn/src/common/Platform.h.orig 2021-06-11 10:04:56 UTC ++++ third_party/dawn/src/common/Platform.h +@@ -45,6 +45,11 @@ + # define DAWN_PLATFORM_EMSCRIPTEN 1 + # define DAWN_PLATFORM_POSIX 1 + ++#elif defined(__FreeBSD__) ++# define DAWN_PLATFORM_FREEBSD 1 ++# define DAWN_PLATFORM_LINUX 1 ++# define DAWN_PLATFORM_POSIX 1 ++ + #else + # error "Unsupported platform." + #endif diff --git a/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h new file mode 100644 index 000000000000..d16768208eda --- /dev/null +++ b/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h @@ -0,0 +1,11 @@ +--- third_party/dawn/src/include/dawn_native/VulkanBackend.h.orig 2021-06-11 10:05:54 UTC ++++ third_party/dawn/src/include/dawn_native/VulkanBackend.h +@@ -63,7 +63,7 @@ namespace dawn_native { namespace vulkan { + }; + + // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + + // Common properties of external images represented by FDs. On successful import the file + // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc index 08b3205f15fb..154510d4dfc0 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest.cc.orig 2021-04-14 18:43:03 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2021-05-12 22:13:38 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -117,6 +117,7 @@ +@@ -110,6 +110,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT 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 4457e79192be..bb15676a8e3d 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,4 +1,4 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2021-04-14 18:43:06 UTC +--- third_party/libyuv/include/libyuv/row.h.orig 2021-05-12 22:13:41 UTC +++ third_party/libyuv/include/libyuv/row.h @@ -158,10 +158,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 @@ -15,7 +15,7 @@ #define HAS_RGBCOLORTABLEROW_X86 #define HAS_SOBELROW_SSE2 #define HAS_SOBELTOPLANEROW_SSE2 -@@ -208,7 +212,9 @@ extern "C" { +@@ -209,7 +213,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 -@@ -233,7 +239,9 @@ extern "C" { +@@ -234,7 +240,9 @@ extern "C" { #define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2 diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py index 4f77b2fba511..412d6e7abb98 100644 --- a/www/chromium/files/patch-third__party_node_node.py +++ b/www/chromium/files/patch-third__party_node_node.py @@ -1,7 +1,7 @@ ---- third_party/node/node.py.orig 2021-04-14 18:41:35 UTC +--- third_party/node/node.py.orig 2021-05-12 22:06:44 UTC +++ third_party/node/node.py -@@ -13,6 +13,7 @@ import os - def GetBinaryPath(): +@@ -19,6 +19,7 @@ def GetBinaryPath(): + 'node-darwin-arm64', 'bin', 'node')) return os_path.join(os_path.dirname(__file__), *{ 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), + 'FreeBSD': ('freebsd', 'node-freebsd-x64', 'bin', 'node'), diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp index 70d0d0fd59e8..1f1ecb756eb1 100644 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp @@ -1,6 +1,13 @@ ---- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2021-04-23 14:32:47 UTC +--- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2021-06-09 22:16:18 UTC +++ third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp -@@ -11,6 +11,9 @@ +@@ -6,12 +6,16 @@ + + #include "xfa/fxfa/parser/cxfa_timezoneprovider.h" + ++#include <stdint.h> + #include <stdlib.h> + #include <time.h> + #include "build/build_config.h" static bool g_bProviderTimeZoneSet = false; @@ -8,24 +15,27 @@ +static long g_lTimeZoneOffset = 0; +#endif - CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { #if defined(OS_WIN) -@@ -20,6 +23,18 @@ CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { - } - m_tz.tzHour = static_cast<int8_t>(_timezone / 3600 * -1); - m_tz.tzMinute = static_cast<int8_t>((abs(_timezone) % 3600) / 60); -+#elif defined(OS_BSD) -+ if (!g_bProviderTimeZoneSet) { + #define TIMEZONE _timezone +@@ -24,9 +28,21 @@ static bool g_bProviderTimeZoneSet = false; + CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { + if (!g_bProviderTimeZoneSet) { + g_bProviderTimeZoneSet = true; ++#if defined(OS_BSD) + time_t now = time(nullptr); + struct tm tm = {}; + + localtime_r(&now, &tm); -+ -+ g_bProviderTimeZoneSet = true; + g_lTimeZoneOffset = tm.tm_gmtoff; -+ } -+ m_tz.tzHour = static_cast<int8_t>(g_lTimeZoneOffset / 3600 * -1); -+ m_tz.tzMinute = static_cast<int8_t>((abs(g_lTimeZoneOffset) % 3600) / 60); - #else - if (!g_bProviderTimeZoneSet) { - g_bProviderTimeZoneSet = true; ++#else + TZSET(); ++#endif + } ++#if defined(OS_BSD) ++ tz_minutes_ = static_cast<int8_t>((abs(g_lTimeZoneOffset) % 3600) / 60); ++#else + tz_minutes_ = TIMEZONE / -60; ++#endif + } + + CXFA_TimeZoneProvider::~CXFA_TimeZoneProvider() = default; 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 19f679f606be..dc81a254ffcc 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,4 +1,4 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2021-04-14 18:43:07 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2021-05-12 22:13:43 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc @@ -42,7 +42,8 @@ @@ -10,7 +10,7 @@ #define PERFETTO_HAS_CHMOD #include <sys/stat.h> #endif -@@ -2723,8 +2724,9 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -2743,8 +2744,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 deleted file mode 100644 index b634b6f0351f..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2021-04-14 18:43:09 UTC -+++ third_party/skia/src/sksl/SkSLString.h -@@ -17,6 +17,8 @@ - #include "include/core/SkString.h" - #endif - -+#include <stdarg.h> -+ - namespace SkSL { - - class String; diff --git a/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h b/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h new file mode 100644 index 000000000000..54a471aac141 --- /dev/null +++ b/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h @@ -0,0 +1,11 @@ +--- third_party/vulkan_memory_allocator/src/vk_mem_alloc.h.orig 2021-06-14 13:18:02 UTC ++++ third_party/vulkan_memory_allocator/src/vk_mem_alloc.h +@@ -3946,7 +3946,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) + #include <cstdlib> + + #if defined(__APPLE__) diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index e5ce9c159e61..bb440f7de6f0 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2021-04-14 18:43:11 UTC +--- third_party/webrtc/BUILD.gn.orig 2021-05-12 22:13:47 UTC +++ third_party/webrtc/BUILD.gn -@@ -180,6 +180,9 @@ config("common_inherited_config") { +@@ -181,6 +181,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index c4b4c17df520..4a1a229231e4 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2021-04-14 18:43:12 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2021-05-12 22:13:48 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -244,7 +244,12 @@ AdapterType GetAdapterTypeFromName(const char* network +@@ -245,7 +245,12 @@ AdapterType GetAdapterTypeFromName(const char* network } #endif diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn index 154d7beef05e..5d02de6c03e5 100644 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/zlib/BUILD.gn.orig 2021-04-22 11:59:36.597280000 +0200 -+++ third_party/zlib/BUILD.gn 2021-04-30 13:06:24.267005000 +0200 -@@ -108,6 +108,8 @@ +--- third_party/zlib/BUILD.gn.orig 2021-05-12 22:06:45 UTC ++++ third_party/zlib/BUILD.gn +@@ -108,6 +108,8 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] @@ -9,7 +9,7 @@ } else if (is_linux || is_chromeos) { defines += [ "ARMV8_OS_LINUX" ] } else if (is_mac) { -@@ -385,7 +387,7 @@ +@@ -385,7 +387,7 @@ static_library("minizip") { ] } 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 5df5c53cfc3d..5503c80f21cb 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,8 +1,8 @@ ---- tools/json_schema_compiler/model.py.orig 2021-04-14 18:41:36 UTC +--- tools/json_schema_compiler/model.py.orig 2021-05-12 22:06:45 UTC +++ tools/json_schema_compiler/model.py -@@ -859,7 +859,7 @@ class Platforms(object): +@@ -865,7 +865,7 @@ class Platforms(object): + """ CHROMEOS = _PlatformInfo("chromeos") - CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") LACROS = _PlatformInfo("lacros") - LINUX = _PlatformInfo("linux") + LINUX = _PlatformInfo("bsd") 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 a58cf093e423..2ca0b4e7eccd 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 2021-04-14 18:41:37 UTC +--- ui/aura/test/aura_test_helper.cc.orig 2021-05-12 22:06:46 UTC +++ ui/aura/test/aura_test_helper.cc @@ -30,7 +30,7 @@ #include "ui/wm/core/default_activation_client.h" @@ -9,7 +9,7 @@ #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck #endif -@@ -64,7 +64,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_aura_test_ui__controls__ozone.cc b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc index 00aea395e09c..7593f16b5ce9 100644 --- a/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc +++ b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc @@ -1,6 +1,6 @@ ---- ui/aura/test/ui_controls_ozone.cc.orig 2021-04-14 18:41:37 UTC +--- ui/aura/test/ui_controls_ozone.cc.orig 2021-05-12 22:06:46 UTC +++ ui/aura/test/ui_controls_ozone.cc -@@ -349,7 +349,7 @@ bool UIControlsOzone::ScreenDIPToHostPixels(gfx::Point +@@ -359,7 +359,7 @@ bool UIControlsOzone::ScreenDIPToHostPixels(gfx::Point // To avoid multiple definitions when use_x11 && use_ozone is true, disable this // factory method for OS_LINUX as Linux has a factory method that decides what // UIControls to use based on IsUsingOzonePlatform feature flag. diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc deleted file mode 100644 index 5fac3ee82c2b..000000000000 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/clipboard/clipboard_ozone.cc.orig 2021-04-14 18:41:37 UTC -+++ ui/base/clipboard/clipboard_ozone.cc -@@ -301,7 +301,7 @@ class ClipboardOzone::AsyncClipboardOzone { - // of lacros-chrome is complete. - // 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)) - // Clipboard factory method. - Clipboard* Clipboard::Create() { - // linux-chromeos uses non-backed clipboard by default, but supports ozone x11 diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index e40ab3ebf2f8..5c0defb80bf4 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,15 +1,15 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2021-04-22 08:30:09 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2021-05-12 22:06:46 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -68,7 +68,7 @@ void CursorFactory::ObserveThemeChanges() { - NOTIMPLEMENTED(); - } +@@ -69,7 +69,7 @@ void CursorFactory::ObserveThemeChanges() { + + void CursorFactory::SetDeviceScaleFactor(float scale) {} -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Returns a cursor name compatible with either X11 or the FreeDesktop.org // cursor spec ([1] and [2]), followed by fallbacks that can work as -@@ -185,6 +185,6 @@ std::vector<std::string> CursorNamesFromType(mojom::Cu +@@ -190,6 +190,6 @@ std::vector<std::string> CursorNamesFromType(mojom::Cu return {"left_ptr"}; } diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h index e34e0bd3f2a6..22c3fac0ff59 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,7 +1,7 @@ ---- ui/base/cursor/cursor_factory.h.orig 2021-04-22 08:30:28 UTC +--- ui/base/cursor/cursor_factory.h.orig 2021-05-12 22:06:46 UTC +++ ui/base/cursor/cursor_factory.h -@@ -67,7 +67,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR_BASE) CursorFact - virtual void ObserveThemeChanges(); +@@ -73,7 +73,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR_BASE) CursorFact + virtual void SetDeviceScaleFactor(float scale); }; -#if defined(OS_LINUX) || 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 deleted file mode 100644 index 4647e5ac2020..000000000000 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/dragdrop/os_exchange_data_provider.h.orig 2021-04-14 18:41:37 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 index 53c41bca72c6..7f03e8b0bde4 100644 --- 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 @@ -1,9 +1,9 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2021-04-14 18:41:37 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2021-05-12 22:06:46 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -100,14 +100,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -102,14 +102,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } - bool OSExchangeDataProviderNonBacked::GetString(base::string16* data) const { + bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (HasFile()) { @@ -17,12 +17,3 @@ if ((formats_ & OSExchangeData::STRING) == 0) return false; -@@ -184,7 +184,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 deleted file mode 100644 index f77ceb69d245..000000000000 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.h.orig 2021-04-14 18:41:37 UTC -+++ ui/base/dragdrop/os_exchange_data_provider_non_backed.h -@@ -61,7 +61,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_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 349129bcb8cb..e1aa9a97d0da 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2021-04-14 18:41:37 UTC +--- ui/base/ui_base_features.cc.orig 2021-05-12 22:06:46 UTC +++ ui/base/ui_base_features.cc -@@ -127,7 +127,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -147,7 +147,7 @@ const base::Feature kExperimentalFlingAnimation { "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -160,7 +160,7 @@ const base::Feature kPrecisionTouchpadLogging{ +@@ -180,7 +180,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 = { -@@ -171,7 +171,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -191,7 +191,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; @@ -27,21 +27,12 @@ // defined(OS_CHROMEOS) // Enables forced colors mode for web content. -@@ -205,7 +205,7 @@ bool IsEyeDropperEnabled() { - // crbug.com/1086530 for the Desktop launch bug. - const base::Feature kCSSColorSchemeUARendering = { - "CSSColorSchemeUARendering", --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_APPLE) - base::FEATURE_ENABLED_BY_DEFAULT - #else -@@ -224,7 +224,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", --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_APPLE) - base::FEATURE_ENABLED_BY_DEFAULT +@@ -209,7 +209,7 @@ bool IsForcedColorsEnabled() { + // milestones. + const base::Feature kEyeDropper { + "EyeDropper", +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT #else + base::FEATURE_DISABLED_BY_DEFAULT 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 c0a2016628a5..794a0f0439a0 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 2021-04-14 18:41:37 UTC +--- ui/base/ui_base_features.h.orig 2021-05-12 22:06:46 UTC +++ ui/base/ui_base_features.h -@@ -63,11 +63,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: +@@ -65,11 +65,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_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index d6305894b3bb..42f182b27b96 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 2021-04-14 18:41:39 UTC +--- ui/compositor/compositor.cc.orig 2021-05-12 22:06:46 UTC +++ ui/compositor/compositor.cc -@@ -762,7 +762,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -769,7 +769,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index 1959a9ddfc24..bf9d99e86aed 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2021-04-14 18:41:39 UTC +--- ui/events/event.cc.orig 2021-05-12 22:06:46 UTC +++ ui/events/event.cc -@@ -451,7 +451,7 @@ std::string LocatedEvent::ToString() const { +@@ -450,7 +450,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 16b6dd5702ef..8a0bb21980dc 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 2021-04-14 18:41:39 UTC +--- ui/gfx/BUILD.gn.orig 2021-05-12 22:06:47 UTC +++ ui/gfx/BUILD.gn -@@ -598,7 +598,7 @@ source_set("memory_buffer_sources") { +@@ -603,7 +603,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } 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 c8876baa5a57..41dca6884d4f 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 2021-04-14 18:41:39 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2021-05-12 22:06:47 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 -@@ -112,7 +112,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat +@@ -114,7 +114,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 8b77edf1aac8..953e941ae1a5 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/render_text.cc.orig 2021-05-12 22:06:47 UTC +++ ui/gfx/render_text.cc -@@ -1197,23 +1197,24 @@ void RenderText::SetDisplayOffset(Vector2d offset) { +@@ -1203,23 +1203,24 @@ void RenderText::SetDisplayOffset(Vector2d offset) { const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; @@ -31,7 +31,7 @@ break; default: break; -@@ -1221,7 +1222,7 @@ void RenderText::SetDisplayOffset(Vector2d offset) { +@@ -1227,7 +1228,7 @@ void RenderText::SetDisplayOffset(Vector2d offset) { } const int horizontal_offset = diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 866085129431..c20fd5c934fb 100644 --- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2021-04-14 18:41:39 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2021-05-12 22:06:47 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -388,7 +388,7 @@ void PrintDialogGtk::ShowDialog( +@@ -392,7 +392,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index f6ea97f83a32..22cdbbca04cc 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2021-04-14 18:41:39 UTC +--- ui/native_theme/native_theme.h.orig 2021-05-12 22:06:47 UTC +++ ui/native_theme/native_theme.h -@@ -54,7 +54,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -56,7 +56,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index ddb1611c2b0b..06a133c34395 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2021-04-14 18:41:39 UTC +--- ui/native_theme/native_theme_base.cc.orig 2021-05-12 22:06:47 UTC +++ ui/native_theme/native_theme_base.cc -@@ -257,7 +257,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 a4a9e82e034d..0d3ef96600cf 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-05-12 22:06:47 UTC +++ ui/views/controls/textfield/textfield.cc @@ -72,7 +72,7 @@ @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -673,7 +673,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -725,7 +725,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -727,7 +727,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -881,7 +881,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -883,7 +883,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -45,7 +45,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2261,14 +2261,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2258,14 +2258,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -62,7 +62,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -2360,7 +2360,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2357,7 +2357,7 @@ bool Textfield::PasteSelectionClipboard() { void Textfield::UpdateSelectionClipboard() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 7dc18911c786..d4c0358f0f9d 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2021-05-12 22:06:47 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -51,7 +51,7 @@ constexpr int kVerticalPaddingBottom = 5; +@@ -47,7 +47,7 @@ constexpr int kVerticalPaddingBottom = 5; bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 b5475b04aab4..7cfaeebe1676 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 2021-04-14 18:41:39 UTC +--- ui/views/focus/focus_manager.cc.orig 2021-05-12 22:06:47 UTC +++ ui/views/focus/focus_manager.cc -@@ -624,7 +624,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -628,7 +628,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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 -@@ -641,7 +641,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -645,7 +645,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 1789ac4fe7f2..f574643d08ad 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2021-04-14 18:41:39 UTC +--- ui/views/views_delegate.h.orig 2021-05-12 22:06:47 UTC +++ ui/views/views_delegate.h -@@ -138,7 +138,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -137,7 +137,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index a907628f5f23..7ad29be00c3a 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2021-05-12 22:06:47 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -836,7 +836,7 @@ bool DesktopWindowTreeHostPlatform::ShouldUseLayerForS +@@ -851,7 +851,7 @@ bool DesktopWindowTreeHostPlatform::ShouldUseLayerForS // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc index c1f119303a36..9c67324de548 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,6 +1,6 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2021-05-12 22:06:47 UTC +++ ui/views/widget/native_widget_aura.cc -@@ -68,7 +68,7 @@ +@@ -70,7 +70,7 @@ #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ @@ -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 -@@ -1122,7 +1122,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS +@@ -1124,7 +1124,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); -@@ -1153,14 +1153,14 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1155,7 +1155,7 @@ void Widget::CloseAllSecondaryWidgets() { #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ @@ -27,8 +27,9 @@ DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); #endif } +@@ -1168,7 +1168,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const + } - const ui::NativeTheme* Widget::GetNativeTheme() const { #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ - (defined(OS_LINUX) || defined(OS_CHROMEOS)) + (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index f3c069ce2c9d..da9898743c7f 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 2021-04-14 18:43:14 UTC +--- v8/BUILD.gn.orig 2021-05-12 22:13:52 UTC +++ v8/BUILD.gn -@@ -4438,9 +4438,15 @@ v8_component("v8_libbase") { +@@ -4600,9 +4600,15 @@ v8_component("v8_libbase") { } } @@ -17,7 +17,7 @@ "src/base/platform/platform-linux.cc", ] -@@ -4937,6 +4943,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5097,6 +5103,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 a928b03118a2..df1cc416d2be 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 2021-04-14 18:43:14 UTC +--- v8/src/api/api.cc.orig 2021-05-12 22:13:52 UTC +++ v8/src/api/api.cc -@@ -5694,7 +5694,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5764,7 +5764,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index 5cbbe5e3ec67..06c60e4601f4 100644 --- a/www/chromium/files/patch-v8_src_base_cpu.cc +++ b/www/chromium/files/patch-v8_src_base_cpu.cc @@ -1,6 +1,6 @@ ---- v8/src/base/cpu.cc.orig 2021-04-14 18:43:14 UTC +--- v8/src/base/cpu.cc.orig 2021-05-12 22:13:52 UTC +++ v8/src/base/cpu.cc -@@ -545,6 +545,7 @@ CPU::CPU() +@@ -572,6 +572,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -578,6 +579,7 @@ CPU::CPU() +@@ -605,6 +606,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/chromium/files/patch-v8_src_d8_d8.cc b/www/chromium/files/patch-v8_src_d8_d8.cc index b3e3db1c5ec1..88e45b5e70dc 100644 --- a/www/chromium/files/patch-v8_src_d8_d8.cc +++ b/www/chromium/files/patch-v8_src_d8_d8.cc @@ -1,4 +1,4 @@ ---- v8/src/d8/d8.cc.orig 2021-04-14 18:43:15 UTC +--- v8/src/d8/d8.cc.orig 2021-05-12 22:13:52 UTC +++ v8/src/d8/d8.cc @@ -73,7 +73,7 @@ #include "unicode/locid.h" @@ -27,7 +27,7 @@ v8::Platform* g_default_platform; std::unique_ptr<v8::Platform> g_platform; -@@ -3912,7 +3912,7 @@ bool Shell::SetOptions(int argc, char* argv[]) { +@@ -4099,7 +4099,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; @@ -36,7 +36,7 @@ options.multi_mapped_mock_allocator = i::FLAG_multi_mapped_mock_allocator; #endif -@@ -4544,19 +4544,19 @@ int Shell::Main(int argc, char* argv[]) { +@@ -4735,19 +4735,19 @@ int Shell::Main(int argc, char* argv[]) { memory_limit >= options.mock_arraybuffer_allocator_limit ? memory_limit : std::numeric_limits<size_t>::max()); diff --git a/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc new file mode 100644 index 000000000000..afa1e84e4333 --- /dev/null +++ b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc @@ -0,0 +1,11 @@ +--- v8/src/diagnostics/perf-jit.cc.orig 2021-06-11 10:18:03 UTC ++++ v8/src/diagnostics/perf-jit.cc +@@ -30,7 +30,7 @@ + #include "src/common/assert-scope.h" + + // Only compile the {PerfJitLogger} on Linux. +-#if V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + + #include <fcntl.h> + #include <sys/mman.h> diff --git a/www/chromium/files/patch-v8_src_diagnostics_perf-jit.h b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.h new file mode 100644 index 000000000000..607d499085d0 --- /dev/null +++ b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.h @@ -0,0 +1,11 @@ +--- v8/src/diagnostics/perf-jit.h.orig 2021-06-11 10:18:30 UTC ++++ v8/src/diagnostics/perf-jit.h +@@ -31,7 +31,7 @@ + #include "include/v8config.h" + + // {PerfJitLogger} is only implemented on Linux. +-#if V8_OS_LINUX ++#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) + + #include "src/logging/log.h" + diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 7757d6b1c9fe..0be6797287f9 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 2021-04-14 18:41:39 UTC +--- weblayer/BUILD.gn.orig 2021-05-12 22:06:47 UTC +++ weblayer/BUILD.gn -@@ -720,6 +720,14 @@ source_set("weblayer_lib_base") { +@@ -749,6 +749,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 72bafb06a849..655c2b1c957a 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 2021-04-14 18:41:39 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2021-05-12 22:06:47 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -228,8 +228,8 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -229,8 +229,8 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( void ContentMainDelegateImpl::PreSandboxStartup() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 7197d696dde9..2283f11f3ec6 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 2021-04-14 18:41:39 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2021-05-12 22:06:47 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -75,7 +75,7 @@ +@@ -77,7 +77,7 @@ #endif // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -192,7 +192,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -195,7 +195,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index bbd1ce06d0a0..4f95583060e1 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2021-04-14 18:41:39 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2021-05-12 22:06:47 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -145,7 +145,7 @@ +@@ -147,7 +147,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -470,7 +470,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated +@@ -476,7 +476,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated embedder_support::GetUserAgent()); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); content::GetNetworkService()->SetCryptConfig(std::move(config)); #endif -@@ -946,7 +946,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -966,7 +966,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -27,7 +27,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -980,7 +980,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -1000,7 +1000,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/sandbox_freebsd.cc b/www/chromium/files/sandbox_freebsd.cc new file mode 100644 index 000000000000..87db8e4a4724 --- /dev/null +++ b/www/chromium/files/sandbox_freebsd.cc @@ -0,0 +1,84 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "sandbox/policy/freebsd/sandbox_freebsd.h" + +#include <string> + +#include "base/logging.h" +#include "base/memory/singleton.h" +#include "sandbox/policy/switches.h" + +namespace sandbox { +namespace policy { + +SandboxFreeBSD::SandboxFreeBSD() + : initialize_sandbox_ran_(false) { +} + +SandboxFreeBSD::~SandboxFreeBSD() { +} + +// static +SandboxFreeBSD* SandboxFreeBSD::GetInstance() { + SandboxFreeBSD* instance = base::Singleton<SandboxFreeBSD>::get(); + CHECK(instance); + return instance; +} + +// static +std::string SandboxFreeBSD::GetSandboxTypeInEnglish(SandboxType sandbox_type) { + switch (sandbox_type) { + case SandboxType::kNoSandbox: + return "Unsandboxed"; + case SandboxType::kRenderer: + return "Renderer"; + case SandboxType::kUtility: + return "Utility"; + case SandboxType::kGpu: + return "GPU"; + case SandboxType::kPpapi: + return "PPAPI"; + case SandboxType::kNetwork: + return "Network"; + case SandboxType::kCdm: + return "CDM"; + case SandboxType::kPrintCompositor: + return "Print Compositor"; + case SandboxType::kAudio: + return "Audio"; + case SandboxType::kSpeechRecognition: + return "Speech Recognition"; + case SandboxType::kService: + return "Service"; + case SandboxType::kVideoCapture: + return "Video Capture"; + default: + return "Unknown"; + } +} + +bool SandboxFreeBSD::InitializeSandbox(SandboxType sandbox_type) { + DCHECK(!initialize_sandbox_ran_); + initialize_sandbox_ran_ = true; + + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + + if (command_line->HasSwitch(switches::kNoSandbox)) + return true; + + const std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); + + VLOG(1) << "SandboxFreeBSD::InitializeSandbox: process_type=" + << process_type << " sandbox_type=" << GetSandboxTypeInEnglish(sandbox_type); + + return true; +} + +bool SandboxFreeBSD::IsSandboxed() { + return false; +} + +} // namespace policy +} // namespace sandbox diff --git a/www/chromium/files/sandbox_freebsd.h b/www/chromium/files/sandbox_freebsd.h new file mode 100644 index 000000000000..fffc6262c97f --- /dev/null +++ b/www/chromium/files/sandbox_freebsd.h @@ -0,0 +1,45 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#ifndef SANDBOX_POLICY_FREEBSD_SANDBOX_FREEBSD_H_ +#define SANDBOX_POLICY_FREEBSD_SANDBOX_FREEBSD_H_ + +#include "base/macros.h" +#include "base/memory/singleton.h" +#include "sandbox/policy/export.h" +#include "sandbox/policy/sandbox_type.h" + +namespace sandbox { +namespace policy { + +// A singleton class to represent and change our sandboxing state for the +// capsicum sandbox on FreeBSD. +class SANDBOX_POLICY_EXPORT SandboxFreeBSD { +public: + // Get our singleton instance. + static SandboxFreeBSD* GetInstance(); + + // Get a description for a sandbox type. + static std::string GetSandboxTypeInEnglish(SandboxType sandbox_type); + + // Initializing the Capsicum sandbox. + bool InitializeSandbox(SandboxType sandbox_type); + + // Testing whether the sandbox is enabled. + bool IsSandboxed(); + +private: + friend struct base::DefaultSingletonTraits<SandboxFreeBSD>; + + SandboxFreeBSD(); + ~SandboxFreeBSD(); + + bool initialize_sandbox_ran_; // InitializeSandbox() was called. + + DISALLOW_COPY_AND_ASSIGN(SandboxFreeBSD); +}; + +} // namespace policy +} // namespace sandbox + +#endif // SANDBOX_POLICY_FREBSD_SANDBOX_FREEBSD_H_ diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index b1906eabedd8..0425ed4294f8 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -12,6 +12,8 @@ bin/chrome %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/ar.pak.info +%%DEBUG%%%%DATADIR%%/locales/ar-XB.pak +%%DEBUG%%%%DATADIR%%/locales/ar-XB.pak.info %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bg.pak.info %%DATADIR%%/locales/bn.pak @@ -30,6 +32,8 @@ bin/chrome %%DATADIR%%/locales/en-GB.pak.info %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/en-US.pak.info +%%DEBUG%%%%DATADIR%%/locales/en-XA.pak +%%DEBUG%%%%DATADIR%%/locales/en-XA.pak.info %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es-419.pak.info %%DATADIR%%/locales/es.pak @@ -118,2481 +122,6 @@ bin/chrome %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak -%%DATADIR%%/resources/inspector/Images/accelerometer-back.svg -%%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png -%%DATADIR%%/resources/inspector/Images/accelerometer-front.svg -%%DATADIR%%/resources/inspector/Images/accelerometer-left.png -%%DATADIR%%/resources/inspector/Images/accelerometer-right.png -%%DATADIR%%/resources/inspector/Images/accelerometer-top.png -%%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg -%%DATADIR%%/resources/inspector/Images/checker.png -%%DATADIR%%/resources/inspector/Images/chevrons.svg -%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png -%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png -%%DATADIR%%/resources/inspector/Images/chromeLeft.avif -%%DATADIR%%/resources/inspector/Images/chromeMiddle.avif -%%DATADIR%%/resources/inspector/Images/chromeRight.avif -%%DATADIR%%/resources/inspector/Images/chromeSelect.svg -%%DATADIR%%/resources/inspector/Images/chromeSelectDark.svg -%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.avif -%%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/error_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/flex-nowrap-icon.svg -%%DATADIR%%/resources/inspector/Images/flex-wrap-icon.svg -%%DATADIR%%/resources/inspector/Images/ic_checkmark_16x16.svg -%%DATADIR%%/resources/inspector/Images/ic_delete_filter.svg -%%DATADIR%%/resources/inspector/Images/ic_delete_list.svg -%%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg -%%DATADIR%%/resources/inspector/Images/ic_memory_16x16.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/issue-text-icon.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.avif -%%DATADIR%%/resources/inspector/Images/popoverArrows.png -%%DATADIR%%/resources/inspector/Images/profileGroupIcon.png -%%DATADIR%%/resources/inspector/Images/profileIcon.png -%%DATADIR%%/resources/inspector/Images/profileSmallIcon.png -%%DATADIR%%/resources/inspector/Images/radioDot.png -%%DATADIR%%/resources/inspector/Images/radioDot-dark-theme.png -%%DATADIR%%/resources/inspector/Images/refresh_12x12_icon.svg -%%DATADIR%%/resources/inspector/Images/resizeDiagonal.svg -%%DATADIR%%/resources/inspector/Images/resizeHorizontal.svg -%%DATADIR%%/resources/inspector/Images/resizeVertical.svg -%%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png -%%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png -%%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png -%%DATADIR%%/resources/inspector/Images/resourceJSIcon.png -%%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png -%%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png -%%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.avif -%%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/sources_panel_icon.svg -%%DATADIR%%/resources/inspector/Images/speech.png -%%DATADIR%%/resources/inspector/Images/switcherIcon.svg -%%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png -%%DATADIR%%/resources/inspector/Images/touchCursor.png -%%DATADIR%%/resources/inspector/Images/touchCursor_2x.png -%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg -%%DATADIR%%/resources/inspector/Images/warning_icon.svg -%%DATADIR%%/resources/inspector/Images/whatsnew.avif -%%DATADIR%%/resources/inspector/Tests.js -%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js -%%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js.map -%%DATADIR%%/resources/inspector/accessibility/accessibility-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/accessibility-meta.js.map -%%DATADIR%%/resources/inspector/accessibility/accessibility.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/accessibility.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/SourceOrderView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/SourceOrderView.js.map -%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js -%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner.js -%%DATADIR%%/resources/inspector/animation/animation_module.js -%%DATADIR%%/resources/inspector/animation/animation-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/animation-legacy.js.map -%%DATADIR%%/resources/inspector/animation/animation-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/animation-meta.js.map -%%DATADIR%%/resources/inspector/animation/animation.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/animation.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js -%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js.map -%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js -%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/AppcacheTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/CacheStorageTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/IndexedDBTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ResourcesTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ResourceTreeTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ServiceWorkersTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/StorageTestRunner.js -%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js -%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner.js -%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js -%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/AutomappingTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/BindingsTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/IsolatedFilesystemTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/OverridesTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/PersistenceTestRunner.js -%%DATADIR%%/resources/inspector/bindings/bindings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/bindings.js.map -%%DATADIR%%/resources/inspector/bindings/bindings-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/bindings-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/IgnoreListManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/IgnoreListManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js.map -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js.map -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-meta.js.map -%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CategorizedBreakpointsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CategorizedBreakpointsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CSPViolationBreakpointsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CSPViolationBreakpointsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ModuleUIStrings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ModuleUIStrings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js.map -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js.map -%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/ContrastCheckTrigger.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/ContrastCheckTrigger.js.map -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/MarkdownHelpers.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/MarkdownHelpers.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/SourceFrameIssuesManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/SourceFrameIssuesManager.js.map -%%DATADIR%%/resources/inspector/changes/changes_module.js -%%DATADIR%%/resources/inspector/changes/changes-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/changes-legacy.js.map -%%DATADIR%%/resources/inspector/changes/changes-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/changes-meta.js.map -%%DATADIR%%/resources/inspector/changes/changes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/changes.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js.map -%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js.map -%%DATADIR%%/resources/inspector/cm/cm_module.js -%%DATADIR%%/resources/inspector/cm/cm.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/cm.js.map -%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js -%%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js.map -%%DATADIR%%/resources/inspector/color_picker/color_picker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/color_picker.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/Spectrum.js -%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/Spectrum.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/App.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/App.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/AppProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/AppProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Base64.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Base64.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/CharacterIdMap.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/CharacterIdMap.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Color.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Color.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ColorUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ColorUtils.js.map -%%DATADIR%%/resources/inspector/common/common.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/common.js.map -%%DATADIR%%/resources/inspector/common/common-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/common-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Debouncer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Debouncer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Lazy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Lazy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Progress.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Progress.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/QueryParamHandler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/QueryParamHandler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ResourceType.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/ResourceType.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Revealer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Revealer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/SettingRegistration.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/SettingRegistration.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 -%%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/common/WasmDisassembly.js -%%DEBUG%%%%DATADIR%%/resources/inspector/common/WasmDisassembly.js.map -%%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_helpers.js.map -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/set-css-property.js -%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/set-css-property.js.map -%%DATADIR%%/resources/inspector/components/components.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/components.js.map -%%DATADIR%%/resources/inspector/components/components-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/components-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/components/Linkifier.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/Linkifier.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/components/Reload.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/Reload.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js.map -%%DATADIR%%/resources/inspector/console_counters/console_counters.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/console_counters.js.map -%%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js.map -%%DATADIR%%/resources/inspector/console_counters/console_counters-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/console_counters-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js.map -%%DATADIR%%/resources/inspector/console/console_module.js -%%DATADIR%%/resources/inspector/console/console-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/console-legacy.js.map -%%DATADIR%%/resources/inspector/console/console-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/console-meta.js.map -%%DATADIR%%/resources/inspector/console/console.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/console.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleFilter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleFilter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePinPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePinPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePrompt.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePrompt.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewport.js -%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewport.js.map -%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js -%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner.js -%%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js -%%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js.map -%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js.map -%%DATADIR%%/resources/inspector/coverage/coverage_module.js -%%DATADIR%%/resources/inspector/coverage/coverage-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/coverage-legacy.js.map -%%DATADIR%%/resources/inspector/coverage/coverage-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/coverage-meta.js.map -%%DATADIR%%/resources/inspector/coverage/coverage.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/coverage.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageListView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageListView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.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 -%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner.js -%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js -%%DATADIR%%/resources/inspector/css_overview/css_overview-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/css_overview-meta.js.map -%%DATADIR%%/resources/inspector/css_overview/css_overview.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/css_overview.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js -%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js.map -%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js -%%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js.map -%%DATADIR%%/resources/inspector/data_grid/data_grid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/data_grid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/DataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/DataGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js.map -%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js -%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner.js -%%DATADIR%%/resources/inspector/developer_resources/developer_resources_module.js -%%DATADIR%%/resources/inspector/developer_resources/developer_resources-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/developer_resources-legacy.js.map -%%DATADIR%%/resources/inspector/developer_resources/developer_resources-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/developer_resources-meta.js.map -%%DATADIR%%/resources/inspector/developer_resources/developer_resources.js -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/developer_resources.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js.map -%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js -%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner.js -%%DATADIR%%/resources/inspector/devtools_app.html -%%DATADIR%%/resources/inspector/devtools_app.js -%%DATADIR%%/resources/inspector/devtools_compatibility.js -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js.map -%%DATADIR%%/resources/inspector/diff/diff-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff-legacy.js.map -%%DATADIR%%/resources/inspector/diff/diff.js -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/DiffWrapper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/diff/DiffWrapper.js.map -%%DATADIR%%/resources/inspector/dom_extension/dom_extension.js -%%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/dom_extension.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js -%%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js.map -%%DATADIR%%/resources/inspector/elements/elements_module.js -%%DATADIR%%/resources/inspector/elements/elements-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/elements-legacy.js.map -%%DATADIR%%/resources/inspector/elements/elements-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/elements-meta.js.map -%%DATADIR%%/resources/inspector/elements/elements.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/elements.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityNode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityNode.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTree.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTree.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AdornerManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AdornerManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js -%%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/FlexboxEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/FlexboxEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/FlexboxEditorWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/FlexboxEditorWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPaneUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPaneUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeText.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeText.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertyNameCategories.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertyNameCategories.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js.map -%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js -%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/EditDOMTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/ElementsPanelShadowSelectionOnRefreshTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/ElementsTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/SetOuterHTMLTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/StylesUpdateLinksTestRunner.js -%%DATADIR%%/resources/inspector/emulated_devices/emulated_devices_module.js -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-default-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-default-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-keyboard-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-keyboard-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-navigation-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-navigation-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-default-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-default-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-keyboard-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-keyboard-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-navigation-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-navigation-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-default-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-default-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-keyboard-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-keyboard-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-navigation-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-navigation-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-default-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-default-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-keyboard-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-keyboard-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-navigation-1x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-navigation-2x.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPad-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPad-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone5-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone5-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6Plus-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6Plus-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/MotoG4-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/MotoG4-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus5X-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus5X-portrait.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus6P-landscape.avif -%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus6P-portrait.avif -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js.map -%%DATADIR%%/resources/inspector/emulation/emulation-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/emulation-legacy.js.map -%%DATADIR%%/resources/inspector/emulation/emulation-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/emulation-meta.js.map -%%DATADIR%%/resources/inspector/emulation/emulation.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/emulation.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/LocationsSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/LocationsSettingsTab.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/StructuredHeaders.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/StructuredHeaders.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/UserAgentMetadata.js -%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/UserAgentMetadata.js.map -%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js -%%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js.map -%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js.map -%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js -%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions_test_runner/ExtensionsNetworkTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions_test_runner/ExtensionsTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js.map -%%DATADIR%%/resources/inspector/extensions/extensions-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/extensions-legacy.js.map -%%DATADIR%%/resources/inspector/extensions/extensions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/extensions.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js.map -%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js.map -%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-entrypoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-entrypoint.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterActions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterActions.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js.map -%%DATADIR%%/resources/inspector/formatter/formatter-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/formatter-legacy.js.map -%%DATADIR%%/resources/inspector/formatter/formatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/formatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/ARIAProperties.js -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/ARIAProperties.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/InspectorBackendCommands.js -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/InspectorBackendCommands.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/SupportedCSSProperties.js -%%DEBUG%%%%DATADIR%%/resources/inspector/generated/SupportedCSSProperties.js.map -%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js -%%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js.map -%%DATADIR%%/resources/inspector/har_importer/har_importer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/har_importer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARFormat.js -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARFormat.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARImporter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARImporter.js.map -%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner.js -%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js -%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js.map -%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js.map -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-entrypoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-entrypoint.js.map -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js.map -%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js -%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js.map -%%DATADIR%%/resources/inspector/help/help_module.js -%%DATADIR%%/resources/inspector/help/help-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/help-legacy.js.map -%%DATADIR%%/resources/inspector/help/help-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/help-meta.js.map -%%DATADIR%%/resources/inspector/help/help.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/help.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js.map -%%DATADIR%%/resources/inspector/host/host.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/host.js.map -%%DATADIR%%/resources/inspector/host/host-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/host-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/host/Platform.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/Platform.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/host/ResourceLoader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/ResourceLoader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/host/UserMetrics.js -%%DEBUG%%%%DATADIR%%/resources/inspector/host/UserMetrics.js.map -%%DATADIR%%/resources/inspector/i18n/i18n_locales-tsconfig.json -%%DATADIR%%/resources/inspector/i18n/i18n_test_locales-tsconfig.json -%%DATADIR%%/resources/inspector/i18n/i18n.js -%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18n.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nImpl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nImpl.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nTypes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nTypes.js.map -%%DATADIR%%/resources/inspector/i18n/locales/en-US.json -%%DATADIR%%/resources/inspector/i18n/locales/en-XL.json -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js -%%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/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/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.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUnitConverter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUnitConverter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUtils.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 -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js.map -%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js.map -%%DATADIR%%/resources/inspector/input/input_module.js -%%DATADIR%%/resources/inspector/input/input-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/input/input-legacy.js.map -%%DATADIR%%/resources/inspector/input/input-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/input/input-meta.js.map -%%DATADIR%%/resources/inspector/input/input.js -%%DEBUG%%%%DATADIR%%/resources/inspector/input/input.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js.map -%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js.map -%%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js.map -%%DATADIR%%/resources/inspector/inspector_main/inspector_main-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/inspector_main-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js.map -%%DATADIR%%/resources/inspector/inspector.html -%%DATADIR%%/resources/inspector/inspector.js -%%DATADIR%%/resources/inspector/integration_test_runner.html -%%DATADIR%%/resources/inspector/integration_test_runner.js -%%DATADIR%%/resources/inspector/issues/issues_module.js -%%DATADIR%%/resources/inspector/issues/issues-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/issues-legacy.js.map -%%DATADIR%%/resources/inspector/issues/issues-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/issues-meta.js.map -%%DATADIR%%/resources/inspector/issues/issues.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/issues.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedCookiesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedCookiesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedElementsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedElementsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedElementsWithLowContrastView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedElementsWithLowContrastView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedResourcesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedResourcesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedSharedArrayBufferIssueDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedSharedArrayBufferIssueDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedTrustedWebActivityIssueDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedTrustedWebActivityIssueDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/ComboBoxOfCheckBoxes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/ComboBoxOfCheckBoxes.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CorsIssueDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CorsIssueDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsListView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsListView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js -%%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/IssueView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImage.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImage.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImagesMap.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImagesMap.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLink.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLink.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLinksMap.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLinksMap.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js.map -%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js.map -%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js.map -%%DATADIR%%/resources/inspector/js_app.html -%%DATADIR%%/resources/inspector/js_app.js -%%DATADIR%%/resources/inspector/js_main/js_main.js -%%DEBUG%%%%DATADIR%%/resources/inspector/js_main/js_main.js.map -%%DATADIR%%/resources/inspector/js_main/js_main-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/js_main/js_main-legacy.js.map -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/js_profiler/js_profiler.js.map -%%DATADIR%%/resources/inspector/js_profiler/js_profiler-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/js_profiler/js_profiler-meta.js.map -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js.map -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-meta.js.map -%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js.map -%%DATADIR%%/resources/inspector/layers/layers_module.js -%%DATADIR%%/resources/inspector/layers/layers-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/layers-legacy.js.map -%%DATADIR%%/resources/inspector/layers/layers-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/layers-meta.js.map -%%DATADIR%%/resources/inspector/layers/layers.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/layers.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js.map -%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js -%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner.js -%%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner_module.js -%%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner.js -%%DATADIR%%/resources/inspector/lighthouse_worker.js -%%DATADIR%%/resources/inspector/lighthouse_worker/lighthouse_worker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse_worker/LighthouseService.js -%%DATADIR%%/resources/inspector/lighthouse/lighthouse_module.js -%%DATADIR%%/resources/inspector/lighthouse/lighthouse-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/lighthouse-legacy.js.map -%%DATADIR%%/resources/inspector/lighthouse/lighthouse-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/lighthouse-meta.js.map -%%DATADIR%%/resources/inspector/lighthouse/lighthouse.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/lighthouse.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthousePanel.js -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js -%%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-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector-legacy.js.map -%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector-meta.js.map -%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector.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/LinearMemoryInspectorController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorPane.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/linear_memory_inspector/ValueInterpreterSettings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterSettings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js.map -%%DATADIR%%/resources/inspector/main/main-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/main/main-legacy.js.map -%%DATADIR%%/resources/inspector/main/main-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/main/main-meta.js.map -%%DATADIR%%/resources/inspector/main/main.js -%%DEBUG%%%%DATADIR%%/resources/inspector/main/main.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/main/MainImpl.js -%%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/media/media.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/media.js.map -%%DATADIR%%/resources/inspector/media/media-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/media-legacy.js.map -%%DATADIR%%/resources/inspector/media/media-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/media-meta.js.map -%%DATADIR%%/resources/inspector/media/media_module.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventDisplayTable.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventDisplayTable.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventTimelineView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventTimelineView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerMessagesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerMessagesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerPropertiesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerPropertiesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChart.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChart.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChartHelpers.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChartHelpers.js.map -%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js.map -%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js.map -%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js.map -%%DATADIR%%/resources/inspector/ndb_app.html -%%DATADIR%%/resources/inspector/ndb_app.js -%%DATADIR%%/resources/inspector/network/network_module.js -%%DATADIR%%/resources/inspector/network/network-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/network-legacy.js.map -%%DATADIR%%/resources/inspector/network/network-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/network-meta.js.map -%%DATADIR%%/resources/inspector/network/network.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/network.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/HARWriter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/HARWriter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkConfigView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkConfigView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkItemView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkItemView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkOverview.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkOverview.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestCookiesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestCookiesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHeadersView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHeadersView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHTMLView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHTMLView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestPreviewView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestPreviewView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTrustTokensView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTrustTokensView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js.map -%%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js -%%DATADIR%%/resources/inspector/network_test_runner/network_test_runner.js -%%DATADIR%%/resources/inspector/node_app.html -%%DATADIR%%/resources/inspector/node_app.js -%%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js -%%DATADIR%%/resources/inspector/node_debugger/node_debugger.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_debugger/node_debugger.js.map -%%DATADIR%%/resources/inspector/node_debugger/node_debugger-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_debugger/node_debugger-meta.js.map -%%DATADIR%%/resources/inspector/node_main/node_main-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/node_main-legacy.js.map -%%DATADIR%%/resources/inspector/node_main/node_main-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/node_main-meta.js.map -%%DATADIR%%/resources/inspector/node_main/node_main.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/node_main.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js -%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js.map -%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js -%%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js.map -%%DATADIR%%/resources/inspector/object_ui/object_ui-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/object_ui-meta.js.map -%%DATADIR%%/resources/inspector/object_ui/object_ui.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/object_ui.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js -%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js.map -%%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js -%%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js.map -%%DATADIR%%/resources/inspector/perf_ui/perf_ui-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/perf_ui-meta.js.map -%%DATADIR%%/resources/inspector/perf_ui/perf_ui.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/perf_ui.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js.map -%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js -%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js.map -%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-meta.js.map -%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js.map -%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js -%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineDataTestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineTestRunner.js -%%DATADIR%%/resources/inspector/persistence/persistence.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/persistence.js.map -%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js.map -%%DATADIR%%/resources/inspector/persistence/persistence-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/persistence-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js.map -%%DATADIR%%/resources/inspector/platform/platform.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/platform.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js -%%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/keyboard-utilities.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/keyboard-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 -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/typescript-utilities.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/typescript-utilities.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js -%%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js.map -%%DATADIR%%/resources/inspector/profiler/profiler_module.js -%%DATADIR%%/resources/inspector/profiler/profiler-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/profiler-legacy.js.map -%%DATADIR%%/resources/inspector/profiler/profiler-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/profiler-meta.js.map -%%DATADIR%%/resources/inspector/profiler/profiler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/profiler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ModuleUIStrings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ModuleUIStrings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js.map -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js.map -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-meta.js.map -%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js.map -%%DATADIR%%/resources/inspector/protocol_client/protocol_client-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/protocol_client-legacy.js.map -%%DATADIR%%/resources/inspector/protocol_client/protocol_client.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/protocol_client.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/InspectorBackend.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/InspectorBackend.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/NodeURL.js -%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/NodeURL.js.map -%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js -%%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js.map -%%DATADIR%%/resources/inspector/quick_open/quick_open-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/quick_open-meta.js.map -%%DATADIR%%/resources/inspector/quick_open/quick_open.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/quick_open.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickInput.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickInput.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js -%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js.map -%%DATADIR%%/resources/inspector/recorder/recorder.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/recorder.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/Conditions.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/Conditions.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecorderModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecorderModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingEventHandler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingEventHandler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingFileSystem.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingFileSystem.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingScriptWriter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingScriptWriter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingSession.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingSession.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/Steps.js -%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/Steps.js.map -%%DATADIR%%/resources/inspector/render_coordinator/render_coordinator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/render_coordinator/render_coordinator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/render_coordinator/RenderCoordinator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/render_coordinator/RenderCoordinator.js.map -%%DATADIR%%/resources/inspector/resources/resources_module.js -%%DATADIR%%/resources/inspector/resources/resources-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/resources-legacy.js.map -%%DATADIR%%/resources/inspector/resources/resources-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/resources-meta.js.map -%%DATADIR%%/resources/inspector/resources/resources.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/resources.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelCacheSection.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelCacheSection.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelTreeElement.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelTreeElement.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/CookieItemsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/CookieItemsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/FrameDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/FrameDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/OpenedWindowDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/OpenedWindowDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerUpdateCycleHelper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerUpdateCycleHelper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/TrustTokensView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/resources/TrustTokensView.js.map -%%DATADIR%%/resources/inspector/root/root-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/root/root-legacy.js.map -%%DATADIR%%/resources/inspector/root/root.js -%%DEBUG%%%%DATADIR%%/resources/inspector/root/root.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js -%%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js.map -%%DATADIR%%/resources/inspector/screencast/screencast.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/screencast.js.map -%%DATADIR%%/resources/inspector/screencast/screencast-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/screencast-legacy.js.map -%%DATADIR%%/resources/inspector/screencast/screencast-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/screencast-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js.map -%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js -%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner.js -%%DATADIR%%/resources/inspector/sdk/sdk.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/sdk.js.map -%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js.map -%%DATADIR%%/resources/inspector/sdk/sdk-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/sdk-meta.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/AccessibilityModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/AccessibilityModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModelTypes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModelTypes.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CorsIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CorsIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CrossOriginEmbedderPolicyIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CrossOriginEmbedderPolicyIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSFontFace.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSFontFace.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSProperty.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSProperty.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSPropertyParser.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSPropertyParser.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSRule.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSRule.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/EmulationModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/EmulationModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameAssociated.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameAssociated.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HARLog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HARLog.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeavyAdIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeavyAdIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IOModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IOModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IsolateManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IsolateManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Issue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Issue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LowTextContrastIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LowTextContrastIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/MixedContentIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/MixedContentIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayColorGenerator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayColorGenerator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayPersistentHighlighter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayPersistentHighlighter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SameSiteCookieIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SameSiteCookieIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServerTiming.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServerTiming.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SharedArrayBufferIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SharedArrayBufferIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TrustedWebActivityIssue.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TrustedWebActivityIssue.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js.map -%%DATADIR%%/resources/inspector/search/search_module.js -%%DATADIR%%/resources/inspector/search/search-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/search/search-legacy.js.map -%%DATADIR%%/resources/inspector/search/search.js -%%DEBUG%%%%DATADIR%%/resources/inspector/search/search.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchConfig.js -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchConfig.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchResultsPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchResultsPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js.map -%%DATADIR%%/resources/inspector/security/security_module.js -%%DATADIR%%/resources/inspector/security/security-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/security/security-legacy.js.map -%%DATADIR%%/resources/inspector/security/security-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/security/security-meta.js.map -%%DATADIR%%/resources/inspector/security/security.js -%%DEBUG%%%%DATADIR%%/resources/inspector/security/security.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js.map -%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js -%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner.js -%%DATADIR%%/resources/inspector/settings/settings_module.js -%%DATADIR%%/resources/inspector/settings/settings-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/settings-legacy.js.map -%%DATADIR%%/resources/inspector/settings/settings-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/settings-meta.js.map -%%DATADIR%%/resources/inspector/settings/settings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/settings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkIgnoreListSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkIgnoreListSettingsTab.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js.map -%%DATADIR%%/resources/inspector/shell.js -%%DATADIR%%/resources/inspector/snippets/snippets_module.js -%%DATADIR%%/resources/inspector/snippets/snippets-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/snippets-legacy.js.map -%%DATADIR%%/resources/inspector/snippets/snippets.js -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/snippets.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ModuleUIStrings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ModuleUIStrings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js.map -%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js -%%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js.map -%%DATADIR%%/resources/inspector/source_frame/source_frame-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/source_frame-meta.js.map -%%DATADIR%%/resources/inspector/source_frame/source_frame.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/source_frame.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/FontView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/FontView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ImageView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ImageView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/JSONView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/JSONView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js.map -%%DATADIR%%/resources/inspector/sources/sources_module.js -%%DATADIR%%/resources/inspector/sources/sources-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/sources-legacy.js.map -%%DATADIR%%/resources/inspector/sources/sources-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/sources-meta.js.map -%%DATADIR%%/resources/inspector/sources/sources.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/sources.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CSSPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CSSPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ModuleUIStrings.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ModuleUIStrings.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/NavigatorView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/NavigatorView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/RecorderPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/RecorderPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js -%%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/SnippetsPlugin.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesPanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesPanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js.map -%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js -%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner.js -%%DATADIR%%/resources/inspector/sources_test_runner/AutocompleteTestRunner.js -%%DATADIR%%/resources/inspector/sources_test_runner/DebuggerTestRunner.js -%%DATADIR%%/resources/inspector/sources_test_runner/EditorTestRunner.js -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/startup/startup.js.map -%%DATADIR%%/resources/inspector/test_runner/test_runner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/test_runner.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js -%%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js.map -%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js -%%DATADIR%%/resources/inspector/text_editor/text_editor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/text_editor.js.map -%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/cm_modes.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/cm_modes.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/SyntaxHighlighter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/SyntaxHighlighter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js.map -%%DATADIR%%/resources/inspector/text_utils/text_utils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/text_utils.js.map -%%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/ContentProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/ContentProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/StaticContentProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/StaticContentProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/Text.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/Text.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js.map -%%DATADIR%%/resources/inspector/theme_support/theme_support.js -%%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/acorn-loose-tsconfig.json -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.mjs -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn-tsconfig.json -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs.map -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/axe-core/axe.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/client-variations-tsconfig.json -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/client-variations.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/client-variations.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/ClientVariations.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/ClientVariations.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/codemirror-tsconfig.json -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/comment/comment.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/comment/comment.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/closebrackets.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/closebrackets.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/matchbrackets.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/matchbrackets.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/brace-fold.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/brace-fold.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldcode.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldcode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldgutter.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldgutter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/multiplex.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/multiplex.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/overlay.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/overlay.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/simple.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/simple.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/runmode/runmode-standalone.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/runmode/runmode-standalone.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/active-line.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/active-line.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/mark-selection.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/mark-selection.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/lib/codemirror.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/lib/codemirror.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clike/clike.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clike/clike.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clojure/clojure.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clojure/clojure.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/coffeescript/coffeescript.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/coffeescript/coffeescript.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/css/css.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/css/css.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlembedded/htmlembedded.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlembedded/htmlembedded.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlmixed/htmlmixed.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlmixed/htmlmixed.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/javascript/javascript.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/javascript/javascript.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/jsx/jsx.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/jsx/jsx.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/livescript/livescript.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/livescript/livescript.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/markdown/markdown.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/markdown/markdown.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/php/php.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/php/php.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/python/python.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/python/python.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/shell/shell.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/shell/shell.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/wast/wast.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/wast/wast.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/xml/xml.d.ts -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/xml/xml.js -%%DATADIR%%/resources/inspector/third_party/i18n/bundle-tsconfig.json -%%DATADIR%%/resources/inspector/third_party/i18n/i18n-bundle.d.ts -%%DATADIR%%/resources/inspector/third_party/i18n/i18n-bundle.js -%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-dt-bundle.d.ts -%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-dt-bundle.js -%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-tsconfig.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar-XB.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/bg.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ca.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/cs.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/da.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/de.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/el.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-GB.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-US.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-XA.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-XL.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/es-419.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/es.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fi.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fil.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fr.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/he.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hi.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hr.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hu.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/id.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/it.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ja.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ko.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/lt.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/lv.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/nl.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/no.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pl.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pt-PT.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pt.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ro.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ru.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sk.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sl.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sr-Latn.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sr.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sv.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ta.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/te.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/th.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/tr.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/uk.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/vi.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-HK.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-TW.json -%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh.json -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report-generator.d.ts -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lit-html/lit-html.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/repeat.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/repeat.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/repeat.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/until.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/until.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/until.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.js.map -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.d.ts -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.js -%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.js.map -%%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 -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/marked/marked.js.map -%%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 -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.js -%%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 -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.js -%%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 -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.js -%%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 -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.js -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.d.ts -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.d.ts.map -%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.js -%%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/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/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 -%%DATADIR%%/resources/inspector/third_party/puppeteer/puppeteer-tsconfig.json -%%DATADIR%%/resources/inspector/third_party/puppeteer/puppeteer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/puppeteer/puppeteer.js.map -%%DATADIR%%/resources/inspector/third_party/wasmparser/package/dist/esm/WasmDis.js -%%DATADIR%%/resources/inspector/third_party/wasmparser/package/dist/esm/WasmParser.js -%%DATADIR%%/resources/inspector/third_party/wasmparser/wasmparser-tsconfig.json -%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js -%%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js.map -%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js.map -%%DATADIR%%/resources/inspector/timeline/timeline_module.js -%%DATADIR%%/resources/inspector/timeline/timeline-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/timeline-legacy.js.map -%%DATADIR%%/resources/inspector/timeline/timeline-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/timeline-meta.js.map -%%DATADIR%%/resources/inspector/timeline/timeline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/timeline.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CLSLinkifier.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CLSLinkifier.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js -%%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.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.html -%%DATADIR%%/resources/inspector/toolbox.js -%%DEBUG%%%%DATADIR%%/resources/inspector/toolbox.js.map -%%DATADIR%%/resources/inspector/ui/ui.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ui.js.map -%%DATADIR%%/resources/inspector/ui/ui-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ui-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistration.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistration.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js -%%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/components.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridContextMenuUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridContextMenuUtils.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/DataGridControllerIntegrator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridControllerIntegrator.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/components/Icon.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Icon.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/IconButton.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/IconButton.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Linkifier.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Linkifier.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/LinkifierUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/LinkifierUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/ReportView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/ReportView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/SurveyLink.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/SurveyLink.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/TreeOutline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/TreeOutline.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/TreeOutlineUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/TreeOutlineUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextMenu.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextMenu.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Dialog.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Dialog.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DockController.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DockController.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DropTarget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DropTarget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/EmptyWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/EmptyWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterBar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterBar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Fragment.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Fragment.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Geometry.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Geometry.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/GlassPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/GlassPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/HistoryInput.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/HistoryInput.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Icon.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Icon.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Infobar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Infobar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InplaceEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InplaceEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InspectorView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InspectorView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListControl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListControl.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Panel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Panel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/PopoverHelper.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/PopoverHelper.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ReportView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ReportView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ResizerWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ResizerWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RootView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RootView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SearchableView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SearchableView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SegmentedButton.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SegmentedButton.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SettingsUI.js -%%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/SoftContextMenu.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SplitWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SplitWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SuggestBox.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SuggestBox.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TabbedPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TabbedPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextEditor.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextEditor.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextPrompt.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextPrompt.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Toolbar.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Toolbar.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewRegistration.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewRegistration.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XLink.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XLink.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XWidget.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XWidget.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ZoomManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ZoomManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/append-style.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/append-style.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/utils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/utils.js.map -%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js.map -%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker-entrypoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker-entrypoint.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js -%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js.map -%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js -%%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js.map -%%DATADIR%%/resources/inspector/web_audio/web_audio-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/web_audio-meta.js.map -%%DATADIR%%/resources/inspector/web_audio/web_audio.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/web_audio.js.map -%%DATADIR%%/resources/inspector/webauthn/webauthn-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/webauthn-legacy.js.map -%%DATADIR%%/resources/inspector/webauthn/webauthn-meta.js -%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/webauthn-meta.js.map -%%DATADIR%%/resources/inspector/webauthn/webauthn.js -%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/webauthn.js.map -%%DATADIR%%/resources/inspector/webauthn/webauthn_module.js -%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js -%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/graph_visualizer.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/graph_visualizer.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js -%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js.map -%%DATADIR%%/resources/inspector/worker_app.html -%%DATADIR%%/resources/inspector/worker_app.js -%%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js.map -%%DATADIR%%/resources/inspector/worker_main/worker_main.js -%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/worker_main.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js -%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js.map -%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js -%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js.map -%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/FileManager.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/FileManager.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/UISourceCode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/UISourceCode.js.map -%%DATADIR%%/resources/inspector/workspace/workspace.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/workspace.js.map -%%DATADIR%%/resources/inspector/workspace/workspace-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/workspace-legacy.js.map -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js -%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js.map %%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd %%DATADIR%%/resources/inspector_overlay/main.js %%DATADIR%%/snapshot_blob.bin |