diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-01-16 20:59:10 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-01-16 20:59:10 +0000 |
| commit | b1f54f0fc1fb0cc165a0576e0903efc1ea241ef3 (patch) | |
| tree | de284d6e6fac9a05189b48ba453d2e271bbb5e30 /www/chromium | |
| parent | 0826a2d0170dffbbb73ec07216af1e4ad5dd19c0 (diff) | |
| download | ports-b1f54f0fc1fb0cc165a0576e0903efc1ea241ef3.tar.gz ports-b1f54f0fc1fb0cc165a0576e0903efc1ea241ef3.zip | |
www/chromium: update to 79.0.3945.117
Submitted by: Matthias Wolf via GitHub
Pull requests: 169, 170
MFH: 2019Q2 (browser, security)
Notes
Notes:
svn path=/head/; revision=523259
Diffstat (limited to 'www/chromium')
293 files changed, 2139 insertions, 1490 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 43ccb97d0664..d3c0409630fd 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 78.0.3904.108 -PORTREVISION= 1 -CATEGORIES?= www +PORTVERSION= 79.0.3945.117 +CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -321,15 +320,13 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .if ${BUILDTYPE} == Debug -.for f in libVkLayer_core_validation.so libVkLayer_object_lifetimes.so libVkLayer_stateless_validation.so \ - libVkLayer_thread_safety.so libVkLayer_unique_objects.so - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader diff --git a/www/chromium/distinfo b/www/chromium/distinfo index ad31093d6906..08234ed4c978 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1574329181 -SHA256 (chromium-78.0.3904.108.tar.xz) = f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e -SIZE (chromium-78.0.3904.108.tar.xz) = 742906260 -SHA256 (chromium-78.0.3904.108-testdata.tar.xz) = a46480e2a3b3a1b22e1234e5247d41c69c27e3d498ad9a330abefd6d0066351e -SIZE (chromium-78.0.3904.108-testdata.tar.xz) = 252295600 +TIMESTAMP = 1578472567 +SHA256 (chromium-79.0.3945.117.tar.xz) = 4d960e8bd790cc1c8e7f0632790424957c4996a8a91b9d899eb572acec854ef1 +SIZE (chromium-79.0.3945.117.tar.xz) = 778215364 +SHA256 (chromium-79.0.3945.117-testdata.tar.xz) = f53530e59bfd76bf46e123eb281699e340281990a0e10405d48c2e6cefb7d84e +SIZE (chromium-79.0.3945.117-testdata.tar.xz) = 252398316 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 diff --git a/www/chromium/files/patch-third__party_pdfium_third__party_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 49434303f99e..47510992750c 100644 --- a/www/chromium/files/patch-third__party_pdfium_third__party_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 2019-06-04 18:58:01 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-01-07 21:54:50 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -13,7 +13,7 @@ #if defined(OS_MACOSX) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 953ab5410d68..e9d85073d395 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-10-21 19:06:17 UTC +--- BUILD.gn.orig 2019-12-16 21:51:21 UTC +++ BUILD.gn -@@ -404,7 +404,7 @@ group("gn_all") { +@@ -411,7 +411,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -445,8 +445,6 @@ group("gn_all") { +@@ -452,8 +452,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -501,10 +499,6 @@ group("gn_all") { +@@ -508,10 +506,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", -@@ -560,10 +554,6 @@ group("gn_all") { +@@ -567,10 +561,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -637,7 +627,7 @@ group("gn_all") { +@@ -644,7 +634,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)" ] } -@@ -776,7 +766,6 @@ group("gn_all") { +@@ -782,7 +772,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,7 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -896,7 +885,6 @@ if (is_chromeos) { +@@ -905,7 +894,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -65,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1065,7 +1053,7 @@ if (!is_ios) { +@@ -1076,7 +1064,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1074,7 +1062,7 @@ if (!is_ios) { +@@ -1085,7 +1073,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1216,9 +1204,6 @@ group("chromium_builder_perf") { +@@ -1227,9 +1215,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 877cfe237f3f..26610292091a 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2019-10-21 19:06:18 UTC +--- base/BUILD.gn.orig 2019-12-16 21:51:21 UTC +++ base/BUILD.gn -@@ -1266,7 +1266,7 @@ jumbo_component("base") { +@@ -1274,7 +1274,7 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -9,7 +9,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1292,7 +1292,7 @@ jumbo_component("base") { +@@ -1300,7 +1300,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1893,6 +1893,33 @@ jumbo_component("base") { +@@ -1903,6 +1903,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -3041,6 +3068,12 @@ test("base_unittests") { +@@ -3071,6 +3098,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index c0787c80ba47..3ed565dd5e58 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2019-10-21 19:06:18 UTC +--- base/files/file_util.h.orig 2019-12-16 21:51:21 UTC +++ base/files/file_util.h -@@ -497,7 +497,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -512,7 +512,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 85b725392a0b..21fd7aa86529 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 2019-10-21 19:06:18 UTC +--- base/files/file_util_posix.cc.orig 2019-12-16 21:51:21 UTC +++ base/files/file_util_posix.cc -@@ -426,7 +426,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -435,7 +435,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index ba2c42de3a2d..e2bb4275c2c4 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2019-07-24 18:58:02 UTC +--- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC +++ base/i18n/icu_util.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -285,7 +285,7 @@ bool InitializeICU() { +@@ -365,7 +365,7 @@ bool InitializeICU() { // TODO(jungshik): Some callers do not care about tz at all. If necessary, // add a boolean argument to this function to init'd the default tz only // when requested. diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index c36197ce5d6a..216208c37181 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,6 @@ ---- base/linux_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/linux_util.cc.orig 2019-12-16 21:50:40 UTC +++ base/linux_util.cc -@@ -90,12 +90,14 @@ char g_linux_distro[kDistroSize] = +@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] = "CrOS"; #elif defined(OS_ANDROID) "Android"; @@ -9,6 +9,8 @@ #else // if defined(OS_LINUX) "Unknown"; #endif +@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo + } std::string GetLinuxDistro() { -#if defined(OS_CHROMEOS) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index aebed92f4a2a..2e9496b55220 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2019-10-21 19:06:18 UTC +--- base/logging_unittest.cc.orig 2019-12-16 21:51:21 UTC +++ base/logging_unittest.cc -@@ -590,7 +590,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -591,7 +591,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index d65a9a7748e6..2e871559c90e 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2019-06-04 18:55:15 UTC +--- base/process/kill.h.orig 2019-12-16 21:50:40 UTC +++ base/process/kill.h -@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -118,11 +118,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 52bf9a20881d..48f85cbb38e1 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,15 @@ ---- base/system/sys_info.h.orig 2019-06-04 18:55:15 UTC +--- base/system/sys_info.h.orig 2019-12-16 21:50:40 UTC +++ base/system/sys_info.h -@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo { +@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo { + // See also SysUtils.java, method isLowEndDevice. + static bool IsLowEndDevice(); + ++ static uint64_t MaxSharedMemorySize(); ++ + private: + FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); + FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); +@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index fa7eed94fdeb..12994422dc08 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2019-09-09 21:55:05 UTC +--- base/system/sys_info_freebsd.cc.orig 2019-12-16 21:50:40 UTC +++ base/system/sys_info_freebsd.cc -@@ -13,26 +13,46 @@ +@@ -13,26 +13,59 @@ namespace base { int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -21,11 +21,6 @@ return static_cast<int64_t>(pages) * page_size; } --// static --uint64_t SysInfo::MaxSharedMemorySize() { -- size_t limit; -- size_t size = sizeof(limit); -- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { +int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; + unsigned pgfree, pginact, pgcache; @@ -40,14 +35,13 @@ + if(r == 0) + r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); + if(r == -1) { - NOTREACHED(); - return 0; - } -- return static_cast<uint64_t>(limit); ++ NOTREACHED(); ++ return 0; ++ } + return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); - } - -+// static ++} ++ + // static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; @@ -56,4 +50,18 @@ + return name; + return std::string(); +} ++ ++// static + uint64_t SysInfo::MaxSharedMemorySize() { + size_t limit; + size_t size = sizeof(limit); ++ + if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { + NOTREACHED(); + return 0; + } ++ + return static_cast<uint64_t>(limit); + } +- } // namespace base diff --git a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc index 4a18a5c14a76..60cb0527b5f4 100644 --- a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc +++ b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc @@ -1,14 +1,6 @@ ---- base/test/generate_fontconfig_caches.cc.orig 2019-04-30 22:22:28 UTC +--- base/test/generate_fontconfig_caches.cc.orig 2019-12-16 21:51:21 UTC +++ base/test/generate_fontconfig_caches.cc -@@ -52,14 +52,21 @@ int main() { - - // Delete directory before generating fontconfig caches. This will notify - // future fontconfig_caches changes. -- CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); - -+ CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); - base::SetUpFontconfig(); - FcInit(); +@@ -59,7 +59,14 @@ int main() { FcFini(); // Check existence of intended fontconfig cache file. diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index d5d823c37bf0..bdafc95fd2e2 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2019-04-30 22:22:28 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2019-12-16 21:50:40 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> @@ -8,7 +8,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/run_loop.h" -@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() { +@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() { return !!thread_task_runner_tls.Pointer()->Get(); } @@ -16,7 +16,7 @@ // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { -@@ -81,6 +83,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo +@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo base::Unretained(ttrh->task_runner_.get()), std::move(no_running_during_override))); } 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 81d85a46f061..04dd6804af30 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2019-04-30 22:22:28 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2019-12-16 21:50:40 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ @@ -18,4 +18,4 @@ + allocated_objects_size = 0; #else struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); + #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 52da08e5ffe6..41002edd2371 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2019-10-21 19:06:18 UTC +--- build/config/compiler/BUILD.gn.orig 2019-12-16 21:51:21 UTC +++ build/config/compiler/BUILD.gn @@ -57,7 +57,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -288,7 +288,7 @@ config("compiler") { +@@ -303,7 +303,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && @@ -18,7 +18,7 @@ # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -383,7 +383,7 @@ config("compiler") { +@@ -398,7 +398,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", -@@ -483,7 +483,7 @@ config("compiler") { +@@ -498,7 +498,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -753,7 +753,7 @@ config("compiler_cpu_abi") { +@@ -768,7 +768,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1104,7 +1104,7 @@ config("compiler_deterministic") { +@@ -1119,7 +1119,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1493,7 +1493,7 @@ config("default_warnings") { +@@ -1508,7 +1508,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1722,7 +1722,7 @@ config("thin_archive") { +@@ -1738,7 +1738,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2292,7 +2292,7 @@ config("symbols") { +@@ -2328,7 +2328,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -81,7 +81,7 @@ } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2313,7 +2313,7 @@ config("symbols") { +@@ -2349,7 +2349,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 80858f1f0186..2932f32e2735 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 2019-10-21 19:06:18 UTC +--- build/config/compiler/compiler.gni.orig 2019-12-16 21:51:21 UTC +++ build/config/compiler/compiler.gni -@@ -188,7 +188,7 @@ declare_args() { +@@ -192,7 +192,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index b1369bb13ce9..459701a62f7c 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 2019-10-21 19:06:18 UTC +--- cc/BUILD.gn.orig 2019-12-16 21:51:21 UTC +++ cc/BUILD.gn -@@ -572,7 +572,7 @@ cc_test_static_library("test_support") { +@@ -576,7 +576,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers", ] -@@ -776,9 +776,6 @@ cc_test("cc_unittests") { +@@ -780,9 +780,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 2b91b797f84d..b412aea9e22b 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-03-11 22:00:52 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-12-16 21:50:40 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -218,8 +218,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect +@@ -220,8 +220,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index cce0a37e64b1..964f01205195 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2019-10-21 19:06:18 UTC +--- cc/trees/property_tree.cc.orig 2019-12-16 21:51:22 UTC +++ cc/trees/property_tree.cc -@@ -1278,13 +1278,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc index 3ed8f344098e..56e50fb9ce10 100644 --- a/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc +++ b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc @@ -1,20 +1,20 @@ ---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-10-21 19:06:19 UTC +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-12-16 21:51:22 UTC +++ chrome/app/chrome_content_browser_overlay_manifest.cc -@@ -69,7 +69,7 @@ - #include "chrome/services/app_service/public/cpp/manifest.h" +@@ -70,7 +70,7 @@ + #include "chrome/browser/ui/webui/app_management/app_management.mojom.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -205,7 +205,7 @@ const service_manager::Manifest& GetChromeContentBrows + #endif +@@ -189,7 +189,7 @@ const service_manager::Manifest& GetChromeContentBrows #else app_management::mojom::PageHandlerFactory, #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - mojom::DiscardsDetailsProvider, - performance_manager::mojom::WebUIGraphDump, + discards::mojom::DetailsProvider, discards::mojom::GraphDump, + #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 0f03350e9afd..4b250bdbea33 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-10-21 19:06:19 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-12-16 21:51:22 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -99,7 +99,7 @@ +@@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -137,7 +137,7 @@ +@@ -139,7 +139,7 @@ #include "v8/include/v8.h" #endif @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -240,7 +240,7 @@ bool UseHooks() { +@@ -243,7 +243,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -302,13 +302,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -43,7 +43,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -52,7 +52,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -357,7 +357,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -61,7 +61,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -411,7 +411,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -70,7 +70,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -423,7 +423,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -79,7 +79,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { +@@ -480,7 +480,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); @@ -88,7 +88,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -665,7 +665,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -97,7 +97,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -689,7 +689,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -106,7 +106,7 @@ nacl::RegisterPathProvider(); #endif -@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -883,7 +883,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -115,7 +115,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1007,7 +1007,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -124,8 +124,8 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - breakpad::InitCrashReporter(process_type); +@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + } #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) @@ -133,7 +133,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1021,7 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1038,7 +1038,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 394dcc66449e..a5e8a2717ec6 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2019-10-21 19:06:20 UTC +--- chrome/app/chromium_strings.grd.orig 2019-12-16 21:51:22 UTC +++ chrome/app/chromium_strings.grd -@@ -694,7 +694,7 @@ Signing in anyway will merge Chromium information like +@@ -602,7 +602,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> -@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like +@@ -713,7 +713,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. </message> -@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like +@@ -946,7 +946,7 @@ Chromium is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 86b72ec17785..66a7e38b85c7 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 2019-10-21 19:06:20 UTC +--- chrome/app/generated_resources.grd.orig 2019-12-16 21:51:22 UTC +++ chrome/app/generated_resources.grd -@@ -4885,7 +4885,7 @@ Keep your key file in a safe place. You will need it t +@@ -4922,7 +4922,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> -@@ -6514,7 +6514,7 @@ the Bookmarks menu."> +@@ -6571,7 +6571,7 @@ the Bookmarks menu."> Google Pay </message> @@ -18,7 +18,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -7395,7 +7395,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7521,7 +7521,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 33f8908cc5e9..2046e48956e6 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-10-21 19:06:20 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-12-16 21:51:22 UTC +++ chrome/app/google_chrome_strings.grd -@@ -706,7 +706,7 @@ Signing in anyway will merge Chrome information like b +@@ -614,7 +614,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> -@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b +@@ -725,7 +725,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b +@@ -965,7 +965,7 @@ Google Chrome is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 120c2acf172b..edbc733d54a0 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 2019-10-21 19:06:20 UTC +--- chrome/app/settings_strings.grdp.orig 2019-12-16 21:51:23 UTC +++ chrome/app/settings_strings.grdp -@@ -757,7 +757,7 @@ +@@ -760,7 +760,7 @@ Themes </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -771,7 +771,7 @@ +@@ -774,7 +774,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index e800ee111a39..ed5d7f413cf4 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 2019-10-21 19:06:20 UTC +--- chrome/browser/about_flags.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/about_flags.cc -@@ -162,7 +162,7 @@ +@@ -164,7 +164,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation +@@ -715,7 +715,7 @@ const FeatureEntry::FeatureVariation nullptr}}; #endif // OS_ANDROID @@ -18,7 +18,7 @@ const FeatureEntry::FeatureParam kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { {autofill::features:: -@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation +@@ -762,7 +762,7 @@ const FeatureEntry::FeatureVariation kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), nullptr}, }; @@ -27,7 +27,7 @@ const FeatureEntry::Choice kMemlogModeChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, -@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -815,7 +815,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -36,16 +36,16 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -854,7 +854,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP +@@ -853,7 +853,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP base::size(kOmniboxDocumentProviderClientScoring), nullptr}, {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring, base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}}; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamNTPOmnibox[] = { - {"ZeroSuggestVariant:7:*", ZeroSuggestProvider::kRemoteNoUrlVariant}}; -@@ -932,7 +932,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + #ifdef OS_ANDROID + const FeatureEntry::FeatureParam kOmniboxNTPZPSLocal[] = { +@@ -967,7 +967,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), nullptr}}; @@ -54,7 +54,7 @@ defined(OS_CHROMEOS) const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; -@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU +@@ -983,7 +983,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}, {"Button_GM2", kTranslateBubbleUIButtonGM2, base::size(kTranslateBubbleUIButton), nullptr}}; @@ -63,7 +63,7 @@ const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { {security_state::features::kMarkHttpAsFeatureParameterName, -@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1913,13 +1913,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -79,7 +79,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1971,14 +1971,14 @@ const FeatureEntry kFeatureEntries[] = { "OverrideTranslateTriggerInIndia")}, #endif // OS_ANDROID @@ -96,7 +96,7 @@ #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) {"enable-native-notifications", -@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2044,7 +2044,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCrostiniBackupDescription, kOsCrOS, FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)}, #endif // OS_CHROMEOS @@ -105,7 +105,7 @@ {"terminal-system-app", flag_descriptions::kTerminalSystemAppName, flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(features::kTerminalSystemApp)}, -@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2053,7 +2053,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, #endif // BUILDFLAG(USE_TCMALLOC) @@ -114,31 +114,16 @@ #if defined(OS_ANDROID) {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2075,7 +2075,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - previews::features::kHTTPSServerPreviewsUsingURLLoader)}, +@@ -2131,7 +2131,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, #endif // OS_ANDROID -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2427,12 +2427,12 @@ const FeatureEntry kFeatureEntries[] = { - "AndroidNightMode")}, - #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) - #endif // OS_ANDROID --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - {"enable-dbus-and-x11-status-icons", - flag_descriptions::kEnableDbusAndX11StatusIconsName, - flag_descriptions::kEnableDbusAndX11StatusIconsDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kEnableDbusAndX11StatusIcons)}, --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - {"enable-experimental-accessibility-features", - flag_descriptions::kExperimentalAccessibilityFeaturesName, - flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2810,7 +2810,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, @@ -147,16 +132,16 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2806,7 +2806,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kDocumentProvider, - kOmniboxDocumentProviderVariations, - "OmniboxBundledExperimentV1")}, +@@ -2850,7 +2850,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxAutocompleteTitlesName, + flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3026,13 +3026,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3084,13 +3084,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -172,25 +157,7 @@ #if !defined(OS_ANDROID) {"chrome-colors", flag_descriptions::kChromeColorsName, -@@ -3729,7 +3729,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(kClickToCallReceiver)}, - #endif // defined(OS_ANDROID) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - {"click-to-call-context-menu-selected-text", - flag_descriptions::kClickToCallContextMenuForSelectedTextName, -@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { - {"click-to-call-ui", flag_descriptions::kClickToCallUIName, - flag_descriptions::kClickToCallUIDescription, kOsDesktop, - FEATURE_VALUE_TYPE(kClickToCallUI)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) - - {"shared-clipboard-receiver", -@@ -3859,13 +3859,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3889,13 +3889,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -206,7 +173,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4245,7 +4245,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4269,7 +4269,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, @@ -215,7 +182,7 @@ {"enable-autofill-save-credit-card-uses-improved-messaging", flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, flag_descriptions:: -@@ -4255,7 +4255,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4279,7 +4279,7 @@ const FeatureEntry kFeatureEntries[] = { autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, kAutofillSaveCreditCardUsesImprovedMessagingVariations, "AutofillSaveCreditCardUsesImprovedMessaging")}, @@ -224,7 +191,7 @@ #if defined(OS_CHROMEOS) {"release-notes", flag_descriptions::kReleaseNotesName, -@@ -4337,12 +4337,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4367,12 +4367,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -239,9 +206,9 @@ #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) {"win-use-native-spellchecker", -@@ -4355,12 +4355,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4385,12 +4385,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSafetyTipDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kSafetyTipUI)}, + FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -254,9 +221,9 @@ #if defined(OS_CHROMEOS) {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName, -@@ -4484,12 +4484,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kBundledHTTPExchangesDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kBundledHTTPExchanges)}, +@@ -4526,12 +4526,12 @@ const FeatureEntry kFeatureEntries[] = { + chrome::android::kDarkenWebsitesCheckboxInThemesSetting)}, + #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -269,8 +236,8 @@ {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName, flag_descriptions::kPasswordLeakDetectionDescription, kOsAll, -@@ -4543,11 +4543,11 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)}, +@@ -4605,11 +4605,11 @@ const FeatureEntry kFeatureEntries[] = { + content_settings::kImprovedCookieControlsForThirdPartyCookieBlocking)}, #endif // !defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -281,5 +248,5 @@ -#endif // OS_WIN || OS_MACOSX || OS_LINUX +#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) - #if defined(OS_ANDROID) - {"enable-clipboard-provider-text-suggestions", + #if !defined(OS_ANDROID) + {"accessibility-internals-page-improvements", 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 20f0448c3605..e4818a5553b8 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-07-24 18:58:07 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #endif @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -126,7 +126,7 @@ void SetBrowserStartupIsComplete() { +@@ -127,7 +127,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -135,7 +135,7 @@ void SetBrowserStartupIsComplete() { +@@ -136,7 +136,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index a45e85ca8f23..788d611f2e52 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 2019-10-21 19:06:20 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -769,7 +769,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -770,7 +770,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 0fb0f6eee284..31247a292c60 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,18 +1,18 @@ ---- chrome/browser/browser_resources.grd.orig 2019-10-21 19:06:20 UTC +--- chrome/browser/browser_resources.grd.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/browser_resources.grd -@@ -106,7 +106,7 @@ +@@ -108,7 +108,7 @@ + <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_HTML" file="resources\discards\sorted_table_behavior.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" /> - <include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\performance_manager\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> </if> - <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> + <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> - <include name="IDR_BROWSER_SWITCH_APP_HTML" file="resources\browser_switch\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_APP_JS" file="resources\browser_switch\app.js" compress="gzip" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_PROXY_HTML" file="resources\browser_switch\browser_switch_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> -@@ -561,7 +561,7 @@ + <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> +@@ -550,7 +550,7 @@ <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" /> </if> - <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" /> + <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" compress="gzip" /> - <if expr="is_android or is_linux"> + <if expr="is_android or is_posix"> <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> 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 6edbb34ca415..12d22ab45985 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-10-21 19:06:20 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -222,9 +222,9 @@ +@@ -220,9 +220,9 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -12,7 +12,7 @@ #if defined(OS_LINUX) #include "components/crash/content/app/breakpad_linux.h" -@@ -261,7 +261,7 @@ +@@ -260,7 +260,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif -@@ -1075,7 +1075,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1071,7 +1071,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,7 +30,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1084,14 +1084,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1080,7 +1080,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -39,16 +39,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - // Set the product channel for crash reports. - breakpad::SetChannelCrashKey(chrome::GetChannelName()); --#endif // defined(OS_LINUX) || defined(OS_OPENBSD) -+#endif // defined(OS_LINUX) - - #if defined(OS_MACOSX) - // Get the Keychain API to register for distributed notifications on the main -@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1119,7 +1119,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -57,7 +48,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1280,6 +1280,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1274,6 +1274,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -65,7 +56,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1288,6 +1289,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1282,6 +1283,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 95d1e7c3d996..f7f343f3e0b5 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,12 +1,14 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-10-21 19:06:20 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -81,14 +81,16 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); +#if !defined(OS_BSD) - g_browser_process->metrics_service()->RecordBreakpadRegistration( - breakpad::IsCrashReporterEnabled()); + bool enabled = (crash_reporter::IsCrashpadEnabled() && + crash_reporter::GetUploadsEnabled()) || + breakpad::IsCrashReporterEnabled(); + g_browser_process->metrics_service()->RecordBreakpadRegistration(enabled); +#endif } @@ -16,7 +18,7 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { 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 af0d2171ff2c..99be75239cb2 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 2019-10-21 19:06:20 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -403,7 +403,7 @@ +@@ -388,7 +388,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,16 +9,16 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -459,7 +459,7 @@ +@@ -442,7 +442,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" + #include "services/service_manager/sandbox/features.h" #endif - -@@ -485,7 +485,7 @@ +@@ -475,7 +475,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #if defined(USE_X11) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" #else -@@ -1199,7 +1199,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1193,7 +1193,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -36,7 +36,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1225,7 +1225,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1219,7 +1219,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -45,7 +45,7 @@ #if defined(USE_X11) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else -@@ -2028,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -1955,7 +1955,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2266,7 +2266,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2212,7 +2212,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -63,7 +63,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(service_manager::switches::kNoSandbox)) { -@@ -3574,7 +3574,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3526,7 +3526,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -72,12 +72,30 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4244,7 +4244,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -3666,7 +3666,7 @@ void ChromeContentBrowserClient::BindCredentialManager + } + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { + const base::Value* audio_sandbox_enabled_policy_value = + policies.GetValue(policy::key::kAudioSandboxEnabled); +@@ -3684,7 +3684,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& + + void ChromeContentBrowserClient::WillStartServiceManager() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (startup_data_) { + auto* chrome_feature_list_creator = + startup_data_->chrome_feature_list_creator(); +@@ -3977,7 +3977,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle = - browser_switcher::BrowserSwitcherNavigationThrottle :: - MaybeCreateThrottleFor(handle); + MaybeAddThrottle(&throttles, + browser_switcher::BrowserSwitcherNavigationThrottle:: + MaybeCreateThrottleFor(handle)); 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 59c9ef5ef94d..fd7e02e82e91 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 2019-10-21 19:06:20 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -360,12 +360,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -367,12 +367,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 new file mode 100644 index 000000000000..740824d61e61 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -0,0 +1,11 @@ +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2019-12-31 13:55:02 UTC ++++ chrome/browser/crash_upload_list/crash_upload_list.cc +@@ -38,7 +38,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 + // to log uploads in CrashUploadList::kReporterLogFilename. +-#if !defined(OS_CHROMEOS) ++#if !defined(OS_CHROMEOS) && !defined(OS_BSD) + if (crash_reporter::IsCrashpadEnabled()) { + return new CrashUploadListCrashpad(); + } diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc new file mode 100644 index 000000000000..0f0d4137c678 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc @@ -0,0 +1,31 @@ +--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2019-12-31 13:56:21 UTC ++++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc +@@ -42,6 +42,9 @@ CrashUploadListCrashpad::CrashUploadListCrashpad() = d + CrashUploadListCrashpad::~CrashUploadListCrashpad() = default; + + std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { ++#if defined(OS_BSD) ++ return std::vector<UploadInfo>(); ++#else + std::vector<crash_reporter::Report> reports; + crash_reporter::GetReports(&reports); + +@@ -53,13 +56,18 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra + ReportUploadStateToUploadInfoState(report.state))); + } + return uploads; ++#endif + } + + void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, + const base::Time& end) { ++#if !defined(OS_BSD) + crash_reporter::ClearReportsBetween(begin, end); ++#endif + } + + void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { ++#if !defined(OS_BSD) + crash_reporter::RequestSingleCrashUpload(local_id); ++#endif + } 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 7dc4b2023401..5239eb469044 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-10-21 19:06:21 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1257,7 +1257,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1234,7 +1234,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 -@@ -1287,7 +1287,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1258,7 +1258,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 1eaffe80ffc5..7de89e40fd17 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/download/download_commands.cc -@@ -30,7 +30,7 @@ +@@ -26,7 +26,7 @@ #include "net/base/url_util.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -153,7 +153,7 @@ void DownloadCommands::ExecuteCommand(Command command) model_->ExecuteCommand(this, command); } @@ -18,7 +18,7 @@ Browser* DownloadCommands::GetBrowser() const { chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); -@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -176,12 +176,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 1681ddb94d94..ffe9bb008817 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-10-21 19:06:21 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/download/download_item_model.cc -@@ -565,7 +565,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -575,7 +575,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -602,7 +602,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -612,7 +612,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index ed5d480faee3..8e3008c87a4b 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/download/download_prefs.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/download/download_prefs.cc -@@ -62,7 +62,7 @@ namespace { +@@ -63,7 +63,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -159,7 +159,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -257,7 +257,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -261,7 +261,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) -@@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -358,7 +358,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -372,7 +372,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( +@@ -409,7 +409,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -54,7 +54,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -430,7 +430,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { 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 a806727be63b..55f27856eb04 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 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -135,7 +135,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc deleted file mode 100644 index 4324a56b1770..000000000000 --- a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/download/download_status_updater.cc -@@ -13,7 +13,7 @@ - #include "base/memory/ptr_util.h" - #include "build/build_config.h" - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(content: - #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) - void DownloadStatusUpdater::UpdateAppIconDownloadProgress( - download::DownloadItem* download) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - const views::LinuxUI* linux_ui = views::LinuxUI::instance(); - if (linux_ui) { - float progress = 0; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 75e55d39526b..e3e7004b917b 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 2019-10-21 19:06:21 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1128,6 +1128,12 @@ jumbo_static_library("extensions") { +@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 55676a0c8e95..9d31ad4054df 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-10-21 19:06:21 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -54,7 +54,11 @@ +@@ -47,7 +47,11 @@ #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" 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 ba20982835bf..81d5e9bfa8ed 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 2019-10-21 19:06:21 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -155,7 +155,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -159,7 +159,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -165,7 +165,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 47f764d96b5f..80dc1b275f67 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,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -765,7 +765,7 @@ void ExternalProviderImpl::CreateExternalProviders( - chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); - provider_list->push_back(std::move(demo_apps_provider)); +@@ -762,7 +762,7 @@ void ExternalProviderImpl::CreateExternalProviders( } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - provider_list->push_back(std::make_unique<ExternalProviderImpl>( - service, - base::MakeRefCounted<ExternalPrefLoader>( -@@ -793,7 +793,7 @@ void ExternalProviderImpl::CreateExternalProviders( - bundled_extension_creation_flags)); - - // Define a per-user source of external extensions. --#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) + #endif + if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( +@@ -789,7 +789,7 @@ void ExternalProviderImpl::CreateExternalProviders( + bundled_extension_creation_flags)); + + // Define a per-user source of external extensions. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) ++#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) + provider_list->push_back(std::make_unique<ExternalProviderImpl>( + service, + base::MakeRefCounted<ExternalPrefLoader>( diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 5220c25e4fb8..b04e66e5c06d 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 2019-10-21 19:06:22 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3632,7 +3632,7 @@ const char kZeroStateFilesDescription[] = +@@ -3744,7 +3744,7 @@ const char kZeroStateFilesDescription[] = #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ const char kTerminalSystemAppName[] = "Terminal System App"; const char kTerminalSystemAppDescription[] = "Enables the Terminal System App at chrome://terminal which is used for " -@@ -3645,7 +3645,7 @@ const char kDynamicTcmallocDescription[] = +@@ -3757,7 +3757,7 @@ const char kDynamicTcmallocDescription[] = "utilization."; #endif // BUILDFLAG(USE_TCMALLOC) @@ -18,7 +18,7 @@ // All views-based platforms -------------------------------------------------- -@@ -3670,15 +3670,15 @@ const char kReopenTabInProductHelpDescription[] = +@@ -3782,13 +3782,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -32,25 +32,18 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - const char kClickToCallContextMenuForSelectedTextName[] = -@@ -3693,10 +3693,10 @@ const char kClickToCallUIDescription[] = - "Enables click to call feature signals to be handled on desktop by showing " - "a list of user's available devices with telephony functionality."; +@@ -3806,7 +3806,7 @@ const char kClickToCallUIDescription[] = --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = -@@ -3715,7 +3715,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa +@@ -3825,7 +3825,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa const char kSyncClipboardServiceDescription[] = "Enables clipboard syncing via Chrome Sync."; @@ -59,21 +52,3 @@ #if defined(OS_MACOSX) || defined(OS_CHROMEOS) -@@ -3825,7 +3825,7 @@ extern const char kWebrtcPipeWireCapturerDescription[] - - #endif // #if defined(WEBRTC_USE_PIPEWIRE) - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - const char kEnableDbusAndX11StatusIconsName[] = - "Enable DBus and X11 status icons"; -@@ -3834,7 +3834,7 @@ const char kEnableDbusAndX11StatusIconsDescription[] = - "(X11) implementations of status icons. Otherwise, uses libappindicator's " - "and GTK's implementations."; - --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - const char kAvoidFlashBetweenNavigationName[] = - "Enable flash avoidance between same-origin navigations"; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 4b0b0009c362..fb1dfbd1f648 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,4 +1,4 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/flag_descriptions.h @@ -20,9 +20,9 @@ #include "ui/android/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2178,7 +2178,7 @@ extern const char kZeroStateFilesDescription[]; +@@ -2233,7 +2233,7 @@ extern const char kZeroStateFilesDescription[]; #endif // #if defined(OS_CHROMEOS) @@ -21,7 +21,7 @@ extern const char kTerminalSystemAppName[]; extern const char kTerminalSystemAppDescription[]; -@@ -2187,7 +2187,7 @@ extern const char kDynamicTcmallocName[]; +@@ -2242,7 +2242,7 @@ extern const char kDynamicTcmallocName[]; extern const char kDynamicTcmallocDescription[]; #endif // BUILDFLAG(USE_TCMALLOC) @@ -30,7 +30,7 @@ // All views-based platforms -------------------------------------------------- -@@ -2206,14 +2206,14 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2261,12 +2261,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -43,25 +43,18 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - extern const char kClickToCallContextMenuForSelectedTextName[]; -@@ -2222,10 +2222,10 @@ extern const char kClickToCallContextMenuForSelectedTe - extern const char kClickToCallUIName[]; - extern const char kClickToCallUIDescription[]; +@@ -2278,7 +2278,7 @@ extern const char kClickToCallUIDescription[]; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; -@@ -2239,7 +2239,7 @@ extern const char kProfileMenuRevampDescription[]; +@@ -2292,7 +2292,7 @@ extern const char kProfileMenuRevampDescription[]; extern const char kSyncClipboardServiceName[]; extern const char kSyncClipboardServiceDescription[]; @@ -70,18 +63,3 @@ #if defined(OS_MACOSX) || defined(OS_CHROMEOS) -@@ -2330,12 +2330,12 @@ extern const char kWebrtcPipeWireCapturerDescription[] - - #endif // #if defined(WEBRTC_USE_PIPEWIRE) - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - extern const char kEnableDbusAndX11StatusIconsName[]; - extern const char kEnableDbusAndX11StatusIconsDescription[]; - --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - // ============================================================================ - // Don't just add flags to the end, put them in the right section in diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 08060b059bc0..8c298588e542 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -36,7 +36,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / +@@ -37,7 +37,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / const char kProduct[] = "Chrome"; #elif defined(OS_MACOSX) const char kProduct[] = "Chrome_Mac"; diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index d77194a37751..554a30aa4e86 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 2019-10-21 19:06:22 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -721,11 +721,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -704,11 +704,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -947,7 +947,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc index 1ea845a99b24..0e5b0f04de12 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -378,7 +378,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -375,7 +375,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -401,7 +401,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -398,7 +398,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / 1024); diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc index e860a6e97dbc..b47ca87af0ae 100644 --- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -225,7 +225,7 @@ const struct { +@@ -231,7 +231,7 @@ const struct { {base::DIR_APP_DATA, nullptr, true}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, #endif diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index cc2207a69018..7a8ca690fcae 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -78,11 +78,11 @@ +@@ -81,11 +81,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -206,10 +206,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -209,10 +209,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -457,10 +457,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -476,10 +476,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -509,10 +509,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -531,10 +531,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -620,7 +620,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -645,7 +645,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea insecure_stub_resolver_enabled, secure_dns_mode, std::move(dns_over_https_servers)); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index f94806ea625f..a544b3e7548c 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -84,7 +84,11 @@ +@@ -85,7 +85,11 @@ #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 90345454284e..a98d199bea88 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,4 +1,4 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -113,7 +113,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -333,11 +333,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -352,11 +352,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kSafeBrowsingSendFilesForMalwareCheck, base::Value::Type::INTEGER }, @@ -23,7 +23,7 @@ #if defined(OS_POSIX) { key::kNtlmV2Enabled, prefs::kNtlmV2Enabled, -@@ -1064,7 +1064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1141,7 +1141,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -32,7 +32,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1125,7 +1125,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1205,7 +1205,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = browser_switcher::prefs::kChromeParameters, base::Value::Type::LIST }, #endif 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 5434edaf9f46..c5dc2e3926a7 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/prefs/browser_prefs.cc @@ -346,7 +346,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -951,7 +951,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -978,7 +978,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc index 1180842655b1..0fc02f402f9c 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { +@@ -187,7 +187,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 69e9d6d67baf..ffe22d7bbbf3 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -181,7 +181,7 @@ +@@ -186,7 +186,7 @@ #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/sync/sync_clipboard_service_factory.h" #endif -@@ -336,7 +336,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -352,7 +352,7 @@ void ChromeBrowserMainExtraPartsProfiles:: MediaGalleriesPreferencesFactory::GetInstance(); #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,8 +18,8 @@ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); -@@ -398,7 +398,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - SpellcheckServiceFactory::GetInstance(); +@@ -415,7 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + StorageNotificationServiceFactory::GetInstance(); #endif suggestions::SuggestionsServiceFactory::GetInstance(); -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 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 d90c3b69e971..41c536430dcc 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-07-24 18:58:10 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -83,7 +83,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -102,7 +102,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 4626355777af..281c2114476f 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 2019-10-21 19:06:22 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-12-16 21:51:23 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1699,7 +1699,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1710,7 +1710,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1741,7 +1741,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1752,7 +1752,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -2045,7 +2045,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2057,7 +2057,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 b797d07880be..6d29b9e93304 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-07-24 18:58:10 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -30,7 +30,7 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -130,7 +130,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -145,7 +145,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -164,7 +164,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index dd43dfafca4f..256580b75b54 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-10-21 19:06:23 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -713,7 +713,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -681,7 +681,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc index 1a59f2f395a8..bf751427bd2a 100644 --- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc +++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/search/search_suggest/search_suggest_service.cc -@@ -17,7 +17,11 @@ +@@ -20,7 +20,11 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" diff --git a/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.cc b/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.cc deleted file mode 100644 index 9ad1c199eb60..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/sharing/click_to_call/feature.cc.orig 2019-10-21 19:06:23 UTC -+++ chrome/browser/sharing/click_to_call/feature.cc -@@ -9,12 +9,12 @@ const base::Feature kClickToCallReceiver{"ClickToCallR - base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // defined(OS_ANDROID) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - const base::Feature kClickToCallContextMenuForSelectedText{ - "ClickToCallContextMenuForSelectedText", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kClickToCallUI{"ClickToCallUI", - base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.h b/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.h deleted file mode 100644 index 927471418ea6..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/sharing/click_to_call/feature.h.orig 2019-10-21 19:06:23 UTC -+++ chrome/browser/sharing/click_to_call/feature.h -@@ -13,7 +13,7 @@ - extern const base::Feature kClickToCallReceiver; - #endif // defined(OS_ANDROID) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - // Feature to allow click to call gets processed on desktop. - extern const base::Feature kClickToCallUI; -@@ -21,7 +21,7 @@ extern const base::Feature kClickToCallUI; - // Feature to show click to call in context menu when selected text is a phone - // number. - extern const base::Feature kClickToCallContextMenuForSelectedText; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) - - #endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_FEATURE_H_ diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 985d9ae9aabb..4c230f4f53f2 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/signin/signin_util.cc @@ -34,7 +34,7 @@ #include "google_apis/gaia/gaia_auth_util.h" @@ -9,12 +9,3 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h" -@@ -46,7 +46,7 @@ namespace { - - constexpr char kSignoutSettingKey[] = "signout_setting"; - --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - #define CAN_DELETE_PROFILE - #endif - diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 7b7c9443d50a..a0e7ffe83b9a 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2019-10-30 15:53:20 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ #if defined(OS_WIN) #include "chrome/browser/themes/theme_service_win.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -60,7 +60,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc +@@ -64,7 +64,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc ThemeService* provider = NULL; #if defined(OS_WIN) provider = new ThemeServiceWin; @@ -18,7 +18,7 @@ provider = new ThemeServiceAuraLinux; #else provider = new ThemeService; -@@ -72,7 +72,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc +@@ -76,7 +76,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index b20764859537..f89bbb1f2e49 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -81,7 +81,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -467,7 +467,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -472,7 +472,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -925,7 +925,7 @@ void BrowserCommandController::InitCommandState() { +@@ -945,7 +945,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc index 77885ff8e32a..116607d0a49c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -181,7 +181,7 @@ std::vector<int> SadTab::GetSubMessages() { +@@ -184,7 +184,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index a0ae6605a320..5e365809612d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -121,7 +121,7 @@ +@@ -122,7 +122,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -313,11 +313,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -314,11 +314,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index ca8bdc608cac..0f8d7e671406 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 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -451,13 +451,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -617,7 +617,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -616,7 +616,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]); -@@ -625,7 +625,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -624,7 +624,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(); -@@ -791,11 +791,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc deleted file mode 100644 index cc70bebd77c7..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/ui_features.cc.orig 2019-10-21 19:06:24 UTC -+++ chrome/browser/ui/ui_features.cc -@@ -74,7 +74,7 @@ const base::Feature kWebFooterExperiment{"WebFooterExp - const base::Feature kWebUITabStrip{"WebUITabStrip", - base::FEATURE_DISABLED_BY_DEFAULT}; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - constexpr base::Feature kEnableDbusAndX11StatusIcons{ - "EnableDbusAndX11StatusIcons", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h deleted file mode 100644 index 69428146c774..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/ui_features.h.orig 2019-10-21 19:06:24 UTC -+++ chrome/browser/ui/ui_features.h -@@ -46,7 +46,7 @@ extern const base::Feature kWebFooterExperiment; - - extern const base::Feature kWebUITabStrip; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - extern const base::Feature kEnableDbusAndX11StatusIcons; - #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 4ad65dcd3917..7351b61842e2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,17 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-09-09 21:55:11 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -37,8 +37,10 @@ - namespace { - - void InitCrashReporterIfEnabled(bool enabled) { -+#if !defined(OS_BSD) - if (enabled) - breakpad::InitCrashReporter(std::string()); -+#endif - } - - } // namespace -@@ -108,8 +110,10 @@ std::unique_ptr<views::View> FirstRunDialog::CreateExt +@@ -115,8 +115,10 @@ std::unique_ptr<views::View> FirstRunDialog::CreateExt bool FirstRunDialog::Accept() { GetWidget()->Hide(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index ca73273451ed..88050c498011 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1581,7 +1581,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1519,7 +1519,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index f87a008d7e52..cfa85b667d1e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-09-09 21:55:11 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -354,7 +354,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source, const gfx::Point& point, const ui::Event* event) { @@ -18,7 +18,7 @@ views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); menu_runner.RunMenuAt( -@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { 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 f094f7905db9..e89110ff1282 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -390,7 +390,7 @@ bool HungRendererDialogView::Cancel() { +@@ -379,7 +379,7 @@ bool HungRendererDialogView::Cancel() { content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 902935e6f831..98e130553ec0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -69,7 +69,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -84,7 +84,7 @@ class NewTabButton::HighlightPathGenerator NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) : views::ImageButton(listener), tab_strip_(tab_strip) { set_animate_on_state_change(true); 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 459025adb691..153ffa855613 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -512,7 +512,7 @@ void Tab::OnMouseCaptureLost() { +@@ -550,7 +550,7 @@ void Tab::OnMouseCaptureLost() { void Tab::OnMouseMoved(const ui::MouseEvent& event) { tab_style_->SetHoverLocation(event.location()); controller_->OnMouseEventInTab(this, event); @@ -9,7 +9,7 @@ MaybeUpdateHoverStatus(event); #endif } -@@ -522,7 +522,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) +@@ -560,7 +560,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) } void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& event) { 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 3543265c74e6..850eb07b9036 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 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -443,7 +443,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -446,7 +446,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -865,7 +865,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -883,7 +883,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else SetCapture(target_context); @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2003,7 +2003,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2016,7 +2016,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 0a9da7a74d9c..c1025ff9467c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/webui/about_ui.cc @@ -562,7 +562,7 @@ std::string ChromeURLs() { return html; @@ -9,9 +9,9 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest( - .GetRawDataResource(idr) - .as_string(); +@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest( + response = + ui::ResourceBundle::GetSharedInstance().DecompressDataResource(idr); } -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) 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 4b9c59197135..81fe67a2414d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -212,11 +212,11 @@ +@@ -206,11 +206,11 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -9,12 +9,12 @@ #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "chrome/browser/ui/webui/sandbox_internals_ui.h" +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -338,7 +338,7 @@ bool IsAboutUI(const GURL& url) { +@@ -308,7 +308,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -23,7 +23,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -654,7 +654,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -621,7 +621,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,12 +32,12 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -702,17 +702,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -669,17 +669,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI<SandboxInternalsUI>; } 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 033f8f22dee4..a6e631a725a2 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 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -702,7 +702,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -698,7 +698,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,7 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -722,7 +722,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -718,7 +718,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP}, {"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER}, #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc index 059202c3cb59..5b19a746a55e 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc -@@ -50,7 +50,7 @@ namespace { +@@ -51,7 +51,7 @@ namespace { #if defined(OS_MACOSX) const int kDesiredSizes[] = {16, 32, 128, 256, 512}; const size_t kNumDesiredSizes = base::size(kDesiredSizes); diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 6bc894c9e1e4..0cd6a82533e0 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 2019-10-21 19:06:25 UTC +--- chrome/common/BUILD.gn.orig 2019-12-16 21:51:24 UTC +++ chrome/common/BUILD.gn -@@ -293,6 +293,10 @@ static_library("common") { +@@ -299,6 +299,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h new file mode 100644 index 000000000000..b290d11bd40c --- /dev/null +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -0,0 +1,11 @@ +--- chrome/common/channel_info.h.orig 2019-12-17 19:22:25 UTC ++++ chrome/common/channel_info.h +@@ -55,7 +55,7 @@ version_info::Channel GetChannelByName(const std::stri + std::string GetChannelSuffixForDataDir(); + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Returns the channel-specific filename of the desktop shortcut used to launch + // the browser. + std::string GetDesktopName(base::Environment* env); diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc new file mode 100644 index 000000000000..e9625be14b03 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -0,0 +1,20 @@ +--- chrome/common/channel_info_posix.cc.orig 2019-12-17 19:21:14 UTC ++++ chrome/common/channel_info_posix.cc +@@ -69,7 +69,7 @@ std::string GetChannelSuffixForDataDir() { + } + #endif // defined(GOOGLE_CHROME_BUILD) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + std::string GetDesktopName(base::Environment* env) { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + version_info::Channel product_channel(GetChannel()); +@@ -91,7 +91,7 @@ std::string GetDesktopName(base::Environment* env) { + return "chromium-browser.desktop"; + #endif + } +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + version_info::Channel GetChannel() { + return GetChannelImpl(nullptr, nullptr); diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index f9b5df36a171..1cfaa32e1b67 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 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_features.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/common/chrome_features.cc -@@ -84,13 +84,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc +@@ -86,13 +86,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) @@ -16,9 +16,9 @@ // Enables or disables whether permission prompts are automatically blocked // after the user has explicitly dismissed them too many times. -@@ -140,7 +140,7 @@ const base::Feature kThirdPartyModulesBlocking{ - "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif +@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{ + const base::Feature kTLS13HardeningForLocalAnchors{ + "TLS13HardeningForLocalAnchors", base::FEATURE_DISABLED_BY_DEFAULT}; -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index a56d7d0fa766..92bb5387b668 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 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_features.h.orig 2019-12-16 21:51:24 UTC +++ chrome/common/chrome_features.h -@@ -64,10 +64,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -67,10 +67,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutoFetchOnNetErrorPage; #endif @@ -13,7 +13,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -86,7 +86,7 @@ extern const base::Feature kBundledConnectionHelpFeatu +@@ -89,7 +89,7 @@ extern const base::Feature kBundledConnectionHelpFeatu COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kCaptionSettings; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 0081f7d6de55..171f2dd8afe1 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_paths.cc.orig 2019-12-16 21:50:44 UTC +++ chrome/common/chrome_paths.cc -@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD +@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif @@ -24,9 +24,9 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL( -@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + // The name of the hint file that tells the latest component updated Widevine +@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -35,7 +35,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -489,7 +489,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -502,7 +502,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif #if defined(OS_CHROMEOS) || \ @@ -44,7 +44,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -497,7 +497,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -510,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -53,7 +53,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -532,7 +532,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -545,7 +545,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -62,7 +62,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -546,6 +546,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -559,6 +559,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -72,7 +72,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -558,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +574,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -81,7 +81,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -566,7 +569,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -579,7 +582,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) @@ -90,7 +90,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -574,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -587,7 +590,7 @@ bool PathProvider(int key, base::FilePath* result) { } cur = cur.Append(kComponentUpdatedFlashHint); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 70381fa7d824..703fb6677e76 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.h.orig 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_paths.h.orig 2019-12-16 21:50:44 UTC +++ chrome/common/chrome_paths.h @@ -53,7 +53,7 @@ enum { // contains subdirectories. @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -119,7 +119,7 @@ enum { +@@ -122,7 +122,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. @@ -27,7 +27,7 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -134,10 +134,10 @@ enum { +@@ -137,10 +137,10 @@ enum { DIR_GEN_TEST_DATA, // Directory where generated test data resides. DIR_TEST_DATA, // Directory where unit test data resides. DIR_TEST_TOOLS, // Directory where unit test tools reside. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 22ca9df81e2f..573dfd121a27 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_switches.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/common/chrome_switches.cc -@@ -853,7 +853,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -852,7 +852,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 15b4de6a5158..00260650b154 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 2019-10-21 19:06:25 UTC +--- chrome/common/chrome_switches.h.orig 2019-12-16 21:51:24 UTC +++ chrome/common/chrome_switches.h -@@ -264,7 +264,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -263,7 +263,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni index b5cdea078543..8b508f31fcc9 100644 --- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni +++ b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni @@ -1,6 +1,6 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-10-21 19:06:25 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-12-16 21:51:24 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -109,7 +109,7 @@ if (is_chromeos) { +@@ -110,7 +110,7 @@ if (is_chromeos) { "wallpaper.json", "wallpaper_private.json", ] diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index c76d32938d76..236c79808b25 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,6 +1,6 @@ ---- chrome/common/features.gni.orig 2019-10-21 19:06:26 UTC +--- chrome/common/features.gni.orig 2019-12-16 21:51:24 UTC +++ chrome/common/features.gni -@@ -42,9 +42,9 @@ declare_args() { +@@ -53,9 +53,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos enable_one_click_signin = diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 2cbe5253509d..a24d4328d017 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 2019-10-21 19:06:26 UTC +--- chrome/common/pref_names.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/common/pref_names.cc -@@ -1026,7 +1026,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1044,7 +1044,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1153,7 +1153,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1171,7 +1171,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1540,7 +1540,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1572,7 +1572,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -1791,12 +1791,12 @@ const char kAuthAndroidNegotiateAccountType[] = +@@ -1840,12 +1840,12 @@ const char kAuthAndroidNegotiateAccountType[] = // domain sub-content requests. const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 7b95903f1916..3edabd74e01b 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 2019-10-21 19:06:26 UTC +--- chrome/common/pref_names.h.orig 2019-12-16 21:51:24 UTC +++ chrome/common/pref_names.h -@@ -326,7 +326,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -330,7 +330,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -357,7 +357,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -361,7 +361,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -511,7 +511,7 @@ extern const char kAppWindowPlacement[]; +@@ -523,7 +523,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) -@@ -708,9 +708,9 @@ extern const char kGSSAPILibraryName[]; +@@ -729,9 +729,9 @@ extern const char kGSSAPILibraryName[]; extern const char kAuthAndroidNegotiateAccountType[]; extern const char kAllowCrossOriginAuthPrompt[]; 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 c83226b94082..7432dd4bf2c1 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 2019-10-21 19:06:26 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/common/webui_url_constants.cc -@@ -311,7 +311,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -310,7 +310,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { const char kChromeUICastHost[] = "cast"; #endif @@ -9,12 +9,12 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -322,17 +322,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -321,17 +321,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) const char kChromeUISandboxHost[] = "sandbox"; #endif @@ -26,11 +26,11 @@ #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -586,13 +586,13 @@ const char* const kChromeHostURLs[] = { +@@ -591,13 +591,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 8c22927da6bd..88f186c712f1 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 2019-10-21 19:06:26 UTC +--- chrome/common/webui_url_constants.h.orig 2019-12-16 21:51:24 UTC +++ chrome/common/webui_url_constants.h -@@ -270,7 +270,7 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host); extern const char kChromeUICastHost[]; #endif @@ -9,12 +9,12 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -282,17 +282,17 @@ extern const char kChromeUIHatsURL[]; +@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) extern const char kChromeUISandboxHost[]; #endif @@ -26,7 +26,7 @@ #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index 369fc1e77fc0..14f5eaec6e05 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,22 +1,6 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-10-21 19:06:26 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -154,13 +154,13 @@ - #include "chrome/renderer/searchbox/searchbox_extension.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/allocator/buildflags.h" - #if BUILDFLAG(USE_TCMALLOC) - #include "chrome/common/performance_manager/mojom/tcmalloc.mojom.h" - #include "chrome/renderer/performance_manager/mechanisms/tcmalloc_tunables_impl.h" - #endif // BUILDFLAG(USE_TCMALLOC) --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_WIN) - #endif -@@ -1040,7 +1040,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { @@ -25,21 +9,3 @@ placeholder = create_blocked_plugin(IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16( -@@ -1636,7 +1636,7 @@ void ChromeContentRendererClient::BindReceiverOnMainTh - } - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(USE_TCMALLOC) - if (auto setter_receiver = receiver.As<tcmalloc::mojom::TcmallocTunables>()) { - performance_manager::mechanism::TcmallocTunablesImpl::Create( -@@ -1644,7 +1644,7 @@ void ChromeContentRendererClient::BindReceiverOnMainTh - return; - } - #endif // BUILDFLAG(USE_TCMALLOC) --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - // TODO(crbug.com/977637): Get rid of the use of BinderRegistry here. This was - // done only to avoid churning spellcheck code while eliminting the "chrome" diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 48dc9c5921d0..9d109068f5ed 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 2019-10-21 19:06:26 UTC +--- chrome/test/BUILD.gn.orig 2020-01-07 21:53:20 UTC +++ chrome/test/BUILD.gn -@@ -5797,7 +5797,7 @@ test("chrome_app_unittests") { +@@ -5870,7 +5870,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//components/tracing", ] 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 7146f29b28b0..9cb955d64867 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 2019-09-09 21:55:11 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -76,6 +76,10 @@ +@@ -77,6 +77,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -103,7 +107,7 @@ +@@ -104,7 +108,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index 8e2b814ce9f2..de4942cb97d4 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-09-09 21:55:12 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/test/chromedriver/chrome_launcher.cc @@ -67,6 +67,10 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" @@ -10,4 +10,4 @@ + namespace { - // TODO(eseckler): Remove --ignore-certificate-errors for newer Chrome versions + const char* const kCommonSwitches[] = { 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 4d56e4983f56..8ad142976711 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-10-21 19:06:28 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-12-16 21:51:24 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,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> -@@ -283,7 +283,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -285,7 +285,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -18,7 +18,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -293,7 +293,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -295,7 +295,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -27,12 +27,12 @@ // 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. -@@ -433,7 +433,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -436,7 +436,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Without this call, the FontConfig library gets implicitly initialized - // on the first call to FontConfig. Since it's not safe to initialize it - // concurrently from multiple threads, we explicitly initialize it here + base::FilePath dir_module; + base::PathService::Get(base::DIR_MODULE, &dir_module); + base::FilePath dir_font = dir_module.Append("fonts"); diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc new file mode 100644 index 000000000000..0b2b338121bd --- /dev/null +++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -0,0 +1,20 @@ +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2019-12-17 19:25:44 UTC ++++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc +@@ -7,7 +7,7 @@ + #include <map> + #include <utility> + +-#if OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/stat.h> + #endif + +@@ -398,7 +398,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri + named_channel.TakeServerEndpoint(); + DCHECK(server_endpoint.is_valid()); + +-#if OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + chmod(broker_path.c_str(), 0770); + #endif + diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 69bb7570916a..f9da88b9683c 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-10-21 19:06:28 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-12-16 21:50:45 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -36,7 +36,11 @@ +@@ -19,7 +19,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc index 5f09a7431121..294953ed5551 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-10-21 19:06:28 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-12-16 21:50:45 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -234,7 +234,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -233,7 +233,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna } bool OfferStoreUnmaskedCards(bool is_off_the_record) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 4f837011d40a..40c6889dde31 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2019-10-21 19:06:28 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-12-16 21:51:25 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1925,10 +1925,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1819,10 +1819,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 16ee9ec76080..c7c5ec3abc8f 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 2019-10-21 19:06:28 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2019-12-16 21:51:25 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -159,7 +159,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio +@@ -162,7 +162,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio bool ShouldShowImprovedUserConsentForCreditCardSave() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn index 77ad6adbcb82..c712bfc0472d 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,6 +1,11 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-10-21 19:06:28 UTC +--- components/crash/content/app/BUILD.gn.orig 2019-12-16 21:51:25 UTC +++ components/crash/content/app/BUILD.gn -@@ -54,7 +54,7 @@ static_library("app") { +@@ -51,17 +51,20 @@ static_library("app") { + "crashpad_win.cc", + ] + +- if (is_mac || is_win || is_android || is_linux) { ++ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) { sources += [ "crashpad.cc" ] } @@ -9,7 +14,25 @@ sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -98,7 +98,7 @@ static_library("app") { + "breakpad_linux_impl.h", + ] + } ++ if (is_bsd) { ++ sources -= [ "crashpad_linux.cc" ] ++ } + + defines = [ "CRASH_IMPLEMENTATION" ] + +@@ -73,7 +76,7 @@ static_library("app") { + "//build:branding_buildflags", + ] + +- if (is_mac || is_win || is_android || is_linux) { ++ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) { + deps += [ + "//third_party/crashpad/crashpad/client", + "//third_party/crashpad/crashpad/util", +@@ -99,7 +102,7 @@ static_library("app") { ] } @@ -18,3 +41,12 @@ deps += [ "//third_party/breakpad:client" ] } +@@ -130,7 +133,7 @@ static_library("app") { + libs = [ "log" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + data_deps = [ + "//third_party/crashpad/crashpad/handler:crashpad_handler", + ] diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad.h b/www/chromium/files/patch-components_crash_content_app_crashpad.h new file mode 100644 index 000000000000..caf10f1a4f6a --- /dev/null +++ b/www/chromium/files/patch-components_crash_content_app_crashpad.h @@ -0,0 +1,66 @@ +--- components/crash/content/app/crashpad.h.orig 2019-12-19 16:46:22 UTC ++++ components/crash/content/app/crashpad.h +@@ -22,7 +22,7 @@ + #include <windows.h> + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <signal.h> + #endif + +@@ -37,7 +37,7 @@ class CrashReportDatabase; + + namespace crash_reporter { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(jperaza): Remove kEnableCrashpad and IsCrashpadEnabled() when Crashpad + // is fully enabled on Linux. + extern const char kEnableCrashpad[]; +@@ -146,11 +146,11 @@ void RequestSingleCrashUpload(const std::string& local + + void DumpWithoutCrashing(); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Logs message and immediately crashes the current process without triggering a + // crash dump. + void CrashWithoutDumping(const std::string& message); +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + // Returns the Crashpad database path, only valid in the browser. + base::FilePath GetCrashpadDatabasePath(); +@@ -188,7 +188,7 @@ bool DumpWithoutCrashingForClient(CrashReporterClient* + void WhitelistMemoryRange(void* begin, size_t size); + #endif // OS_ANDROID + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Install a handler that gets a chance to handle faults before Crashpad. This + // is used by V8 for trap-based bounds checks. + void SetFirstChanceExceptionHandler(bool (*handler)(int, siginfo_t*, void*)); +@@ -196,7 +196,7 @@ void SetFirstChanceExceptionHandler(bool (*handler)(in + // Gets the socket and process ID of the Crashpad handler connected to this + // process, valid if this function returns `true`. + bool GetHandlerSocket(int* sock, pid_t* pid); +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + namespace internal { + +@@ -212,11 +212,11 @@ DWORD WINAPI DumpProcessForHungInputThread(void* param + + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Starts the handler process with an initial client connected on fd. + // Returns `true` on success. + bool StartHandlerForClient(int fd); +-#endif // OS_LINUX || OS_ANDROID ++#endif // OS_LINUX || OS_ANDROID || OS_BSD + + // The platform-specific portion of InitializeCrashpad(). On Windows, if + // |user_data_dir| is non-empty, the user data directory will be passed to the diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc b/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc new file mode 100644 index 000000000000..819e2b741de2 --- /dev/null +++ b/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc @@ -0,0 +1,24 @@ +--- components/crash/content/app/crashpad_linux.cc.orig 2019-12-19 16:47:28 UTC ++++ components/crash/content/app/crashpad_linux.cc +@@ -5,7 +5,9 @@ + #include "components/crash/content/app/crashpad.h" + + #include <pthread.h> ++#if !defined(OS_BSD) + #include <sys/prctl.h> ++#endif + + #include <limits> + +@@ -66,9 +68,11 @@ void SetPtracerAtFork() { + if (!GetHandlerSocket(nullptr, &pid)) { + return; + } ++#if !defined(OS_BSD) + if (pid > 0 && prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) { + PLOG(ERROR) << "prctl"; + } ++#endif + } + + namespace internal { diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn index 8106169d6434..4af45375d035 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-09-09 21:55:14 UTC +--- components/crash/core/common/BUILD.gn.orig 2019-12-16 21:50:45 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,15 +9,18 @@ } group("common") { -@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") { +@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") { ] } - deps += [ "//third_party/breakpad:client" ] - } - } - -@@ -153,7 +152,7 @@ source_set("unit_tests") { ++ if (!is_bsd) { ++ deps += [ "//third_party/breakpad:client" ] ++ } + if (use_combined_annotations) { + public_deps += [ "//third_party/crashpad/crashpad/client" ] + } +@@ -173,7 +175,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index d8160b32a023..c33f1c623b31 100644 --- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,8 +1,8 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-10-21 19:06:28 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-12-16 21:51:25 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc @@ -32,7 +32,7 @@ #include "components/discardable_memory/common/discardable_shared_memory_heap.h" - #include "mojo/public/cpp/bindings/strong_binding.h" + #include "mojo/public/cpp/bindings/self_owned_receiver.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc index 85ad0d894e89..dbb0a0dd18dd 100644 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc @@ -1,6 +1,6 @@ ---- components/download/internal/common/base_file.cc.orig 2019-10-21 19:06:28 UTC +--- components/download/internal/common/base_file.cc.orig 2019-12-16 21:50:45 UTC +++ components/download/internal/common/base_file.cc -@@ -593,7 +593,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, +@@ -603,7 +603,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, } // namespace @@ -9,7 +9,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( const std::string& client_guid, -@@ -611,7 +611,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn +@@ -621,7 +621,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn return QuarantineFileResultToReason(result); } 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 fc76484cb43d..d4415fbcd52c 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 2019-10-21 19:06:29 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2019-12-16 21:51:25 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -54,7 +54,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedReadingListFeature, &kIPHBadgedTranslateManualTriggerFeature, #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) &kIPHFocusModeFeature, &kIPHGlobalMediaControlsFeature, -@@ -67,7 +67,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -64,7 +64,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHIncognitoWindowFeature, &kIPHNewTabFeature, #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index ddef7a13a234..9dbf687adc5e 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 2019-10-21 19:06:29 UTC +--- components/feature_engagement/public/feature_list.h.orig 2019-12-16 21:51:25 UTC +++ components/feature_engagement/public/feature_list.h -@@ -107,7 +107,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge +@@ -104,7 +104,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge "IPH_BadgedTranslateManualTrigger"); #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); -@@ -117,7 +117,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm +@@ -114,7 +114,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) @@ -18,7 +18,7 @@ // defined(OS_CHROMEOS) } // namespace -@@ -166,7 +166,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -160,7 +160,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), @@ -27,7 +27,7 @@ defined(OS_CHROMEOS) VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -176,7 +176,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -170,7 +170,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHIncognitoWindowFeature), VARIATION_ENTRY(kIPHNewTabFeature), #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index cd02d75b2700..73a47e245f55 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2019-10-21 19:06:29 UTC +--- components/metrics/BUILD.gn.orig 2019-12-16 21:51:25 UTC +++ components/metrics/BUILD.gn -@@ -164,6 +164,11 @@ jumbo_static_library("metrics") { +@@ -165,6 +165,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } 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 075399a29238..79d553166cef 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 2019-10-21 19:06:29 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-12-16 21:51:25 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -763,7 +763,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -743,7 +743,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 8e2191d4bc74..c41e2745d6e8 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-03-11 22:00:56 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-12-16 21:51:25 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.h> @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -52,7 +52,7 @@ +@@ -57,7 +57,7 @@ #include "base/system/sys_info.h" #endif @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -61,11 +61,24 @@ namespace policy { +@@ -66,11 +66,24 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -53,16 +53,16 @@ #elif defined(OS_MACOSX) // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570 SCDynamicStoreContext context = {0, NULL, NULL, NULL}; -@@ -111,7 +124,7 @@ std::string GetMachineName() { +@@ -116,7 +129,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -134,7 +147,7 @@ std::string GetOSArchitecture() { +@@ -139,7 +152,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { 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 557066418d10..79596d18f96b 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2019-10-21 19:06:29 UTC +--- components/policy/resources/policy_templates.json.orig 2019-12-16 21:51:25 UTC +++ components/policy/resources/policy_templates.json -@@ -1038,7 +1038,7 @@ +@@ -1062,7 +1062,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1068,7 +1068,7 @@ +@@ -1092,7 +1092,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1095,7 +1095,7 @@ +@@ -1119,7 +1119,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1821,7 +1821,7 @@ +@@ -1845,7 +1845,7 @@ 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3536,7 +3536,7 @@ +@@ -3667,7 +3667,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3590,7 +3590,7 @@ +@@ -3721,7 +3721,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -6919,7 +6919,7 @@ +@@ -7159,7 +7159,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8119,7 +8119,7 @@ +@@ -8383,7 +8383,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -8713,7 +8713,7 @@ +@@ -9032,7 +9032,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 18fc690f7cea..39a00435245f 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2019-10-21 19:06:30 UTC +--- components/policy/tools/generate_policy_source.py.orig 2019-12-16 21:51:25 UTC +++ components/policy/tools/generate_policy_source.py -@@ -92,6 +92,7 @@ class PolicyDetails: +@@ -96,6 +96,7 @@ class PolicyDetails: 'chrome.linux', 'chrome.mac', 'chrome.fuchsia', @@ -8,7 +8,7 @@ 'chrome.*', 'chrome.win7', ]: -@@ -114,7 +115,7 @@ class PolicyDetails: +@@ -118,7 +119,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': diff --git a/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc b/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc new file mode 100644 index 000000000000..57b0aefe0522 --- /dev/null +++ b/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc @@ -0,0 +1,16 @@ +--- components/sync_device_info/device_info_sync_bridge.cc.orig 2019-12-31 14:39:30 UTC ++++ components/sync_device_info/device_info_sync_bridge.cc +@@ -432,11 +432,13 @@ void DeviceInfoSyncBridge::OnStoreCreated( + return; + } + ++#if !defined(OS_BSD) + store_ = std::move(store); + + base::SysInfo::GetHardwareInfo( + base::BindOnce(&DeviceInfoSyncBridge::OnHardwareInfoRetrieved, + weak_ptr_factory_.GetWeakPtr())); ++#endif + } + + void DeviceInfoSyncBridge::OnHardwareInfoRetrieved( 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 new file mode 100644 index 000000000000..19d4b54c7495 --- /dev/null +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -0,0 +1,11 @@ +--- components/sync_device_info/local_device_info_util.cc.orig 2019-12-31 14:40:27 UTC ++++ components/sync_device_info/local_device_info_util.cc +@@ -19,7 +19,7 @@ std::string GetPersonalizableDeviceNameInternal(); + sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { + #if defined(OS_CHROMEOS) + return sync_pb::SyncEnums_DeviceType_TYPE_CROS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; + #elif defined(OS_ANDROID) || defined(OS_IOS) + return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index 52dda1501cee..e7ae8d6cbae9 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,25 +1,25 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-07-29 16:01:57 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-12-16 21:50:47 UTC +++ components/sync_device_info/local_device_info_util_linux.cc -@@ -30,6 +30,23 @@ std::string GetSessionNameInternal() { - break; - } - return "Chromebook"; +@@ -36,6 +36,23 @@ std::string GetChromeOSDeviceNameFromType() { + std::string GetPersonalizableDeviceNameInternal() { + #if defined(OS_CHROMEOS) + return GetChromeOSDeviceNameFromType(); +#elif defined(OS_BSD) + long len = sysconf(_SC_HOST_NAME_MAX); -+ ++ + if (len == -1) + return "FreeBSD"; -+ ++ + char *hostname = new (std::nothrow) char[len](); + + if ((hostname == nullptr) || (gethostname(hostname, len) == -1)) { + delete[](hostname); + return "FreeBSD"; + } -+ -+ std::string res{hostname}; + ++ std::string res{hostname}; + delete[](hostname); ++ + return res; #else char hostname[HOST_NAME_MAX]; diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc new file mode 100644 index 000000000000..8565f963e650 --- /dev/null +++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.cc.orig 2019-12-17 19:29:17 UTC ++++ components/viz/host/host_display_client.cc +@@ -59,7 +59,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( + } + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { + NOTIMPLEMENTED(); + } diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.h b/www/chromium/files/patch-components_viz_host_host__display__client.h new file mode 100644 index 000000000000..74026db2d3af --- /dev/null +++ b/www/chromium/files/patch-components_viz_host_host__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.h.orig 2019-12-17 19:29:39 UTC ++++ components/viz/host/host_display_client.h +@@ -42,7 +42,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom + mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif + 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 new file mode 100644 index 000000000000..b44d38ea99fc --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -0,0 +1,20 @@ +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2019-12-17 19:30:11 UTC ++++ components/viz/service/display_embedder/software_output_surface.cc +@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: + base::TimeTicks now = base::TimeTicks::Now(); + base::TimeDelta interval_to_next_refresh = + now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (needs_swap_size_notifications_) + client_->DidSwapWithSize(pixel_size); + #endif +@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla + return gfx::OVERLAY_TRANSFORM_NONE; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) { + needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h new file mode 100644 index 000000000000..83ba655afef4 --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -0,0 +1,20 @@ +--- components/viz/service/display_embedder/software_output_surface.h.orig 2019-12-17 19:30:42 UTC ++++ components/viz/service/display_embedder/software_output_surface.h +@@ -50,7 +50,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + UpdateVSyncParametersCallback callback) override; + void SetDisplayTransformHint(gfx::OverlayTransform transform) override {} + gfx::OverlayTransform GetDisplayTransform() override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif +@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_; + ui::LatencyTracker latency_tracker_; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool needs_swap_size_notifications_ = false; + #endif + diff --git a/www/chromium/files/patch-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 new file mode 100644 index 000000000000..643e2d18b1da --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -0,0 +1,20 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2019-12-17 19:31:16 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create( + output_surface->SetNeedsSwapSizeNotifications( + params->send_swap_size_notifications); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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); +@@ -358,7 +358,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + #if defined(OS_ANDROID) + if (display_client_) + display_client_->DidCompleteSwapWithSize(pixel_size); +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (display_client_ && pixel_size != last_swap_pixel_size_) { + last_swap_pixel_size_ = pixel_size; + display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h new file mode 100644 index 000000000000..67d6ac6a65a6 --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -0,0 +1,11 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2019-12-17 19:31:54 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h +@@ -140,7 +140,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp + // to the BFS. + std::unique_ptr<Display> display_; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + gfx::Size last_swap_pixel_size_; + #endif + diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 32c532d1cffc..f899a07daf18 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2019-10-21 19:06:31 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/app/content_main_runner_impl.cc -@@ -102,17 +102,17 @@ +@@ -101,17 +101,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,7 +21,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -133,7 +133,7 @@ +@@ -132,7 +132,7 @@ #include "content/public/common/content_client.h" #endif @@ -30,7 +30,7 @@ #if !defined(CHROME_MULTIPLE_DLL_BROWSER) #include "content/child/field_trial.h" -@@ -318,7 +318,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -317,7 +317,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,16 +39,16 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -415,7 +415,7 @@ void PreSandboxInit() { +@@ -414,7 +414,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - #if !defined(CHROME_MULTIPLE_DLL_CHILD) - void InitializeBrowserClientProcessImpl() { -@@ -482,7 +482,7 @@ int RunZygote(ContentMainDelegate* delegate) { + } // namespace + +@@ -472,7 +472,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 1d171d58e24b..64056a68f7e6 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2019-10-21 19:06:31 UTC +--- content/browser/browser_main_loop.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/browser_main_loop.cc -@@ -244,6 +244,13 @@ +@@ -247,6 +247,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -573,6 +580,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -582,6 +589,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif #if defined(USE_X11) -@@ -618,7 +630,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -627,7 +639,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MACOSX) @@ -35,7 +35,7 @@ defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. -@@ -628,7 +640,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -637,7 +649,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); diff --git a/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc new file mode 100644 index 000000000000..eb7f6cbabce4 --- /dev/null +++ b/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc @@ -0,0 +1,11 @@ +--- content/browser/compositor/gpu_process_transport_factory.cc.orig 2019-12-17 19:32:45 UTC ++++ content/browser/compositor/gpu_process_transport_factory.cc +@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() { + return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + class HostDisplayClient : public viz::HostDisplayClient { + public: + explicit HostDisplayClient(ui::Compositor* compositor) diff --git a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc new file mode 100644 index 000000000000..17f9412277f1 --- /dev/null +++ b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc @@ -0,0 +1,20 @@ +--- content/browser/compositor/software_browser_compositor_output_surface.cc.orig 2019-12-17 19:33:09 UTC ++++ content/browser/compositor/software_browser_compositor_output_surface.cc +@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe + const gfx::Size& pixel_size) { + latency_tracker_.OnGpuSwapBuffersCompleted(latency_info); + client_->DidReceiveSwapBuffersAck({swap_time, swap_time}); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (needs_swap_size_notifications_) + client_->DidSwapWithSize(pixel_size); + #endif +@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat + return 0; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) { + needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h new file mode 100644 index 000000000000..c4dc95cc995e --- /dev/null +++ b/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h @@ -0,0 +1,20 @@ +--- content/browser/compositor/software_browser_compositor_output_surface.h.orig 2019-12-17 19:33:36 UTC ++++ content/browser/compositor/software_browser_compositor_output_surface.h +@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu + gfx::BufferFormat GetOverlayBufferFormat() const override; + uint32_t GetFramebufferCopyTextureFormat() override; + unsigned UpdateGpuFence() override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif +@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu + base::TimeDelta refresh_interval_; + ui::LatencyTracker latency_tracker_; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool needs_swap_size_notifications_ = false; + #endif + diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 8285bdf3c71e..3751c782527d 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-09-09 21:55:16 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/devtools/protocol/system_info_handler.cc @@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Give the GPU process a few seconds to provide GPU info. // Linux Debug builds need more time -- see Issue 796437. - // Windows builds need more time -- see Issue 873112. --#if (defined(OS_LINUX) && !defined(NDEBUG)) || defined(OS_WIN) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) || defined(OS_WIN) + // Windows builds need more time -- see Issue 873112 and 1004472. +-#if (defined(OS_LINUX) && !defined(NDEBUG)) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) const int kGPUInfoWatchdogTimeoutMs = 20000; - #else - const int kGPUInfoWatchdogTimeoutMs = 5000; + #elif defined(OS_WIN) + const int kGPUInfoWatchdogTimeoutMs = 30000; 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 2cdb5abd1d9e..48a5f59aa660 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 2019-10-21 19:06:32 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1094,7 +1094,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1087,7 +1087,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc index 3296db82abe6..63fc45585ad9 100644 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_internals.cc.orig 2019-09-09 21:55:16 UTC +--- content/browser/media/media_internals.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/media/media_internals.cc -@@ -505,7 +505,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -513,7 +513,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit device_dict->SetString("id", descriptor.device_id); device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", std::move(format_list)); diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 3502703e4cb2..d6aee62a8d5e 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 2019-10-21 19:06:32 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -370,7 +370,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -366,7 +366,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_ppapi__plugin__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc new file mode 100644 index 000000000000..41c5edc15175 --- /dev/null +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2019-12-17 19:34:30 UTC ++++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #endif +@@ -17,7 +17,7 @@ namespace content { + + void PpapiPluginProcessHost::BindHostReceiver( + mojo::GenericPendingReceiver receiver) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) + ConnectToFontService(std::move(font_receiver)); + #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 ae499e70c9fb..91932a38a5e5 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,4 +1,4 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2019-12-16 21:50:47 UTC +++ content/browser/renderer_host/render_message_filter.cc @@ -70,7 +70,7 @@ #if defined(OS_MACOSX) @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -148,7 +148,7 @@ void RenderMessageFilter::CreateFullscreenWidget( +@@ -149,7 +149,7 @@ void RenderMessageFilter::CreateFullscreenWidget( std::move(callback).Run(route_id); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -169,7 +169,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -170,7 +170,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 90e712047824..f50e2f2912d6 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,7 +1,7 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2019-12-16 21:50:47 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -86,14 +86,14 @@ class CONTENT_EXPORT RenderMessageFilter - mojom::WidgetPtr widget, +@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter + mojo::PendingRemote<mojom::Widget> widget, CreateFullscreenWidgetCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if defined(OS_LINUX) 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 406cba07a9c6..46f69e77dba3 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 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -230,7 +230,7 @@ +@@ -238,7 +238,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1194,7 +1194,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1160,7 +1160,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; -@@ -1205,7 +1205,7 @@ size_t GetPlatformProcessLimit() { +@@ -1171,7 +1171,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,16 +27,16 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1239,7 +1239,7 @@ class RenderProcessHostImpl::IOThreadHostImpl +@@ -1219,7 +1219,7 @@ class RenderProcessHostImpl::IOThreadHostImpl + return; + } - // mojom::ChildProcessHost implementation: - void BindHostReceiver(mojo::GenericPendingReceiver receiver) override { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1593,7 +1593,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1597,7 +1597,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 1608202ff669..607b57986e59 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-12-16 21:51:26 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -423,10 +423,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -439,10 +439,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 7517746e78a3..8674e4a032bd 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 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr +@@ -208,7 +208,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 6b09d525efc3..f7a81d88acb1 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-10-21 19:06:32 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -116,7 +116,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2203,7 +2203,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2212,7 +2212,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2388,7 +2388,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2385,7 +2385,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; 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 c0995f1e1dbc..16859d865730 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 2019-10-21 19:06:32 UTC +--- content/browser/utility_process_host.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/utility_process_host.cc -@@ -55,7 +55,7 @@ +@@ -56,7 +56,7 @@ #include "services/network/network_sandbox_win.h" #endif @@ -9,7 +9,7 @@ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif -@@ -216,7 +216,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -217,7 +217,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), @@ -18,7 +18,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -515,7 +515,7 @@ void UtilityProcessHost::OnProcessCrashed(int exit_cod +@@ -523,7 +523,7 @@ base::Optional<std::string> UtilityProcessHost::GetSer void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index a550054084a2..ee5387268e36 100644 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,6 +1,6 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-10-21 19:06:32 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-12-16 21:51:26 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -123,12 +123,12 @@ const std::map<int, std::string> CreateMojoResourceIdT +@@ -126,12 +126,12 @@ const std::map<int, std::string> CreateMojoResourceIdT "mojo/mojo/public/mojom/base/string16.mojom.html"}, {IDR_MOJO_STRING16_MOJOM_LITE_JS, "mojo/mojo/public/mojom/base/string16.mojom-lite.js"}, diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 58bac736ee1c..3873debe1afe 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 2019-10-21 19:06:32 UTC +--- content/common/BUILD.gn.orig 2019-12-16 21:51:26 UTC +++ content/common/BUILD.gn -@@ -367,6 +367,12 @@ source_set("common") { +@@ -366,6 +366,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index cee20f80371c..d4bcd918e54e 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2019-09-09 21:55:16 UTC +--- content/common/user_agent.cc.orig 2019-12-16 21:51:26 UTC +++ content/common/user_agent.cc -@@ -124,6 +124,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ +@@ -128,6 +128,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ #endif ); diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index ad00bb358264..22f0b152e166 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2019-09-09 21:55:16 UTC +--- content/gpu/BUILD.gn.orig 2019-12-16 21:51:26 UTC +++ content/gpu/BUILD.gn -@@ -125,7 +125,7 @@ target(link_target_type, "gpu_sources") { +@@ -126,7 +126,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 09c0f351a188..7a516f808bc5 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2019-10-21 19:06:32 UTC +--- content/gpu/gpu_main.cc.orig 2019-12-16 21:51:26 UTC +++ content/gpu/gpu_main.cc @@ -82,7 +82,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -111,7 +111,7 @@ namespace content { +@@ -103,7 +103,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -164,7 +164,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -276,7 +276,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -268,7 +268,7 @@ int GpuMain(const MainFunctionParams& parameters) { main_thread_task_executor = std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif defined(OS_MACOSX) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -383,7 +383,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -372,7 +372,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -45,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -418,7 +418,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -407,7 +407,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index 0a94e120e039..83374eccfbaf 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-10-21 19:06:32 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -19,7 +19,7 @@ @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -51,7 +51,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { +@@ -50,7 +50,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { } void PpapiBlinkPlatformImpl::Shutdown() { @@ -27,7 +27,7 @@ // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -61,7 +61,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { +@@ -60,7 +60,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { } blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 67333e6652bd..368b4a446762 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2019-09-09 21:55:16 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-12-16 21:51:26 UTC +++ content/public/common/common_param_traits_macros.h -@@ -337,7 +337,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -339,7 +339,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index c6676f3c7402..b59ddc2e81cc 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2019-10-21 19:06:32 UTC +--- content/public/common/content_features.cc.orig 2019-12-16 21:51:26 UTC +++ content/public/common/content_features.cc -@@ -47,7 +47,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ +@@ -53,7 +53,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess{ "AudioServiceOutOfProcess", #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads { +@@ -628,7 +628,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -18,7 +18,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -663,7 +663,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index eacb08b5ba7e..616ed9691ce3 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 2019-10-21 19:06:32 UTC +--- content/public/common/content_switches.cc.orig 2019-12-16 21:51:26 UTC +++ content/public/common/content_switches.cc -@@ -980,7 +980,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -976,7 +976,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = // Enable indication that browser is controlled by automation. const char kEnableAutomation[] = "enable-automation"; diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 4b1e7397961e..c43e23d7a6f4 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2019-10-21 19:06:32 UTC +--- content/public/common/content_switches.h.orig 2019-12-16 21:51:26 UTC +++ content/public/common/content_switches.h -@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 4a003b951056..f5a9db01352f 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 2019-10-21 19:06:32 UTC +--- content/public/test/browser_test_base.cc.orig 2019-12-16 21:51:26 UTC +++ content/public/test/browser_test_base.cc -@@ -96,6 +96,10 @@ +@@ -97,6 +97,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc index 0f8673a20b08..5b12d835bc18 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/test/mock_render_thread.cc.orig 2019-12-16 21:51:26 UTC +++ content/public/test/mock_render_thread.cc -@@ -74,7 +74,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -73,7 +73,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } 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 f76f297f7d17..74ee7a23c782 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-10-21 19:06:33 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/renderer/render_thread_impl.cc @@ -185,12 +185,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -901,7 +910,7 @@ void RenderThreadImpl::Init() { +@@ -921,7 +930,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,7 +31,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -930,7 +939,7 @@ void RenderThreadImpl::Init() { +@@ -951,7 +960,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_shared_memory_manager_.get()); @@ -40,7 +40,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1309,7 +1318,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1327,7 +1336,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 271593cdf0b3..3b433ed1f9f4 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-10-21 19:06:33 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-12-16 21:51:26 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -26,8 +26,8 @@ +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (sandboxEnabled()) { #if defined(OS_MACOSX) - std::unique_ptr<service_manager::Connector> sandbox_connector; -@@ -224,7 +224,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( + sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); +@@ -217,7 +217,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( } void RendererBlinkPlatformImpl::Shutdown() { @@ -36,7 +36,7 @@ // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -289,7 +289,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -282,7 +282,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -45,7 +45,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -302,7 +302,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -295,7 +295,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 d81cdb167fee..df7735be2c73 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 2019-10-21 19:06:33 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-12-16 21:51:26 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,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 -@@ -225,7 +225,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -230,7 +230,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi scoped_refptr<base::SingleThreadTaskRunner> io_runner_; @@ -18,9 +18,9 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - std::unique_ptr<blink::WebTransmissionEncodingInfoHandler> - web_transmission_encoding_info_handler_; +@@ -254,7 +254,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; + mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 5749dd06e011..dbe6a19708d8 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2019-10-21 19:06:33 UTC +--- content/shell/BUILD.gn.orig 2019-12-16 21:51:26 UTC +++ content/shell/BUILD.gn -@@ -962,7 +962,7 @@ group("content_shell_crash_test") { +@@ -971,7 +971,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 8d397e79a3dc..4574abd3dab6 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2019-10-21 19:06:33 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2019-12-16 21:50:48 UTC +++ content/shell/app/shell_main_delegate.cc @@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit @@ -9,7 +9,7 @@ breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); #endif #if defined(OS_MACOSX) -@@ -317,7 +317,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit +@@ -313,7 +313,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit } void ShellMainDelegate::PreSandboxStartup() { diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 23a994c6073c..dc97f7778f08 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-12-16 21:51:26 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -47,7 +47,7 @@ #if defined(USE_AURA) && defined(USE_X11) @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -125,7 +125,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { +@@ -123,7 +123,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc index adfd52c8e48e..f34c4f69fe66 100644 --- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc @@ -1,4 +1,4 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-10-21 19:06:33 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-12-16 21:51:26 UTC +++ content/shell/test_runner/test_runner.cc @@ -64,7 +64,7 @@ #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1533,7 +1533,7 @@ void TestRunner::Reset() { +@@ -1514,7 +1514,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); @@ -18,7 +18,7 @@ blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2118,7 +2118,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2088,7 +2088,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { diff --git a/www/chromium/files/patch-content_test_content__test__suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc index 84146de61855..de8be8785a7f 100644 --- a/www/chromium/files/patch-content_test_content__test__suite.cc +++ b/www/chromium/files/patch-content_test_content__test__suite.cc @@ -1,6 +1,6 @@ ---- content/test/content_test_suite.cc.orig 2019-04-30 22:22:48 UTC +--- content/test/content_test_suite.cc.orig 2019-12-16 21:50:48 UTC +++ content/test/content_test_suite.cc -@@ -81,6 +81,7 @@ void ContentTestSuite::Initialize() { +@@ -84,6 +84,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess); @@ -8,7 +8,7 @@ if (!is_child_process) { gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff(); auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo(); -@@ -88,6 +89,7 @@ void ContentTestSuite::Initialize() { +@@ -91,6 +92,7 @@ void ContentTestSuite::Initialize() { gpu_feature_info->disabled_extensions); gl::init::InitializeExtensionSettingsOneOffPlatform(); } diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 67b879d25bf7..37e61a50af20 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-10-21 19:06:33 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-12-16 21:50:48 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ @@ -9,16 +9,16 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -18,7 +18,7 @@ namespace content { +@@ -17,7 +17,7 @@ namespace content { + UtilityBlinkPlatformWithSandboxSupportImpl:: - UtilityBlinkPlatformWithSandboxSupportImpl( - service_manager::Connector* connector) { + UtilityBlinkPlatformWithSandboxSupportImpl() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: +@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index d82659424108..23f525c1b117 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,4 +1,4 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-12-16 21:50:48 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -11,7 +11,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -39,10 +39,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub +@@ -33,10 +33,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub blink::WebSandboxSupport* GetSandboxSupport() override; private: diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index 246421809d22..b8ac8614bad7 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,6 +1,6 @@ ---- extensions/common/image_util.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/image_util.cc.orig 2019-12-16 21:51:26 UTC +++ extensions/common/image_util.cc -@@ -18,7 +18,11 @@ +@@ -19,7 +19,11 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/timer/elapsed_timer.h" diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 16fb4c6c7a86..b9e6dc47874d 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-10-21 19:06:34 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-12-16 21:50:48 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -88,7 +88,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf +@@ -50,7 +50,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MACOSX) return GL_TEXTURE_RECTANGLE_ARB; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index 55fdd9fcf201..15f39b34f5b9 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-10-21 19:06:34 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-12-16 21:51:26 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -23,7 +23,7 @@ +@@ -26,7 +26,7 @@ #include "ui/gl/buildflags.h" #include "ui/gl/gl_context.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -31,7 +31,7 @@ +@@ -34,7 +34,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -18,7 +18,7 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -504,7 +504,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -527,7 +527,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, DawnDevice dawnDevice) { @@ -27,7 +27,7 @@ if (!dawn_format_) { DLOG(ERROR) << "Format not supported for Dawn"; return nullptr; -@@ -527,7 +527,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -550,7 +550,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, dawnDevice, dawn_format_.value(), memory_fd, image_info.fAlloc.fSize, memory_type_index_.value()); @@ -36,7 +36,7 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -544,7 +544,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -567,7 +567,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa #if defined(OS_FUCHSIA) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; @@ -45,7 +45,7 @@ GrVkImageInfo image_info; bool result = backend_texture_.getVkImageInfo(&image_info); DCHECK(result); -@@ -604,7 +604,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -635,7 +635,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa } return std::make_unique<ExternalVkImageGlRepresentation>( manager, this, tracker, texture_, texture_->service_id()); @@ -54,7 +54,7 @@ #error Unsupported OS #endif } -@@ -630,7 +630,7 @@ ExternalVkImageBacking::ProduceSkia( +@@ -661,7 +661,7 @@ ExternalVkImageBacking::ProduceSkia( tracker); } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h index e82d53b5eeb2..1f4ed9272719 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.h.orig 2019-10-21 19:06:34 UTC +--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2019-12-16 21:51:26 UTC +++ gpu/command_buffer/service/external_vk_image_backing.h -@@ -133,7 +133,7 @@ class ExternalVkImageBacking : public SharedImageBacki +@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag base::Optional<DawnTextureFormat> dawn_format, base::Optional<uint32_t> memory_type_index); diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc index dbe368005b49..d5bad6f7d4b8 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-09-09 21:55:18 UTC +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-12-16 21:51:26 UTC +++ gpu/command_buffer/service/external_vk_image_gl_representation.cc -@@ -183,7 +183,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph +@@ -189,7 +189,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph #if defined(OS_FUCHSIA) NOTIMPLEMENTED_LOG_ONCE(); return 0; @@ -9,7 +9,7 @@ if (handle.vk_handle_type() != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { DLOG(ERROR) << "Importing semaphore handle of unexpected type:" -@@ -198,7 +198,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph +@@ -204,7 +204,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph fd.release()); return gl_semaphore; 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 b63daae1819f..5690afc6a34e 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-10-21 19:06:35 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-12-16 21:50:48 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" @@ -36,16 +36,16 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -110,7 +110,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo +@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo #elif defined(USE_OZONE) - return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( - format, usage); + return ui::OzonePlatform::GetInstance()->IsNativePixmapConfigSupported(format, + usage); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return false; // TODO(julian.isorce): Add linux support. #elif defined(OS_WIN) switch (usage) { -@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -168,7 +168,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 b65940f54b45..dc652a126740 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,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-12-16 21:50:48 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" @@ -18,7 +18,7 @@ gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } -@@ -61,7 +61,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { +@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { GpuMemoryBufferImpl::DestructionCallback callback); private: 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 2f59e8f820e1..44352af84a72 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-10-21 19:06:35 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-12-16 21:51:26 UTC +++ gpu/ipc/service/gpu_init.cc @@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif @@ -45,7 +45,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -304,14 +304,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && use_swiftshader && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -62,25 +62,25 @@ } if (!gl_initialized) gl_initialized = gl::init::InitializeGLNoExtensionsOneOff(); -@@ -337,7 +337,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - command_line, gpu_feature_info_, - gpu_preferences_.disable_software_rasterizer, false); - if (use_swiftshader) { +@@ -314,7 +314,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + command_line, gpu_feature_info_, + gpu_preferences_.disable_software_rasterizer, false); + if (use_swiftshader) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " - << "on Linux"; - return false; -@@ -348,7 +348,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - << "failed"; + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; return false; - } +@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + << "failed"; + return false; + } -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - } - } - -@@ -377,7 +377,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } else { // use_swiftshader == true + switch (gpu_preferences_.use_vulkan) { +@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -89,7 +89,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. -@@ -396,7 +396,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -98,7 +98,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -569,7 +569,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -107,7 +107,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -589,7 +589,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index bdfa06c97b69..a46b6a6fc7df 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,52 +1,42 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-10-21 19:06:35 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-12-16 21:51:26 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000; +@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000; + const int kGpuTimeout = 10000; #endif - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); -+#endif - const unsigned char text[20] = "check"; #endif - -@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -59,7 +59,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + arm_cpu_time_(), + #endif + suspension_counter_(this) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) , - display_(nullptr), - window_(0), -- atom_(x11::None), -+ atom_(x11::None) -+#if !defined(OS_BSD) -+ , host_tty_(-1) #endif -+#endif - { - base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); - -@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -76,7 +76,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + DCHECK(result); #endif - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); -+#endif - SetupXServer(); + host_tty_ = GetActiveTTY(); #endif - base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -231,8 +238,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { +@@ -222,7 +222,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { + base::PowerMonitor::RemoveObserver(this); - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) if (tty_file_) fclose(tty_file_); -+#endif - if (display_) { - DCHECK(window_); - XDestroyWindow(display_, window_); -@@ -432,7 +441,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR + #endif +@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif @@ -55,17 +45,7 @@ // Don't crash if we're not on the TTY of our host X11 server. int active_tty = GetActiveTTY(); if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) { -@@ -516,7 +525,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() { - CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); - atom_ = XInternAtom(display_, "CHECK", x11::False); - } -+#if !defined(OS_BSD) - host_tty_ = GetActiveTTY(); -+#endif - } - - void GpuWatchdogThreadImplV1::SetupXChangeProp() { -@@ -616,7 +627,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT +@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index fc2b8198864d..88381d68d415 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,13 +1,20 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-10-21 19:06:35 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-12-16 21:51:26 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -234,8 +234,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 - XDisplay* display_; - gfx::AcceleratedWidget window_; - XAtom atom_; -+#if !defined(OS_BSD) +@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::ThreadTicks GetWatchedThreadTime(); + #endif + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) + int GetActiveTTY() const; + #endif + +@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::Time check_time_; + base::TimeTicks check_timeticks_; + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) FILE* tty_file_; int host_tty_; -+#endif #endif - - base::WeakPtrFactory<GpuWatchdogThreadImplV1> weak_factory_{this}; diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 4452f797874e..ff5fd1185a79 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-10-21 19:06:35 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-12-16 21:50:48 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -731,7 +731,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -772,7 +772,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -750,9 +750,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -791,9 +791,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } @@ -21,7 +21,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -763,7 +763,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -813,7 +813,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index a71c10e135b4..e5514a4712ac 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-10-21 19:06:35 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-12-16 21:50:48 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -170,14 +170,14 @@ struct VulkanFunctionPointers { +@@ -178,15 +178,15 @@ struct VulkanFunctionPointers { vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr; #endif // defined(OS_ANDROID) @@ -14,12 +14,13 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; + PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_FUCHSIA) PFN_vkImportSemaphoreZirconHandleFUCHSIA -@@ -356,16 +356,16 @@ struct VulkanFunctionPointers { +@@ -374,18 +374,18 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif // defined(OS_ANDROID) @@ -35,6 +36,8 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn + #define vkGetMemoryFdPropertiesKHR \ + gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || 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 c53d2905d4d9..4e7a407d6419 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 2019-10-21 19:06:35 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-12-16 21:51:26 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -165,7 +165,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -166,7 +166,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } @@ -9,7 +9,7 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -176,7 +176,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -177,7 +177,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index 3a9227d121c4..f567f0d622bc 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-10-21 19:06:35 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-12-16 21:51:26 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -33,7 +33,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C ::storage::OptionalQuotaSettingsCallback callback) override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 7b601ded02ee..dbae7f502c62 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2019-10-21 19:06:35 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-12-16 21:51:26 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -25,7 +25,7 @@ namespace headless { +@@ -26,7 +26,7 @@ namespace headless { namespace { @@ -9,7 +9,7 @@ static char kProductName[] = "HeadlessChrome"; #endif -@@ -55,7 +55,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic +@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic return traffic_annotation; } @@ -18,7 +18,7 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -195,7 +195,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM +@@ -197,7 +197,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( base::ThreadTaskRunnerHandle::Get()); } diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 935d75382d24..147a9a28ee90 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2019-09-09 21:55:20 UTC +--- ipc/ipc_channel.h.orig 2019-12-16 21:51:27 UTC +++ ipc/ipc_channel.h -@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -280,7 +280,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 83e7e79932aa..8ab68faa5888 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_channel_mojo.cc.orig 2019-12-16 21:51:27 UTC +++ ipc/ipc_channel_mojo.cc -@@ -64,10 +64,10 @@ class MojoChannelFactory : public ChannelFactory { +@@ -65,10 +65,10 @@ class MojoChannelFactory : public ChannelFactory { }; base::ProcessId GetSelfPID() { diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index a392b92a41a0..a1fb2539e4f8 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,7 +1,7 @@ ---- media/audio/BUILD.gn.orig 2019-09-09 21:55:20 UTC +--- media/audio/BUILD.gn.orig 2019-12-16 21:51:27 UTC +++ media/audio/BUILD.gn -@@ -234,8 +234,18 @@ source_set("audio") { - deps += [ "//media/base/android:media_jni_headers" ] +@@ -250,8 +250,18 @@ source_set("audio") { + ] } - if (is_linux) { diff --git a/www/chromium/files/patch-media_audio_pulse_pulse.sigs b/www/chromium/files/patch-media_audio_pulse_pulse.sigs deleted file mode 100644 index 3d31bd187348..000000000000 --- a/www/chromium/files/patch-media_audio_pulse_pulse.sigs +++ /dev/null @@ -1,143 +0,0 @@ -gen/media/audio/pulse/pulse_stubs.cc:155:27: error: conflicting types for 'pa_context_get_state' -extern pa_context_state_t pa_context_get_state(pa_context* c) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here -pa_context_state_t pa_context_get_state(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:156:21: error: conflicting types for 'pa_context_get_state' -pa_context_state_t pa_context_get_state(pa_context* c) { - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here -pa_context_state_t pa_context_get_state(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:171:29: error: conflicting types for 'pa_operation_get_state' -extern pa_operation_state_t pa_operation_get_state(pa_operation* o) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here -pa_operation_state_t pa_operation_get_state(const pa_operation *o); - ^ -gen/media/audio/pulse/pulse_stubs.cc:172:23: error: conflicting types for 'pa_operation_get_state' -pa_operation_state_t pa_operation_get_state(pa_operation* o) { - ^ -../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here -pa_operation_state_t pa_operation_get_state(const pa_operation *o); - ^ -gen/media/audio/pulse/pulse_stubs.cc:211:17: error: conflicting types for 'pa_stream_get_device_index' -extern uint32_t pa_stream_get_device_index(pa_stream* s) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here -uint32_t pa_stream_get_device_index(const pa_stream *s); - ^ -gen/media/audio/pulse/pulse_stubs.cc:212:11: error: conflicting types for 'pa_stream_get_device_index' -uint32_t pa_stream_get_device_index(pa_stream* s) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here -uint32_t pa_stream_get_device_index(const pa_stream *s); - ^ -gen/media/audio/pulse/pulse_stubs.cc:219:26: error: conflicting types for 'pa_stream_get_state' -extern pa_stream_state_t pa_stream_get_state(pa_stream* p) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here -pa_stream_state_t pa_stream_get_state(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:220:20: error: conflicting types for 'pa_stream_get_state' -pa_stream_state_t pa_stream_get_state(pa_stream* p) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here -pa_stream_state_t pa_stream_get_state(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:235:12: error: conflicting types for 'pa_proplist_contains' -extern int pa_proplist_contains(pa_proplist* p, const char* key) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here -int pa_proplist_contains(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:236:6: error: conflicting types for 'pa_proplist_contains' -int pa_proplist_contains(pa_proplist* p, const char* key) { - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here -int pa_proplist_contains(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:243:20: error: conflicting types for 'pa_proplist_gets' -extern const char* pa_proplist_gets(pa_proplist* p, const char* key) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here -const char *pa_proplist_gets(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:244:14: error: conflicting types for 'pa_proplist_gets' -const char* pa_proplist_gets(pa_proplist* p, const char* key) { - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here -const char *pa_proplist_gets(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:251:15: error: conflicting types for 'pa_stream_readable_size' -extern size_t pa_stream_readable_size(pa_stream *p) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here -size_t pa_stream_readable_size(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:252:9: error: conflicting types for 'pa_stream_readable_size' -size_t pa_stream_readable_size(pa_stream *p) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here -size_t pa_stream_readable_size(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:279:12: error: conflicting types for 'pa_context_errno' -extern int pa_context_errno(pa_context *c) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here -int pa_context_errno(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:280:6: error: conflicting types for 'pa_context_errno' -int pa_context_errno(pa_context *c) { - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here -int pa_context_errno(const pa_context *c); - ^ - ---- media/audio/pulse/pulse.sigs.orig 2019-03-19 08:52:48 UTC -+++ media/audio/pulse/pulse.sigs -@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_c - pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); - pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); - pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); --pa_context_state_t pa_context_get_state(pa_context* c); -+pa_context_state_t pa_context_get_state(const pa_context *c); - pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); - pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); - void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); --pa_operation_state_t pa_operation_get_state(pa_operation* o); -+pa_operation_state_t pa_operation_get_state(const pa_operation* o); - void pa_context_unref(pa_context* c); - void pa_operation_unref(pa_operation* o); - int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); -@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_s - int pa_stream_disconnect(pa_stream* s); - int pa_stream_drop(pa_stream *p); - pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); --uint32_t pa_stream_get_device_index(pa_stream* s); -+uint32_t pa_stream_get_device_index(const pa_stream* s); - int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); --pa_stream_state_t pa_stream_get_state(pa_stream* p); -+pa_stream_state_t pa_stream_get_state(const pa_stream* p); - pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); - pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); - pa_proplist* pa_proplist_new(void); --int pa_proplist_contains(pa_proplist* p, const char* key); -+int pa_proplist_contains(const pa_proplist* p, const char* key); - void pa_proplist_free(pa_proplist* p); --const char* pa_proplist_gets(pa_proplist* p, const char* key); -+const char* pa_proplist_gets(const pa_proplist* p, const char* key); - int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); --size_t pa_stream_readable_size(pa_stream *p); -+size_t pa_stream_readable_size(const pa_stream *p); - int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); - void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); - void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); - int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); - void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); - void pa_stream_unref(pa_stream* s); --int pa_context_errno(pa_context *c); -+int pa_context_errno(const pa_context *c); - const char* pa_strerror(int error); - pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 2bfb638cddcc..430d0f3c5bb5 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2019-10-21 19:06:36 UTC +--- media/base/video_frame.cc.orig 2019-12-16 21:50:49 UTC +++ media/base/video_frame.cc -@@ -52,7 +52,7 @@ static std::string StorageTypeToString( +@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -67,7 +67,7 @@ static std::string StorageTypeToString( +@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -185,7 +185,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -203,7 +203,7 @@ class VideoFrame::DmabufHolder +@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -468,7 +468,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva +@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,17 +45,17 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -604,7 +604,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK(frame.dmabuf_fds_); + DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_; -@@ -911,7 +911,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const - return mailbox_holders_[texture_index]; + wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; +@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const + : mailbox_holders_[texture_index]; } -#if defined(OS_LINUX) @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -986,7 +986,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1133,7 +1133,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 ebe7e4653e35..3e67bea9ce3d 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2019-10-21 19:06:36 UTC +--- media/base/video_frame.h.orig 2019-12-16 21:50:49 UTC +++ media/base/video_frame.h @@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -10,9 +10,9 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - namespace media { - -@@ -76,7 +76,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + namespace gfx { + class GpuMemoryBuffer; +@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. @@ -21,8 +21,8 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -229,7 +229,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - uint8_t* a_data, +@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); -#if defined(OS_LINUX) @@ -30,7 +30,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -444,7 +444,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -39,9 +39,9 @@ // 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 -@@ -630,7 +630,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - base::UnsafeSharedMemoryRegion owned_shm_region_; - base::WritableSharedMemoryMapping owned_shm_mapping_; +@@ -662,7 +662,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_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 9b577f3fb656..76d95eebd304 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-10-21 19:06:36 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-12-16 21:50:49 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -205,7 +205,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { device_descriptors->emplace_back( base::StringPrintf("fake_device_%d", entry_index), entry.device_id, diff --git a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc deleted file mode 100644 index 1956355946a5..000000000000 --- a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-06-04 18:55:25 UTC -+++ media/capture/video/mock_gpu_memory_buffer_manager.cc -@@ -115,7 +115,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe - gfx::GpuMemoryBufferHandle handle; - handle.type = gfx::NATIVE_PIXMAP; - handle.id = handle_.id; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - handle.native_pixmap_handle = - gfx::CloneHandleForIPC(handle_.native_pixmap_handle); - #endif diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc index 8fa1201d0fe5..7dcb8b174ae1 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-10-21 19:06:36 UTC +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-12-16 21:50:49 UTC +++ media/capture/video/video_capture_buffer_pool_impl.cc -@@ -57,7 +57,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi +@@ -59,7 +59,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi int buffer_id) { // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 5b0c0f57fbe2..b36124fab651 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2019-10-21 19:06:36 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-12-16 21:50:49 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -301,7 +301,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -297,7 +297,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc new file mode 100644 index 000000000000..7f3005140bd8 --- /dev/null +++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc @@ -0,0 +1,48 @@ +--- media/gpu/buffer_validation.cc.orig 2019-12-17 19:41:51 UTC ++++ media/gpu/buffer_validation.cc +@@ -12,15 +12,15 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/gpu_memory_buffer.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/types.h> + #include <unistd.h> +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace media { + + bool GetFileSize(const int fd, size_t* size) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (fd < 0) { + VLOGF(1) << "Invalid file descriptor"; + return false; +@@ -46,7 +46,7 @@ bool GetFileSize(const int fd, size_t* size) { + #else + NOTIMPLEMENTED(); + return false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format, +@@ -56,7 +56,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm + VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type; + return false; + } +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); + if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || + num_planes == 0) { +@@ -108,7 +108,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm + #else + NOTIMPLEMENTED(); + return false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + } // namespace media diff --git a/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc index 083e80e8e001..b2313a9e7610 100644 --- a/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc +++ b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc @@ -1,6 +1,6 @@ ---- media/gpu/libyuv_image_processor.cc.orig 2019-07-29 19:24:17 UTC +--- media/gpu/libyuv_image_processor.cc.orig 2019-12-16 21:51:27 UTC +++ media/gpu/libyuv_image_processor.cc -@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce +@@ -78,7 +78,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce // LibYUVImageProcessor supports only memory-based video frame for input. VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; for (auto input_type : input_config.preferred_storage_types) { @@ -8,8 +8,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) if (input_type == VideoFrame::STORAGE_DMABUFS) { video_frame_mapper = VideoFrameMapperFactory::CreateMapper( - input_config.layout.format(), true); -@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce + input_config.fourcc.ToVideoPixelFormat(), true); +@@ -87,7 +87,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce break; } } @@ -18,7 +18,7 @@ if (VideoFrame::IsStorageTypeMappable(input_type)) { input_storage_type = input_type; -@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V +@@ -186,7 +186,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V FrameReadyCB cb) { DCHECK(process_thread_.task_runner()->BelongsToCurrentThread()); DVLOGF(4); @@ -27,7 +27,7 @@ if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { DCHECK_NE(video_frame_mapper_.get(), nullptr); input_frame = video_frame_mapper_->Map(std::move(input_frame)); -@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V +@@ -196,7 +196,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V return; } } diff --git a/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc index 2e98aabb9abc..0b7e92097b36 100644 --- a/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc +++ b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc @@ -1,20 +1,45 @@ ---- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-09-09 21:55:20 UTC +--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-12-16 21:51:27 UTC +++ media/gpu/linux/platform_video_frame_utils.cc -@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle - DCHECK(video_frame); +@@ -19,16 +19,16 @@ + #include "ui/gfx/linux/native_pixmap_dmabuf.h" + #include "ui/gfx/native_pixmap.h" - gfx::GpuMemoryBufferHandle handle; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - handle.type = gfx::NATIVE_PIXMAP; - - std::vector<base::ScopedFD> duped_fds = -@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle - } - #else - NOTREACHED(); + #include "gpu/ipc/common/gpu_client_ids.h" + #include "gpu/ipc/service/gpu_memory_buffer_factory.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - return handle; + + namespace media { + + namespace { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + scoped_refptr<VideoFrame> CreateVideoFrameGpu( + gpu::GpuMemoryBufferFactory* factory, +@@ -92,7 +92,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu( + gpu::kPlatformVideoFramePoolClientId)); + return frame; } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + } // namespace +@@ -104,11 +104,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame( + const gfx::Size& natural_size, + base::TimeDelta timestamp, + gfx::BufferUsage buffer_usage) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return CreateVideoFrameGpu(gpu_memory_buffer_factory, pixel_format, + coded_size, visible_rect, natural_size, timestamp, + buffer_usage); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + NOTREACHED(); + return nullptr; + } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 3b1ec33b29a8..e3536e2a001d 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 2019-07-24 18:58:30 UTC +--- media/media_options.gni.orig 2019-12-16 21:51:27 UTC +++ media/media_options.gni -@@ -110,6 +110,9 @@ declare_args() { +@@ -117,6 +117,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc index 5c55600fa7d3..12437985f368 100644 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -1,4 +1,4 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-09-16 09:54:00 UTC +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-12-16 21:51:27 UTC +++ media/mojo/clients/mojo_video_encode_accelerator.cc @@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< frame->layout().num_planes()); @@ -6,6 +6,6 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF + // in VideoEncodeAccelerator. if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { - DCHECK(frame->HasDmaBufs()); - vea_->Encode( 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 69a3cfca2fdc..1bdde4d999b0 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-10-30 16:06:07 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-12-16 21:51:27 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -52,7 +52,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +@@ -56,7 +56,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( mojo_frame->PlaneOffset(media::VideoFrame::kVPlane))); } @@ -9,7 +9,7 @@ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { std::vector<mojo::ScopedHandle> dmabuf_fds; -@@ -145,7 +145,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -157,7 +157,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, shared_buffer_data.u_offset(), shared_buffer_data.v_offset(), shared_buffer_data.y_stride(), shared_buffer_data.u_stride(), shared_buffer_data.v_stride(), timestamp); diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc index 52b8e1fb7342..94f685b83da3 100644 --- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -1,4 +1,4 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-10-21 19:06:36 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-12-16 21:51:27 UTC +++ media/mojo/services/gpu_mojo_media_client.cc @@ -65,7 +65,7 @@ namespace media { namespace { @@ -9,7 +9,7 @@ gpu::CommandBufferStub* GetCommandBufferStub( scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, -@@ -245,7 +245,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea +@@ -265,7 +265,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea command_buffer_id->route_id)); } diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc new file mode 100644 index 000000000000..684c9adbd4b4 --- /dev/null +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -0,0 +1,47 @@ +--- media/video/fake_gpu_memory_buffer.cc.orig 2019-12-17 19:43:52 UTC ++++ media/video/fake_gpu_memory_buffer.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/types.h> +@@ -44,7 +44,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB + + } // namespace + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::ScopedFD GetDummyFD() { + base::ScopedFD fd(open("/dev/zero", O_RDWR)); + DCHECK(fd.is_valid()); +@@ -67,7 +67,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + // Set a dummy id since this is for testing only. + handle_.id = gfx::GpuMemoryBufferId(0); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Set a dummy fd since this is for testing only. + handle_.native_pixmap_handle.planes.push_back( + gfx::NativePixmapPlane(size_.width(), 0, y_plane_size, GetDummyFD())); +@@ -76,7 +76,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + size_.width(), handle_.native_pixmap_handle.planes[0].size, + uv_plane_size, GetDummyFD())); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + FakeGpuMemoryBuffer::~FakeGpuMemoryBuffer() = default; +@@ -135,7 +135,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH + gfx::GpuMemoryBufferHandle handle; + handle.type = gfx::NATIVE_PIXMAP; + handle.id = handle_.id; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + handle.native_pixmap_handle = + gfx::CloneHandleForIPC(handle_.native_pixmap_handle); + #endif 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 efc1b9058d2f..9a13778fa1c8 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-10-21 19:06:37 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-12-16 21:51:27 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -555,7 +555,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -557,7 +557,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-media_webrtc_webrtc__switches.cc b/www/chromium/files/patch-media_webrtc_webrtc__switches.cc new file mode 100644 index 000000000000..3520b131c7aa --- /dev/null +++ b/www/chromium/files/patch-media_webrtc_webrtc__switches.cc @@ -0,0 +1,18 @@ +--- media/webrtc/webrtc_switches.cc.orig 2019-12-17 19:45:42 UTC ++++ media/webrtc/webrtc_switches.cc +@@ -44,7 +44,7 @@ namespace media { + + bool IsWebRtcApmInAudioServiceEnabled() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService) && + !base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForceDisableWebRtcApmInAudioService); +@@ -53,4 +53,4 @@ bool IsWebRtcApmInAudioServiceEnabled() { + #endif + } + +-} // namespace media +\ No newline at end of file ++} // namespace media diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 34bf5ce73ee3..f4eb85e4b74c 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 2019-10-21 19:06:38 UTC +--- net/BUILD.gn.orig 2019-12-16 21:51:27 UTC +++ net/BUILD.gn @@ -105,7 +105,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1924,7 +1924,7 @@ component("net") { +@@ -1938,7 +1938,7 @@ component("net") { } } @@ -18,7 +18,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1957,7 +1957,7 @@ component("net") { +@@ -1971,7 +1971,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -27,7 +27,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2051,6 +2051,16 @@ component("net") { +@@ -2065,6 +2065,16 @@ component("net") { ] sources -= [ "disk_cache/blockfile/file_posix.cc" ] diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 58b31b6a4e54..0a8fc3b546d7 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.cc.orig 2019-06-04 18:55:26 UTC +--- net/base/address_tracker_linux.cc.orig 2019-12-16 21:51:27 UTC +++ net/base/address_tracker_linux.cc @@ -21,96 +21,10 @@ namespace net { @@ -123,15 +123,15 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer, +@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { +#if !defined(OS_FREEBSD) DCHECK(buffer); - for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer); - NLMSG_OK(header, length); -@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer, + for (const struct nlmsghdr* header = + reinterpret_cast<const struct nlmsghdr*>(buffer); +@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu break; } } diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 06f21dda1b32..03836e318036 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,24 +1,24 @@ ---- net/base/network_change_notifier.cc.orig 2019-10-21 19:06:38 UTC +--- net/base/network_change_notifier.cc.orig 2019-12-16 21:51:27 UTC +++ net/base/network_change_notifier.cc @@ -35,7 +35,7 @@ #include "net/base/network_change_notifier_linux.h" #elif defined(OS_MACOSX) #include "net/base/network_change_notifier_mac.h" --#elif defined(OS_CHROMEOS) -+#elif defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include "net/base/network_change_notifier_posix.h" #elif defined(OS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -224,7 +224,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo - // Android builds MUST use their own class factory. - CHECK(false); - return NULL; +@@ -240,7 +240,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + // service in a separate process. + return std::make_unique<NetworkChangeNotifierPosix>(initial_type, + initial_subtype); -#elif defined(OS_CHROMEOS) +#elif defined(OS_CHROMEOS) || defined(OS_BSD) - return std::make_unique<NetworkChangeNotifierPosix>(CONNECTION_NONE, - SUBTYPE_NONE); + return std::make_unique<NetworkChangeNotifierPosix>(initial_type, + initial_subtype); #elif defined(OS_LINUX) -@@ -236,7 +236,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -252,7 +252,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo return std::make_unique<NetworkChangeNotifierFuchsia>( 0 /* required_features */); #else diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc index 927b8a2395d8..6b1297662465 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 2019-10-21 19:06:38 UTC +--- net/socket/socket_posix.cc.orig 2019-12-16 21:51:27 UTC +++ net/socket/socket_posix.cc -@@ -520,7 +520,7 @@ void SocketPosix::ReadCompleted() { +@@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 34788bd112d1..4f85194037f2 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-07-24 18:58:33 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-12-16 21:51:27 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -28,7 +28,7 @@ +@@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -49,7 +49,7 @@ void SetUpOnNetworkThread( +@@ -50,7 +50,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index ae4dbd8aed29..630beac772f9 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 2019-10-21 19:06:39 UTC +--- net/url_request/url_request_context_builder.cc.orig 2019-12-16 21:51:27 UTC +++ net/url_request/url_request_context_builder.cc -@@ -519,7 +519,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -496,7 +496,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ProxyResolutionService::CreateSystemProxyConfigService()'s signature // doesn't suck. -@@ -528,7 +528,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -505,7 +505,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 960cf2518204..35162736d517 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 2019-10-21 19:06:39 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2019-12-16 21:51:27 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -53,7 +53,7 @@ +@@ -52,7 +52,7 @@ #include "ui/gfx/geometry/rect.h" #include "v8/include/v8.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -378,7 +378,7 @@ bool InitializeSDK(bool enable_v8) { +@@ -377,7 +377,7 @@ void InitializeSDK(bool enable_v8) { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -414,7 +414,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -411,7 +411,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 -@@ -870,7 +870,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -867,7 +867,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2696,7 +2696,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2798,7 +2798,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); @@ -45,7 +45,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3190,7 +3190,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3292,7 +3292,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py index 0818e1bf8f0e..0795067ee45f 100644 --- a/www/chromium/files/patch-printing_cups__config__helper.py +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -1,11 +1,11 @@ ---- printing/cups_config_helper.py.orig 2019-03-11 22:01:01 UTC +--- printing/cups_config_helper.py.orig 2019-12-16 21:50:51 UTC +++ printing/cups_config_helper.py -@@ -65,7 +65,7 @@ def main(): +@@ -67,7 +67,7 @@ def main(): mode = sys.argv[1] if len(sys.argv) > 2 and sys.argv[2]: sysroot = sys.argv[2] - cups_config = os.path.join(sysroot, 'usr', 'bin', 'cups-config') + cups_config = os.path.join(sysroot, 'bin', 'cups-config') if not os.path.exists(cups_config): - print 'cups-config not found: %s' % cups_config + print('cups-config not found: %s' % cups_config) return 1 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 b40c751440bf..9a6bfc2baca4 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 2019-10-21 19:06:39 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2019-12-16 21:51:27 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -120,13 +120,13 @@ +@@ -121,13 +121,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -161,11 +161,11 @@ const char kApplicationName[] = "chromoting"; +@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -30,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -358,7 +358,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -39,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -555,10 +555,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -560,10 +560,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -52,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -753,7 +753,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -758,7 +758,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -61,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -839,7 +839,7 @@ void HostProcess::StartOnUiThread() { +@@ -844,7 +844,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +70,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -848,7 +848,7 @@ void HostProcess::StartOnUiThread() { +@@ -853,7 +853,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -903,7 +903,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1532,7 +1532,7 @@ void HostProcess::StartHost() { +@@ -1537,7 +1537,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1711,7 +1711,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1718,7 +1718,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index bb30bf66a69f..300d4d21e30a 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,7 +1,7 @@ ---- remoting/resources/remoting_strings.grd.orig 2019-10-30 16:22:45 UTC +--- remoting/resources/remoting_strings.grd.orig 2019-12-16 21:51:27 UTC +++ remoting/resources/remoting_strings.grd -@@ -1332,7 +1332,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. - Not Now +@@ -1366,7 +1366,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. + Open Screen Recording Preferences </message> </if> - <if expr="is_linux"> @@ -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> -@@ -1348,7 +1348,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -1382,7 +1382,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-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 26c527fdff32..5481019bb29f 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2019-06-04 18:55:28 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2019-12-16 21:51:27 UTC +++ services/device/geolocation/location_arbitrator.cc @@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) return nullptr; #else + return device::NewSystemLocationProvider(); 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 09d0ebb1255d..243b64d68e0e 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,4 +1,4 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2019-10-30 16:46:42 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2019-12-17 20:07:49 UTC +++ services/device/hid/hid_service_freebsd.cc @@ -0,0 +1,375 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. @@ -47,7 +47,7 @@ + callback(callback), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( -+ base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)) {} ++ base::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} + ~ConnectParams() {} + + scoped_refptr<HidDeviceInfo> device_info; @@ -297,7 +297,7 @@ +HidServiceFreeBSD::HidServiceFreeBSD() + : task_runner_(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner_( -+ base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)), ++ base::CreateSequencedTaskRunner(kBlockingTaskTraits)), + weak_factory_(this) { + helper_ = std::make_unique<BlockingTaskHelper>(weak_factory_.GetWeakPtr()); + blocking_task_runner_->PostTask( diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc index 7f039a8e8b9a..99c80524d355 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-03-11 22:01:01 UTC +--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-12-16 21:51:27 UTC +++ services/device/time_zone_monitor/time_zone_monitor.cc -@@ -29,7 +29,7 @@ void TimeZoneMonitor::Bind(device::mojom::TimeZoneMoni +@@ -30,7 +30,7 @@ void TimeZoneMonitor::Bind( void TimeZoneMonitor::NotifyClients() { DCHECK(thread_checker_.CalledOnValidThread()); @@ -9,7 +9,7 @@ // On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No // need to redetect it with detectHostTimeZone(). std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault()); -@@ -41,7 +41,7 @@ void TimeZoneMonitor::NotifyClients() { +@@ -42,7 +42,7 @@ void TimeZoneMonitor::NotifyClients() { #else std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone()); #endif diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 7a453e121b53..e2546e4711ab 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2019-10-21 19:06:39 UTC +--- services/network/BUILD.gn.orig 2019-12-16 21:51:27 UTC +++ services/network/BUILD.gn -@@ -261,7 +261,6 @@ jumbo_component("network_service") { +@@ -259,7 +259,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index edaabbba25d3..57dc81189602 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2019-10-21 19:06:39 UTC +--- services/network/network_context.cc.orig 2019-12-16 21:51:27 UTC +++ services/network/network_context.cc -@@ -1776,7 +1776,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -1638,7 +1638,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 14c17717564d..5c304d2b4775 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2019-10-21 19:06:39 UTC +--- services/network/network_service.cc.orig 2019-12-16 21:51:27 UTC +++ services/network/network_service.cc @@ -62,7 +62,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() { +@@ -572,7 +572,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 0fada718f978..f15cb99573a3 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2019-10-21 19:06:39 UTC +--- services/network/network_service.h.orig 2019-12-16 21:51:27 UTC +++ services/network/network_service.h -@@ -152,7 +152,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService mojom::NetworkService::GetNetworkListCallback callback) override; void UpdateCRLSet(base::span<const uint8_t> crl_set) override; void OnCertDBChanged() override; diff --git a/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc b/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc deleted file mode 100644 index a3ad01ccd336..000000000000 --- a/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/sandbox/sandbox_type.cc.orig 2019-03-17 14:36:49 UTC -+++ services/service_manager/sandbox/sandbox_type.cc -@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type - service_manager::features::kXRSandbox); - #endif - case SANDBOX_TYPE_AUDIO: --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return !base::FeatureList::IsEnabled( - service_manager::features::kAudioServiceSandbox); - #else diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc new file mode 100644 index 000000000000..e53e33f56611 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2019-12-17 19:52:52 UTC ++++ services/tracing/public/cpp/perfetto/trace_event_data_source.cc +@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata + #endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD) + } + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 + // about efforts to unify base::TimeTicks across all platforms. + constexpr perfetto::protos::pbzero::ClockSnapshot::Clock::BuiltinClocks diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc index 8a997f235ebd..31c7ab5e263a 100644 --- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc +++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -1,4 +1,4 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2019-10-21 19:06:40 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2019-12-16 21:51:28 UTC +++ services/video_capture/broadcasting_receiver.cc @@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( @@ -9,7 +9,7 @@ // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file // descriptor can be extracted which is then mojo-wrapped. base::subtle::PlatformSharedMemoryRegion platform_region = -@@ -178,7 +178,7 @@ void BroadcastingReceiver::BufferContext:: +@@ -183,7 +183,7 @@ void BroadcastingReceiver::BufferContext:: ConvertRawFileDescriptorToSharedBuffer() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index c44a5b2dd9e5..a454107119c9 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 2019-10-21 19:09:09 UTC +--- third_party/angle/BUILD.gn.orig 2019-12-16 21:56:11 UTC +++ third_party/angle/BUILD.gn -@@ -353,6 +353,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -371,6 +371,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,7 +8,7 @@ ] } } -@@ -1076,10 +1077,6 @@ foreach(is_shared_library, +@@ -1055,10 +1056,6 @@ foreach(is_shared_library, if (is_linux) { sources += util_linux_sources diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index e8b9066cbe12..c1c481f2d4a9 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-10-21 19:09:09 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2019-12-16 21:56:11 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -68,7 +68,7 @@ +@@ -70,7 +70,7 @@ #if defined(ANGLE_ENABLE_VULKAN) # if defined(ANGLE_PLATFORM_WINDOWS) # include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h" # elif defined(ANGLE_PLATFORM_ANDROID) # include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h" -@@ -268,7 +268,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib +@@ -282,7 +282,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib #if defined(ANGLE_ENABLE_VULKAN) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayVkWin32(state); diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 0af92b170d06..4e76dec713f3 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-10-21 19:09:09 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-12-16 21:56:11 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -114,7 +114,7 @@ inline bool IsWindows() +@@ -115,7 +115,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c index 4a95f6891eeb..1dbd38a8b222 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,4 +1,4 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-04-30 22:25:57 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-12-16 21:56:20 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c @@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d } @@ -7,5 +7,5 @@ -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) - static inline char *loader_getenv(const char *name, const struct loader_instance *inst) { - // No allocation of memory necessary for Linux, but we should at least touch + static inline bool IsHighIntegrity() { + return geteuid() != getuid() || getegid() != getgid(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 77877fce819f..f3a3b73cacb5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,15 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-10-21 19:06:43 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-12-16 21:51:28 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -338,7 +338,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos +@@ -152,7 +152,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const + // Disable snapback on desktop Linux to better integrate with the desktop + // behavior. Typically, Linux apps do not implement scrollbar snapback (this + // is true for at least GTK and QT apps). +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return false; + #endif + +@@ -335,7 +335,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { @@ -9,12 +18,3 @@ if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif -@@ -353,7 +353,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin( - // Disable snapback on desktop Linux to better integrate with the desktop - // behavior. Typically, Linux apps do not implement scrollbar snapback (this is - // true for at least GTK and QT apps). --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - return false; - #endif - 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 b28a35f5256b..62e7b64416f3 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,15 +1,6 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2019-10-30 16:30:37 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2019-12-16 21:51:29 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -84,7 +84,7 @@ void LogAudioProcesingProperties( - } // namespace - - bool IsApmInAudioServiceEnabled() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService); - #else - return false; -@@ -427,7 +427,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -421,7 +421,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 15307cd74348..9c1dab685e23 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-09-09 21:55:25 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-12-16 21:51:29 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -103,6 +103,7 @@ executable("character_data_generator") { +@@ -106,6 +106,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index a0a308a3d525..da140611cadc 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-10-21 19:06:44 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-12-16 21:51:29 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -158,7 +158,7 @@ class PLATFORM_EXPORT FontCache { +@@ -162,7 +162,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -9,7 +9,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -233,7 +233,7 @@ class PLATFORM_EXPORT FontCache { +@@ -237,7 +237,7 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -18,7 +18,7 @@ struct PlatformFallbackFont { String name; std::string filename; -@@ -245,7 +245,7 @@ class PLATFORM_EXPORT FontCache { +@@ -249,7 +249,7 @@ class PLATFORM_EXPORT FontCache { static void GetFontForCharacter(UChar32, const char* preferred_locale, PlatformFallbackFont*); @@ -27,7 +27,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache { +@@ -321,12 +321,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -42,8 +42,8 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -355,7 +355,7 @@ class PLATFORM_EXPORT FontCache { - mojom::blink::DWriteFontProxyPtr service_; +@@ -360,7 +360,7 @@ class PLATFORM_EXPORT FontCache { + std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) 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 a9a908549f4d..3c38c7f4dc44 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-12-16 21:50:53 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -38,7 +38,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,9 +9,9 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -223,7 +223,7 @@ FontCacheKey FontDescription::CacheKey( - static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 - static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 +@@ -225,7 +225,7 @@ FontCacheKey FontDescription::CacheKey( + static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 + static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc index 872b2d82c874..1ab0c14a5a4e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-10-21 19:06:45 UTC +--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-12-16 21:50:53 UTC +++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc -@@ -51,12 +51,17 @@ +@@ -50,12 +50,17 @@ #include <objc/objc-auto.h> #endif diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn index 21a9de63e030..8a3c15eac37d 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.gn.orig 2019-04-30 22:23:27 UTC +--- third_party/boringssl/BUILD.gn.orig 2019-12-16 21:51:04 UTC +++ third_party/boringssl/BUILD.gn -@@ -74,7 +74,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { +@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else if (current_cpu == "x64") { if (is_mac) { sources += crypto_sources_mac_x86_64 @@ -9,7 +9,7 @@ sources += crypto_sources_linux_x86_64 } else { public_configs = [ ":no_asm_config" ] -@@ -82,13 +82,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { +@@ -79,13 +79,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else if (current_cpu == "x86") { if (is_mac) { sources += crypto_sources_mac_x86 @@ -25,7 +25,7 @@ sources += crypto_sources_linux_arm } else if (is_ios) { sources += crypto_sources_ios_arm -@@ -96,7 +96,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { +@@ -93,7 +93,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { public_configs = [ ":no_asm_config" ] } } else if (current_cpu == "arm64") { diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 9c0f7a749462..911ec6d61ccd 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,4 +1,4 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-12-16 21:51:05 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc @@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) @@ -25,7 +25,7 @@ }; bool InstallHandlers(const std::vector<int>& signals, -@@ -216,8 +216,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -224,8 +224,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 4ff92b58364b..7091bf7ec791 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-10-21 19:09:14 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-12-16 21:56:17 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h -@@ -40,6 +40,7 @@ +@@ -28,6 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -8,7 +8,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -47,13 +48,15 @@ +@@ -35,13 +36,15 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -25,7 +25,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -61,6 +64,7 @@ +@@ -49,6 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -33,7 +33,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -68,6 +72,7 @@ +@@ -56,6 +60,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -41,7 +41,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -75,6 +80,7 @@ +@@ -63,6 +68,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h index dcf9a2e18e69..a6806cbac266 100644 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,8 +1,8 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-09-09 21:57:02 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-12-16 21:56:18 UTC +++ third_party/skia/src/sksl/SkSLString.h -@@ -13,6 +13,8 @@ - #include <stdarg.h> - #include <string> +@@ -17,6 +17,8 @@ + #include "include/core/SkString.h" + #endif +#include <stdarg.h> + diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn index 3ce2b88ec045..f005770bff8d 100644 --- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn +++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/swiftshader/BUILD.gn.orig 2019-10-21 19:09:15 UTC +--- third_party/swiftshader/BUILD.gn.orig 2019-12-16 21:56:18 UTC +++ third_party/swiftshader/BUILD.gn -@@ -135,9 +135,6 @@ config("swiftshader_config") { +@@ -142,9 +142,6 @@ config("swiftshader_config") { ldflags = [ "-Wl,--gc-sections" ] if (target_cpu == "mipsel") { @@ -10,7 +10,7 @@ if (mips_arch_variant == "r1") { ldflags += [ "-mips32", -@@ -149,11 +146,8 @@ config("swiftshader_config") { +@@ -156,11 +153,8 @@ config("swiftshader_config") { } } else if (target_cpu == "mips64el") { ldflags += [ diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp deleted file mode 100644 index fd8786353d01..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- third_party/swiftshader/src/Yarn/Thread.cpp.orig 2019-10-30 22:22:11 UTC -+++ third_party/swiftshader/src/Yarn/Thread.cpp -@@ -27,6 +27,10 @@ - # include <pthread.h> - # include <mach/thread_act.h> - # include <unistd.h> -+#elif defined(__FreeBSD__) -+# include <pthread.h> -+# include <pthread_np.h> -+# include <unistd.h> - #else - # include <pthread.h> - # include <unistd.h> -@@ -88,6 +92,8 @@ void Thread::setName(const char* fmt, ...) - - #if defined(__APPLE__) - pthread_setname_np(name); -+#elif defined(__FreeBSD__) -+ pthread_set_name_np(pthread_self(), name); - #elif !defined(__Fuchsia__) - pthread_setname_np(pthread_self(), name); - #endif diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp new file mode 100644 index 000000000000..f34425cdd42e --- /dev/null +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp @@ -0,0 +1,11 @@ +--- third_party/swiftshader/third_party/marl/src/memory.cpp.orig 2019-12-22 15:09:53 UTC ++++ third_party/swiftshader/third_party/marl/src/memory.cpp +@@ -19,7 +19,7 @@ + + #include <cstring> + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + #include <sys/mman.h> + #include <unistd.h> + namespace { diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp new file mode 100644 index 000000000000..927560e4f971 --- /dev/null +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp @@ -0,0 +1,22 @@ +--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2019-12-22 15:09:09 UTC ++++ third_party/swiftshader/third_party/marl/src/thread.cpp +@@ -27,6 +27,10 @@ + #include <mach/thread_act.h> + #include <pthread.h> + #include <unistd.h> ++#elif defined(__FreeBSD__) ++#include <pthread.h> ++#include <pthread_np.h> ++#include <unistd.h> + #else + #include <pthread.h> + #include <unistd.h> +@@ -85,6 +89,8 @@ void Thread::setName(const char* fmt, ...) { + + #if defined(__APPLE__) + pthread_setname_np(name); ++#elif defined(__FreeBSD__) ++ pthread_set_name_np(pthread_self(), name); + #elif !defined(__Fuchsia__) + pthread_setname_np(pthread_self(), name); + #endif diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 5ebbde95ddbf..65ab904aec36 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-10-21 19:09:18 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -265,7 +265,7 @@ rtc_source_set("audio_device_impl") { +@@ -263,7 +263,7 @@ rtc_source_set("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 6e2b8acbcd42..e45c76f40a22 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,4 +1,4 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2019-09-09 21:57:05 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/network.cc @@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -9,7 +9,7 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -765,7 +765,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ +@@ -767,7 +767,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN @@ -18,7 +18,7 @@ bool IsDefaultRoute(const std::string& network_name) { FILE* f = fopen("/proc/net/route", "r"); if (!f) { -@@ -808,7 +808,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo +@@ -810,7 +810,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h index 4916dc17b405..46d64c258e37 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h @@ -1,7 +1,7 @@ ---- third_party/webrtc/rtc_base/network.h.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/network.h.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/network.h -@@ -25,6 +25,10 @@ - #include "rtc_base/network_monitor.h" +@@ -26,6 +26,10 @@ + #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" +#if defined(WEBRTC_BSD) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 5059d15f5f57..9d0e6fdcc5fd 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-09-09 21:57:05 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,11 @@ #include "rtc_base/platform_thread_types.h" @@ -27,9 +27,9 @@ void SetCurrentThreadName(const char* name) { +#if !defined(__FreeBSD__) #if defined(WEBRTC_WIN) - struct { - DWORD dwType; -@@ -74,6 +81,7 @@ void SetCurrentThreadName(const char* name) { + // For details see: + // https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code +@@ -81,6 +88,7 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_base_files_file__posix.cc index b96ca30305db..fbc622d301be 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_posix.cc.orig 2019-03-11 22:12:13 UTC +--- tools/gn/base/files/file_posix.cc.orig 2019-12-16 21:58:04 UTC +++ tools/gn/base/files/file_posix.cc -@@ -414,7 +414,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +@@ -409,7 +409,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util.h b/www/chromium/files/patch-tools_gn_base_files_file__util.h index 142ec10db26a..f7fcdd6e92f3 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__util.h +++ b/www/chromium/files/patch-tools_gn_base_files_file__util.h @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_util.h.orig 2019-06-04 19:02:25 UTC +--- tools/gn/base/files/file_util.h.orig 2019-12-16 21:58:04 UTC +++ tools/gn/base/files/file_util.h -@@ -361,7 +361,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& +@@ -360,7 +360,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& // the directory |path|, in the number of FilePath::CharType, or -1 on failure. int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc b/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc index 32498b74dcef..b8972e166d3b 100644 --- a/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc +++ b/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc @@ -1,7 +1,7 @@ ---- tools/gn/base/files/file_util_posix.cc.orig 2019-06-04 19:02:25 UTC +--- tools/gn/base/files/file_util_posix.cc.orig 2019-12-16 21:58:04 UTC +++ tools/gn/base/files/file_util_posix.cc -@@ -254,7 +254,7 @@ bool ReplaceFile(const FilePath& from_path, - #endif // !defined(OS_NACL_NONSFI) +@@ -250,7 +250,7 @@ bool ReplaceFile(const FilePath& from_path, + } bool CreateLocalNonBlockingPipe(int fds[2]) { -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index e40888be26ac..725f8e87f00b 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2019-09-09 21:59:05 UTC +--- tools/gn/build/gen.py.orig 2019-12-16 21:58:04 UTC +++ tools/gn/build/gen.py @@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): @@ -10,7 +10,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -337,6 +340,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -341,6 +344,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_aix(): cflags_cc.append('-maix64') ldflags.append('-maix64') diff --git a/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc index bd6d48b4274e..fa20ffb97735 100644 --- a/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc +++ b/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc @@ -1,6 +1,6 @@ ---- tools/gn/tools/gn/exec_process.cc.orig 2019-03-11 22:12:13 UTC +--- tools/gn/tools/gn/exec_process.cc.orig 2019-12-16 21:58:04 UTC +++ tools/gn/tools/gn/exec_process.cc -@@ -29,6 +29,10 @@ +@@ -30,6 +30,10 @@ #include "base/posix/file_descriptor_shuffle.h" #endif diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index ff3d4b64bbc7..946d69e1f6bd 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2019-09-09 21:55:45 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-12-16 21:51:33 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -215,6 +215,7 @@ FEATURE_GRAMMAR = ( +@@ -217,6 +217,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', diff --git a/www/chromium/files/patch-tools_json__schema__compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py index f1c67a23e235..054250e781d5 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/model.py.orig 2019-10-21 19:07:27 UTC +--- tools/json_schema_compiler/model.py.orig 2019-12-16 21:51:07 UTC +++ tools/json_schema_compiler/model.py -@@ -603,7 +603,7 @@ class Platforms(object): +@@ -605,7 +605,7 @@ class Platforms(object): """ CHROMEOS = _PlatformInfo("chromeos") CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 65de83eb7ce4..a19e9cb23da4 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2019-10-21 19:07:28 UTC +--- ui/base/resource/resource_bundle.cc.orig 2019-12-16 21:51:33 UTC +++ ui/base/resource/resource_bundle.cc -@@ -793,7 +793,7 @@ void ResourceBundle::ReloadFonts() { +@@ -818,7 +818,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -846,7 +846,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -871,7 +871,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 65f772826809..ca3fa95632c6 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 2019-10-21 19:07:28 UTC +--- ui/base/ui_base_features.cc.orig 2019-12-16 21:51:33 UTC +++ ui/base/ui_base_features.cc -@@ -112,7 +112,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo +@@ -117,7 +117,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -122,7 +122,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -127,7 +127,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index af2165f69e31..795e446be0fa 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 2019-10-21 19:07:28 UTC +--- ui/base/ui_base_features.h.orig 2019-12-16 21:51:33 UTC +++ ui/base/ui_base_features.h -@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) +@@ -63,10 +63,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 45f0ca83a151..5007c88b639f 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2019-07-24 18:59:19 UTC +--- ui/base/webui/web_ui_util.cc.orig 2019-12-16 21:51:33 UTC +++ ui/base/webui/web_ui_util.cc -@@ -215,7 +215,7 @@ std::string GetFontFamily() { +@@ -227,7 +227,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc new file mode 100644 index 000000000000..e0f2d5d9845d --- /dev/null +++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc @@ -0,0 +1,53 @@ +--- ui/base/x/x11_shm_image_pool_base.cc.orig 2019-12-16 21:51:33 UTC ++++ ui/base/x/x11_shm_image_pool_base.cc +@@ -12,12 +12,17 @@ + + #include "base/bind.h" + #include "base/callback.h" ++#include "base/command_line.h" ++#include "base/environment.h" + #include "base/location.h" ++#include "base/strings/string_util.h" ++#include "base/system/sys_info.h" + #include "base/threading/thread_task_runner_handle.h" + #include "build/build_config.h" + #include "ui/events/platform/platform_event_dispatcher.h" + #include "ui/events/platform/platform_event_source.h" + #include "ui/gfx/geometry/rect.h" ++#include "ui/gfx/x/x11_switches.h" + + namespace ui { + +@@ -39,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold = + 1.0f / (kShmResizeThreshold * kShmResizeThreshold); + + std::size_t MaxShmSegmentSizeImpl() { ++#if defined(OS_BSD) ++ return base::SysInfo::MaxSharedMemorySize(); ++#else + struct shminfo info; + if (shmctl(0, IPC_INFO, reinterpret_cast<struct shmid_ds*>(&info)) == -1) + return 0; + return info.shmmax; ++#endif + } + + std::size_t MaxShmSegmentSize() { +@@ -139,7 +148,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + shmctl(state.shminfo_.shmid, IPC_RMID, 0); + return false; + } +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, a shmid can still be attached after IPC_RMID if otherwise + // kept alive. Detach before XShmAttach to prevent a memory leak in case + // the process dies. +@@ -149,7 +158,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + if (!XShmAttach(display_, &state.shminfo_)) + return false; + state.shmem_attached_to_server_ = true; +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + // The Linux-specific shmctl behavior above may not be portable, so we're + // forced to do IPC_RMID after the server has attached to the segment. + // XShmAttach is asynchronous, so we must also sync. diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc new file mode 100644 index 000000000000..38d3a8fef2d6 --- /dev/null +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.cc.orig 2019-12-17 19:57:24 UTC ++++ ui/compositor/compositor.cc +@@ -681,7 +681,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to + NOTREACHED(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { + for (auto& observer : observer_list_) + observer.OnCompositingCompleteSwapWithNewSize(this, size); diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h new file mode 100644 index 000000000000..5836b5e54476 --- /dev/null +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.h.orig 2019-12-17 19:57:38 UTC ++++ ui/compositor/compositor.h +@@ -412,7 +412,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT + void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override; + void OnFrameTokenChanged(uint32_t frame_token) override; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void OnCompleteSwapWithNewSize(const gfx::Size& size); + #endif + diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h new file mode 100644 index 000000000000..deab6a8328f8 --- /dev/null +++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h @@ -0,0 +1,16 @@ +--- ui/compositor/compositor_observer.h.orig 2019-12-17 19:56:41 UTC ++++ ui/compositor/compositor_observer.h +@@ -42,11 +42,11 @@ class COMPOSITOR_EXPORT CompositorObserver { + // Called when a child of the compositor is resizing. + virtual void OnCompositingChildResizing(Compositor* compositor) {} + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Called when a swap with new size is completed. + virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, + const gfx::Size& size) {} +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Called at the top of the compositor's destructor, to give observers a + // chance to remove themselves. diff --git a/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc b/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc new file mode 100644 index 000000000000..13658e0d74f5 --- /dev/null +++ b/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc @@ -0,0 +1,11 @@ +--- ui/compositor/host/host_context_factory_private.cc.orig 2019-12-17 19:57:59 UTC ++++ ui/compositor/host/host_context_factory_private.cc +@@ -31,7 +31,7 @@ namespace { + + static const char* kBrowser = "Browser"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + class HostDisplayClient : public viz::HostDisplayClient { + public: + explicit HostDisplayClient(ui::Compositor* compositor) diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index d0b9f18103f7..26597a5d4cb2 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,8 +1,8 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2019-09-09 21:55:46 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2019-12-16 21:51:34 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -18,6 +18,10 @@ - #include "base/trace_event/trace_event.h" - #include "ui/gfx/font.h" +@@ -24,6 +24,10 @@ + #include "ui/gfx/linux/fontconfig_util.h" + #include "ui/gfx/platform_font.h" +#if defined(OS_BSD) +#include <unistd.h> diff --git a/www/chromium/files/patch-ui_gfx_font__util.cc b/www/chromium/files/patch-ui_gfx_font__util.cc new file mode 100644 index 000000000000..70270c4ee997 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_font__util.cc @@ -0,0 +1,25 @@ +--- ui/gfx/font_util.cc.orig 2019-12-17 19:58:26 UTC ++++ ui/gfx/font_util.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <fontconfig/fontconfig.h> + #include "ui/gfx/linux/fontconfig_util.h" + #endif +@@ -24,11 +24,11 @@ void InitializeFonts() { + // background (resources have not yet been granted to cast) since it prevents + // the long delay the user would have seen on first rendering. + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Ensures the config is created on this thread. + FcConfig* config = GetGlobalFontConfig(); + DCHECK(config); +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + #if defined(OS_WIN) + gfx::win::InitializeDirectWrite(); diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc new file mode 100644 index 000000000000..fe42d4a3bace --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -0,0 +1,11 @@ +--- ui/gfx/gpu_memory_buffer.cc.orig 2019-12-17 19:59:38 UTC ++++ ui/gfx/gpu_memory_buffer.cc +@@ -28,7 +28,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c + handle.region = region.Duplicate(); + handle.offset = offset; + handle.stride = stride; +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); + #elif defined(OS_MACOSX) && !defined(OS_IOS) + NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index 59df797b1892..bfcceafd65b3 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2019-12-16 21:51:34 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/rect.h" @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #elif defined(OS_MACOSX) && !defined(OS_IOS) #include "ui/gfx/mac/io_surface.h" -@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -66,7 +66,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset; int32_t stride; diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index 049249cc0c7b..9ee674c3c2d9 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-12-16 21:51:34 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,8 +10,8 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -24,11 +26,7 @@ - #include "build/build_config.h" +@@ -25,11 +27,7 @@ + #include "ui/gfx/buffer_format_util.h" #include "ui/gfx/switches.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h index e46e05f72256..b7e56d150e01 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2019-10-30 16:35:23 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2019-12-16 21:51:08 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.h -@@ -191,7 +191,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV +@@ -194,7 +194,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV } }; @@ -9,7 +9,7 @@ template <> struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane> { -@@ -217,7 +217,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData +@@ -220,7 +220,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData return pixmap_handle.planes; } @@ -18,7 +18,7 @@ static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } -@@ -241,7 +241,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData +@@ -244,7 +244,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 72b9e5d93a7b..122dd00768f5 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2019-10-21 19:07:29 UTC +--- ui/gl/BUILD.gn.orig 2019-12-16 21:51:34 UTC +++ ui/gl/BUILD.gn -@@ -219,7 +219,7 @@ jumbo_component("gl") { +@@ -221,7 +221,7 @@ jumbo_component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index bff2d801541a..bbfb66a584ba 100644 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2019-10-21 19:07:29 UTC +--- ui/gl/generate_bindings.py.orig 2019-12-16 21:51:34 UTC +++ ui/gl/generate_bindings.py -@@ -2721,6 +2721,9 @@ GLX_FUNCTIONS = [ +@@ -2738,6 +2738,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc index b20f9ea44fb1..c956037fa3f1 100644 --- a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc +++ b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_surface_glx.cc.orig 2019-09-09 21:55:47 UTC +--- ui/gl/gl_surface_glx.cc.orig 2019-12-16 21:51:34 UTC +++ ui/gl/gl_surface_glx.cc -@@ -461,7 +461,10 @@ bool GLSurfaceGLX::InitializeOneOff() { +@@ -459,7 +459,10 @@ bool GLSurfaceGLX::InitializeOneOff() { return false; } diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc index 1a3714f271c0..7037f8a47604 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-09-09 21:55:47 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-12-16 21:51:34 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -106,7 +106,7 @@ void MessagePopupView::AutoCollapse() { +@@ -101,7 +101,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.z_order = ui::ZOrderLevel::kFloatingWindow; 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 92f14ec28563..994ab5278ef1 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 2019-10-21 19:07:29 UTC +--- ui/native_theme/native_theme_base.cc.orig 2019-12-16 21:51:34 UTC +++ ui/native_theme/native_theme_base.cc -@@ -177,7 +177,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -212,7 +212,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: PaintCheckbox(canvas, state, rect, extra.button, color_scheme); break; diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 6634a4c3e4e4..ba78bfb430b6 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2019-10-21 19:07:29 UTC +--- ui/views/controls/label.cc.orig 2019-12-16 21:51:34 UTC +++ ui/views/controls/label.cc -@@ -691,7 +691,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -876,7 +876,7 @@ bool Label::PasteSelectionClipboard() { +@@ -874,7 +874,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 09f8ad21f575..af036b2cf5d1 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 2019-10-21 19:07:29 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2019-12-16 21:51:34 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -42,7 +42,7 @@ constexpr int kVerticalPaddingBottom = 5; +@@ -43,7 +43,7 @@ constexpr int kVerticalPaddingBottom = 5; // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc index 31f73ce28eb2..9504c67a2803 100644 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -1,6 +1,6 @@ ---- ui/views/selection_controller.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/selection_controller.cc.orig 2019-12-16 21:51:09 UTC +++ ui/views/selection_controller.cc -@@ -21,7 +21,7 @@ SelectionController::SelectionController(SelectionCont +@@ -22,7 +22,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), handles_selection_clipboard_(false) { // On Linux, update the selection clipboard on a text selection. 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 c16d73a449a2..31738cc26072 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,20 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-10-21 19:07:29 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-12-16 21:51:34 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -137,7 +137,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea - Widget::InitParams::TYPE_WINDOW && - !params.remove_standard_frame); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Setup a non_client_window_event_filter, which handles resize/move, double - // click and other events. - DCHECK(!non_client_window_event_filter_); -@@ -668,7 +668,7 @@ void DesktopWindowTreeHostPlatform::Relayout() { - } - - void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (!non_client_window_event_filter_) - return; +@@ -732,7 +732,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP + // DesktopWindowTreeHost: + // Linux subclasses this host and adds some Linux specific bits. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + // static + DesktopWindowTreeHost* DesktopWindowTreeHost::Create( + internal::NativeWidgetDelegate* native_widget_delegate, diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h deleted file mode 100644 index 67bec7b41caf..000000000000 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-10-21 19:07:29 UTC -+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h -@@ -146,7 +146,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform - - base::string16 window_title_; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // A handler for events intended for non client area. - std::unique_ptr<WindowEventFilter> non_client_window_event_filter_; - #endif diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc new file mode 100644 index 000000000000..f7afcd8911b5 --- /dev/null +++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc @@ -0,0 +1,36 @@ +--- ui/views/widget/native_widget_aura.cc.orig 2019-12-17 20:00:27 UTC ++++ ui/views/widget/native_widget_aura.cc +@@ -59,7 +59,7 @@ + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "ui/views/linux_ui/linux_ui.h" + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" + #endif +@@ -1065,7 +1065,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS + // Widget, public: + + namespace { +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void CloseWindow(aura::Window* window) { + if (window) { + Widget* widget = Widget::GetWidgetForNativeView(window); +@@ -1095,13 +1095,13 @@ void Widget::CloseAllSecondaryWidgets() { + EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0); + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); + #endif + } + + const ui::NativeTheme* Widget::GetNativeTheme() const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + const LinuxUI* linux_ui = LinuxUI::instance(); + if (linux_ui) { + ui::NativeTheme* native_theme = diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 084818970472..c7295fbc92a5 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2019-10-21 19:07:29 UTC +--- ui/views/window/dialog_delegate.cc.orig 2019-12-16 21:51:34 UTC +++ ui/views/window/dialog_delegate.cc -@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg +@@ -58,7 +58,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index 4863df7f9ff1..2df5b1190a27 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,8 +1,8 @@ ---- ui/webui/resources/js/cr.js.orig 2019-09-09 21:55:47 UTC +--- ui/webui/resources/js/cr.js.orig 2019-12-16 21:51:34 UTC +++ ui/webui/resources/js/cr.js -@@ -436,6 +436,11 @@ var cr = cr || function(global) { - get doc() { - return document; +@@ -437,6 +437,11 @@ var cr = cr || function(global) { + get isMac() { + return /Mac/.test(navigator.platform); }, + + /** Whether this is on *BSD. */ @@ -10,5 +10,5 @@ + return /BSD/.test(navigator.userAgent); + }, - /** Whether we are using a Mac or not. */ - get isMac() { + /** Whether this is on the Windows platform or not. */ + get isWindows() { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 1937050df23b..37f456e0d7bd 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2019-10-21 19:09:21 UTC +--- v8/BUILD.gn.orig 2019-12-16 21:56:22 UTC +++ v8/BUILD.gn -@@ -3588,7 +3588,7 @@ v8_component("v8_libbase") { +@@ -3639,7 +3639,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3608,6 +3608,12 @@ v8_component("v8_libbase") { +@@ -3659,6 +3659,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3859,6 +3865,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho +@@ -3916,6 +3922,7 @@ if (current_toolchain == v8_snapshot_toolchain) { "src/snapshot/embedded/platform-embedded-file-writer-win.h", "src/snapshot/mksnapshot.cc", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 1bc69f9f39a1..f06efefcb94f 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2019-10-21 19:09:21 UTC +--- v8/src/api/api.cc.orig 2019-12-16 21:56:22 UTC +++ v8/src/api/api.cc @@ -111,7 +111,7 @@ #include "src/wasm/wasm-result.h" @@ -9,7 +9,7 @@ #include <signal.h> #include "include/v8-wasm-trap-handler-posix.h" #include "src/trap-handler/handler-inside-posix.h" -@@ -5573,7 +5573,7 @@ bool v8::V8::Initialize() { +@@ -5609,7 +5609,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index 90464f2308d7..c11e6a384aa0 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 2019-03-11 22:08:08 UTC +--- v8/src/base/cpu.cc.orig 2019-12-16 21:56:22 UTC +++ v8/src/base/cpu.cc -@@ -424,6 +424,7 @@ CPU::CPU() +@@ -422,6 +422,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -457,6 +458,7 @@ CPU::CPU() +@@ -455,6 +456,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 305b5e884007..5650be2b4ec0 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2019-09-09 21:57:07 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2019-12-16 21:56:22 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -382,7 +382,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -383,7 +383,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -513,6 +513,12 @@ int OS::GetCurrentThreadId() { +@@ -514,6 +514,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 619139191cab..5f312657e397 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 2019-10-30 16:40:04 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2019-12-16 21:51:34 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -34,7 +34,7 @@ +@@ -37,7 +37,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -70,7 +70,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -84,7 +84,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc new file mode 100644 index 000000000000..fb6e2b273094 --- /dev/null +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -0,0 +1,38 @@ +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-01-07 21:53:35 UTC ++++ weblayer/browser/content_browser_client_impl.cc +@@ -57,7 +57,7 @@ + #include "weblayer/browser/safe_browsing/safe_browsing_service.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "content/public/common/content_descriptors.h" + #endif + +@@ -200,7 +200,7 @@ ContentBrowserClientImpl::CreateNetworkContext( + + void ContentBrowserClientImpl::OnNetworkServiceCreated( + network::mojom::NetworkService* network_service) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); + content::GetNetworkService()->SetCryptConfig(std::move(config)); + #endif +@@ -330,7 +330,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe + } + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, +@@ -358,7 +358,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile + mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); + #endif // defined(OS_ANDROID) + } +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_ANDROID) + bool ContentBrowserClientImpl::ShouldOverrideUrlLoading( diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h new file mode 100644 index 000000000000..9610755a3b77 --- /dev/null +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -0,0 +1,17 @@ +--- weblayer/browser/content_browser_client_impl.h.orig 2020-01-07 21:53:35 UTC ++++ weblayer/browser/content_browser_client_impl.h +@@ -80,12 +80,12 @@ class ContentBrowserClientImpl : public content::Conte + base::OnceCallback<void(base::Optional<storage::QuotaSettings>)> callback) + override; + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + void GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, + content::PosixFileDescriptorInfo* mappings) override; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_ANDROID) + bool ShouldOverrideUrlLoading(int frame_tree_node_id, diff --git a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc new file mode 100644 index 000000000000..11beec6736d7 --- /dev/null +++ b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc @@ -0,0 +1,20 @@ +--- weblayer/common/weblayer_paths.cc.orig 2019-12-17 20:03:36 UTC ++++ weblayer/common/weblayer_paths.cc +@@ -16,7 +16,7 @@ + + #if defined(OS_WIN) + #include "base/base_paths_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -39,7 +39,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul + return false; + *result = result->AppendASCII("weblayer"); + return true; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + base::FilePath config_dir(base::nix::GetXDGDirectory( + env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/files/patch-weblayer_shell_app_shell__main.cc b/www/chromium/files/patch-weblayer_shell_app_shell__main.cc deleted file mode 100644 index 4aea81d575c7..000000000000 --- a/www/chromium/files/patch-weblayer_shell_app_shell__main.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- weblayer/shell/app/shell_main.cc.orig 2019-10-30 16:41:17 UTC -+++ weblayer/shell/app/shell_main.cc -@@ -18,7 +18,7 @@ - - #if defined(OS_WIN) - #include "base/base_paths_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -65,7 +65,7 @@ class MainDelegateImpl : public weblayer::MainDelegate - #if defined(OS_WIN) - CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)); - path = path.AppendASCII("web_shell"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<base::Environment> env(base::Environment::Create()); - base::FilePath config_dir(base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 6501cc031ea0..ca78a53ae0d1 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -187,19 +187,124 @@ bin/chrome %%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js %%DATADIR%%/resources/inspector/audits_worker.js %%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar-XB.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/bg.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ca.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/cs.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/da.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/de.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/el.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-GB.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-US.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XA.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XL.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es-419.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fil.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/he.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hu.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/id.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/it.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ja.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ko.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lt.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lv.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/nl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/no.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt-PT.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ro.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ru.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sk.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr-Latn.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sv.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ta.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/te.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/th.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/tr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/uk.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/vi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-HK.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json %%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings/bindings.js +%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js +%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js +%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js +%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js +%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js +%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/FileUtils.js +%%DATADIR%%/resources/inspector/bindings/LiveLocation.js +%%DATADIR%%/resources/inspector/bindings/NetworkProject.js +%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js +%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js +%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js +%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js +%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js +%%DATADIR%%/resources/inspector/bindings/TempFile.js %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js +%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js +%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js %%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/cm/cm_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js +%%DATADIR%%/resources/inspector/common/App.js +%%DATADIR%%/resources/inspector/common/AppProvider.js +%%DATADIR%%/resources/inspector/common/CharacterIdMap.js +%%DATADIR%%/resources/inspector/common/Color.js +%%DATADIR%%/resources/inspector/common/common.js +%%DATADIR%%/resources/inspector/common/Console.js +%%DATADIR%%/resources/inspector/common/ContentProvider.js +%%DATADIR%%/resources/inspector/common/EventTarget.js +%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js +%%DATADIR%%/resources/inspector/common/Linkifier.js +%%DATADIR%%/resources/inspector/common/Object.js +%%DATADIR%%/resources/inspector/common/ParsedURL.js +%%DATADIR%%/resources/inspector/common/Progress.js +%%DATADIR%%/resources/inspector/common/QueryParamHandler.js +%%DATADIR%%/resources/inspector/common/ResourceType.js +%%DATADIR%%/resources/inspector/common/Revealer.js +%%DATADIR%%/resources/inspector/common/Runnable.js +%%DATADIR%%/resources/inspector/common/SegmentedRange.js +%%DATADIR%%/resources/inspector/common/Settings.js +%%DATADIR%%/resources/inspector/common/StaticContentProvider.js +%%DATADIR%%/resources/inspector/common/StringOutputStream.js +%%DATADIR%%/resources/inspector/common/TextDictionary.js +%%DATADIR%%/resources/inspector/common/Throttler.js +%%DATADIR%%/resources/inspector/common/Trie.js +%%DATADIR%%/resources/inspector/common/UIString.js +%%DATADIR%%/resources/inspector/common/Worker.js +%%DATADIR%%/resources/inspector/components/components.js +%%DATADIR%%/resources/inspector/components/DockController.js +%%DATADIR%%/resources/inspector/components/ImagePreview.js +%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js +%%DATADIR%%/resources/inspector/components/Linkifier.js +%%DATADIR%%/resources/inspector/components/Reload.js +%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js +%%DATADIR%%/resources/inspector/console_counters/console_counters.js +%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js %%DATADIR%%/resources/inspector/console/console_module.js %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js %%DATADIR%%/resources/inspector/coverage/coverage_module.js %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js +%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js +%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js @@ -209,6 +314,7 @@ bin/chrome %%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/diff/diff_module.js +%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js %%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg @@ -250,6 +356,12 @@ bin/chrome %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js +%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js +%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js +%%DATADIR%%/resources/inspector/extensions/extensions.js +%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js +%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js +%%DATADIR%%/resources/inspector/extensions/ExtensionView.js %%DATADIR%%/resources/inspector/formatter/formatter_module.js %%DATADIR%%/resources/inspector/formatter_worker.js %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js @@ -258,6 +370,12 @@ bin/chrome %%DATADIR%%/resources/inspector/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/help/help_module.js +%%DATADIR%%/resources/inspector/host/host.js +%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js +%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js +%%DATADIR%%/resources/inspector/host/Platform.js +%%DATADIR%%/resources/inspector/host/ResourceLoader.js +%%DATADIR%%/resources/inspector/host/UserMetrics.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js @@ -270,6 +388,7 @@ bin/chrome %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js %%DATADIR%%/resources/inspector/layers/layers_module.js %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js +%%DATADIR%%/resources/inspector/media/media_module.js %%DATADIR%%/resources/inspector/ndb_app.html %%DATADIR%%/resources/inspector/ndb_app.js %%DATADIR%%/resources/inspector/network/network_module.js @@ -281,41 +400,171 @@ bin/chrome %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js +%%DATADIR%%/resources/inspector/persistence/Automapping.js +%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js +%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js +%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js +%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js +%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js +%%DATADIR%%/resources/inspector/persistence/persistence.js +%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js +%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js +%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js +%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js +%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js +%%DATADIR%%/resources/inspector/platform/utilities.js %%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js +%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js +%%DATADIR%%/resources/inspector/protocol/NodeURL.js +%%DATADIR%%/resources/inspector/protocol/protocol.js %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js %%DATADIR%%/resources/inspector/resources/resources_module.js +%%DATADIR%%/resources/inspector/root.js +%%DATADIR%%/resources/inspector/Runtime.js %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js +%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js +%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js +%%DATADIR%%/resources/inspector/sdk/Connections.js +%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js +%%DATADIR%%/resources/inspector/sdk/CookieModel.js +%%DATADIR%%/resources/inspector/sdk/CookieParser.js +%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js +%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js +%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js +%%DATADIR%%/resources/inspector/sdk/CSSMedia.js +%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js +%%DATADIR%%/resources/inspector/sdk/CSSModel.js +%%DATADIR%%/resources/inspector/sdk/CSSProperty.js +%%DATADIR%%/resources/inspector/sdk/CSSRule.js +%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js +%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js +%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js +%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js +%%DATADIR%%/resources/inspector/sdk/DOMModel.js +%%DATADIR%%/resources/inspector/sdk/EmulationModel.js +%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js +%%DATADIR%%/resources/inspector/sdk/HARLog.js +%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js +%%DATADIR%%/resources/inspector/sdk/IsolateManager.js +%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js +%%DATADIR%%/resources/inspector/sdk/LogModel.js +%%DATADIR%%/resources/inspector/sdk/NetworkLog.js +%%DATADIR%%/resources/inspector/sdk/NetworkManager.js +%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js +%%DATADIR%%/resources/inspector/sdk/OverlayModel.js +%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js +%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js +%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js +%%DATADIR%%/resources/inspector/sdk/RemoteObject.js +%%DATADIR%%/resources/inspector/sdk/Resource.js +%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js +%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js +%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js +%%DATADIR%%/resources/inspector/sdk/Script.js +%%DATADIR%%/resources/inspector/sdk/sdk.js +%%DATADIR%%/resources/inspector/sdk/SDKModel.js +%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js +%%DATADIR%%/resources/inspector/sdk/ServerTiming.js +%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js +%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js +%%DATADIR%%/resources/inspector/sdk/SourceMap.js +%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js +%%DATADIR%%/resources/inspector/sdk/Target.js +%%DATADIR%%/resources/inspector/sdk/TargetManager.js +%%DATADIR%%/resources/inspector/sdk/TracingManager.js +%%DATADIR%%/resources/inspector/sdk/TracingModel.js %%DATADIR%%/resources/inspector/search/search_module.js %%DATADIR%%/resources/inspector/security/security_module.js %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js +%%DATADIR%%/resources/inspector/services/ServiceManager.js +%%DATADIR%%/resources/inspector/services/services.js %%DATADIR%%/resources/inspector/settings/settings_module.js %%DATADIR%%/resources/inspector/shell.js %%DATADIR%%/resources/inspector/snippets/snippets_module.js %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js %%DATADIR%%/resources/inspector/sources/sources_module.js %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js -%%DATADIR%%/resources/inspector/terminal/terminal_module.js %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js -%%DATADIR%%/resources/inspector/timeline/timeline_module.js %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js +%%DATADIR%%/resources/inspector/timeline/timeline_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js +%%DATADIR%%/resources/inspector/ui/Action.js +%%DATADIR%%/resources/inspector/ui/ActionDelegate.js +%%DATADIR%%/resources/inspector/ui/ActionRegistry.js +%%DATADIR%%/resources/inspector/ui/ARIAUtils.js +%%DATADIR%%/resources/inspector/ui/Context.js +%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js +%%DATADIR%%/resources/inspector/ui/ContextMenu.js +%%DATADIR%%/resources/inspector/ui/Dialog.js +%%DATADIR%%/resources/inspector/ui/DropTarget.js +%%DATADIR%%/resources/inspector/ui/EmptyWidget.js +%%DATADIR%%/resources/inspector/ui/FilterBar.js +%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js +%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js +%%DATADIR%%/resources/inspector/ui/Fragment.js +%%DATADIR%%/resources/inspector/ui/Geometry.js +%%DATADIR%%/resources/inspector/ui/GlassPane.js +%%DATADIR%%/resources/inspector/ui/HistoryInput.js +%%DATADIR%%/resources/inspector/ui/Icon.js +%%DATADIR%%/resources/inspector/ui/Infobar.js +%%DATADIR%%/resources/inspector/ui/InplaceEditor.js +%%DATADIR%%/resources/inspector/ui/InspectorView.js +%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js +%%DATADIR%%/resources/inspector/ui/ListControl.js +%%DATADIR%%/resources/inspector/ui/ListModel.js +%%DATADIR%%/resources/inspector/ui/ListWidget.js +%%DATADIR%%/resources/inspector/ui/Panel.js +%%DATADIR%%/resources/inspector/ui/PopoverHelper.js +%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js +%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js +%%DATADIR%%/resources/inspector/ui/ReportView.js +%%DATADIR%%/resources/inspector/ui/ResizerWidget.js +%%DATADIR%%/resources/inspector/ui/RootView.js +%%DATADIR%%/resources/inspector/ui/SearchableView.js +%%DATADIR%%/resources/inspector/ui/SegmentedButton.js +%%DATADIR%%/resources/inspector/ui/SettingsUI.js +%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js +%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js +%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js +%%DATADIR%%/resources/inspector/ui/SoftDropDown.js +%%DATADIR%%/resources/inspector/ui/SplitWidget.js +%%DATADIR%%/resources/inspector/ui/SuggestBox.js +%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js +%%DATADIR%%/resources/inspector/ui/TabbedPane.js +%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js +%%DATADIR%%/resources/inspector/ui/TextEditor.js +%%DATADIR%%/resources/inspector/ui/TextPrompt.js +%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js +%%DATADIR%%/resources/inspector/ui/Toolbar.js +%%DATADIR%%/resources/inspector/ui/Tooltip.js +%%DATADIR%%/resources/inspector/ui/Treeoutline.js +%%DATADIR%%/resources/inspector/ui/ui.js +%%DATADIR%%/resources/inspector/ui/UIUtils.js +%%DATADIR%%/resources/inspector/ui/View.js +%%DATADIR%%/resources/inspector/ui/ViewManager.js +%%DATADIR%%/resources/inspector/ui/Widget.js +%%DATADIR%%/resources/inspector/ui/XElement.js +%%DATADIR%%/resources/inspector/ui/XLink.js +%%DATADIR%%/resources/inspector/ui/XWidget.js +%%DATADIR%%/resources/inspector/ui/ZoomManager.js %%DATADIR%%/resources/inspector/web_audio/web_audio_module.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js +%%DATADIR%%/resources/inspector/workspace/FileManager.js +%%DATADIR%%/resources/inspector/workspace/UISourceCode.js +%%DATADIR%%/resources/inspector/workspace/workspace.js +%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js %%DATADIR%%/snapshot_blob.bin +%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin %%DEBUG%%%%DATADIR%%/character_data_generator -%%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_object_lifetimes.so -%%DEBUG%%%%DATADIR%%/libVkLayer_stateless_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_thread_safety.so -%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so +%%DEBUG%%%%DATADIR%%/libVkLayer_khronos_validation.so %%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so |