diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
| commit | 03d66a659ae5011ca0d5279cafb1596a982a06d8 (patch) | |
| tree | b8c8cd52f300381a02e32bdea5d4eae6f30262fc | |
| parent | Update to 1.37.0 (diff) | |
www/chromium: update to 78.0.3904.87
Submitted by: Matthias Wolf via github
MFH: 2019Q4
Notes
Notes:
svn path=/head/; revision=516832
424 files changed, 2870 insertions, 2206 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index d0d58ed77c83..c176d5e0d5ab 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 76.0.3809.132 -PORTREVISION= 1 +PORTVERSION= 78.0.3904.87 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -75,7 +74,7 @@ USES= compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ - ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz + ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} @@ -294,6 +293,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 + ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ @@ -316,10 +316,15 @@ do-install: ${STAGEDIR}${DATADIR} # ANGLE, EGL, Vk -.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so libVkLayer_core_validation.so libVkLayer_object_lifetimes.so \ - libVkLayer_stateless_validation.so libVkLayer_thread_safety.so libVkLayer_unique_objects.so +.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${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 +.endif # SwiftShader .if ${ARCH} != aarch64 diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 08e7d840a183..372cb92370a5 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1566850881 -SHA256 (chromium-76.0.3809.132.tar.xz) = d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241 -SIZE (chromium-76.0.3809.132.tar.xz) = 728899912 -SHA256 (chromium-76.0.3809.132-testdata.tar.xz) = 527447872a16b868789215d6ce6a82047afca4ad825beb45c0ac349e3034cbb7 -SIZE (chromium-76.0.3809.132-testdata.tar.xz) = 262868312 +TIMESTAMP = 1572618206 +SHA256 (chromium-78.0.3904.87.tar.xz) = 8df6ffca4087fc43e7d0443acc4f758399b248e96482705bd4fe7e88d239eb56 +SIZE (chromium-78.0.3904.87.tar.xz) = 742861696 +SHA256 (chromium-78.0.3904.87-testdata.tar.xz) = b74cc67e022bf6ac226d74eed098864261a48d10337de81e3abe08f71ccf5ca9 +SIZE (chromium-78.0.3904.87-testdata.tar.xz) = 252287200 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index fd5cd8f923c5..953ab5410d68 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-07-24 18:58:00 UTC +--- BUILD.gn.orig 2019-10-21 19:06:17 UTC +++ BUILD.gn -@@ -386,7 +386,7 @@ group("gn_all") { +@@ -404,7 +404,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -427,8 +427,6 @@ group("gn_all") { +@@ -445,8 +445,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -483,10 +481,6 @@ group("gn_all") { +@@ -501,10 +499,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", -@@ -541,10 +535,6 @@ group("gn_all") { +@@ -560,10 +554,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -619,7 +609,7 @@ group("gn_all") { +@@ -637,7 +627,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)" ] } -@@ -758,7 +748,6 @@ group("gn_all") { +@@ -776,7 +766,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" ] -@@ -877,7 +866,6 @@ if (is_chromeos) { +@@ -896,7 +885,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", -@@ -1033,7 +1021,7 @@ if (!is_ios) { +@@ -1065,7 +1053,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1042,7 +1030,7 @@ if (!is_ios) { +@@ -1074,7 +1062,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)" ] } -@@ -1185,9 +1173,6 @@ group("chromium_builder_perf") { +@@ -1216,9 +1204,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 8975b8222992..877cfe237f3f 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-07-24 18:58:01 UTC +--- base/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ base/BUILD.gn -@@ -1258,7 +1258,7 @@ jumbo_component("base") { +@@ -1266,7 +1266,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" ] } -@@ -1284,7 +1284,7 @@ jumbo_component("base") { +@@ -1292,7 +1292,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 += [ -@@ -1862,6 +1862,33 @@ jumbo_component("base") { +@@ -1893,6 +1893,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2999,6 +3026,12 @@ test("base_unittests") { +@@ -3041,6 +3068,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc index 1b79f69c285b..208a8d93617a 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim.cc.orig 2019-07-24 18:58:01 UTC +--- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC +++ base/allocator/allocator_shim.cc -@@ -70,7 +70,7 @@ inline const base::allocator::AllocatorDispatch* GetCh +@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast<const base::allocator::AllocatorDispatch*>( diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index fab5ea393ea6..fbd28e22abe2 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,8 +1,8 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-07-24 18:58:01 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-10-21 19:06:18 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -16,7 +16,7 @@ - - #include <mach/mach.h> +@@ -19,7 +19,7 @@ + #if defined(OS_ANDROID) + #include <sys/prctl.h> #endif -#if defined(OS_LINUX) +#if defined(OS_BSD) || defined(OS_LINUX) diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 27fbdf9baac7..92ed9217882d 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,6 +1,6 @@ ---- base/base_switches.cc.orig 2019-07-29 16:52:17 UTC +--- base/base_switches.cc.orig 2019-10-21 19:06:18 UTC +++ base/base_switches.cc -@@ -107,7 +107,7 @@ const char kProfilingFlush[] = "profiling-flush"; +@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; #endif @@ -9,7 +9,7 @@ // The /dev/shm partition is too small in certain VM environments, causing // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to // work-around this issue (a temporary directory will always be used to create -@@ -128,7 +128,7 @@ const char kEnableCrashReporterForTesting[] = +@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] = const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; #endif diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index 395a39f3ec35..f2be6f05c697 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,6 +1,6 @@ ---- base/base_switches.h.orig 2019-07-29 18:05:10 UTC +--- base/base_switches.h.orig 2019-10-21 19:06:18 UTC +++ base/base_switches.h -@@ -36,7 +36,7 @@ extern const char kWaitForDebugger[]; +@@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[]; extern const char kDisableUsbKeyboardDetect[]; #endif @@ -9,7 +9,7 @@ extern const char kDisableDevShmUsage[]; #endif -@@ -49,7 +49,7 @@ extern const char kEnableReachedCodeProfiler[]; +@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[]; extern const char kOrderfileMemoryOptimization[]; #endif diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index b56fe344b0ce..231561a3a542 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,15 +1,15 @@ ---- base/cpu.cc.orig 2019-07-29 18:05:46 UTC +--- base/cpu.cc.orig 2019-10-21 19:06:18 UTC +++ base/cpu.cc -@@ -15,7 +15,7 @@ +@@ -14,7 +14,7 @@ + #include "base/stl_util.h" - #include "build/build_config.h" -#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) +#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) #include "base/files/file_util.h" #endif -@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) { +@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) { #endif // ARCH_CPU_X86_FAMILY @@ -18,7 +18,7 @@ std::string* CpuInfoBrand() { static std::string* brand = []() { // This function finds the value from /proc/cpuinfo under the key "model -@@ -127,7 +127,7 @@ std::string* CpuInfoBrand() { +@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() { return brand; } #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || @@ -27,7 +27,7 @@ } // namespace -@@ -252,7 +252,7 @@ void CPU::Initialize() { +@@ -287,7 +287,7 @@ void CPU::Initialize() { } } #elif defined(ARCH_CPU_ARM_FAMILY) diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index c483529dd29f..62317b93a5a1 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/debug/debugger_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/debug/debugger_posix.cc -@@ -87,7 +87,7 @@ bool BeingDebugged() { +@@ -90,7 +90,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -95,33 +95,35 @@ bool BeingDebugged() { +@@ -98,33 +98,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 415d73c63d02..6b4e63dd1e32 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,9 +1,9 @@ ---- base/debug/stack_trace.h.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace.h.orig 2019-09-09 21:55:05 UTC +++ base/debug/stack_trace.h -@@ -16,6 +16,7 @@ - #include "build/build_config.h" - - #if defined(OS_POSIX) +@@ -19,6 +19,7 @@ + #if !defined(OS_NACL) + #include <signal.h> + #endif +#include <sys/stdint.h> #include <unistd.h> #endif diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index b4db467db920..38beddf996ab 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper { +@@ -657,6 +657,11 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -21,7 +21,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper { +@@ -674,6 +679,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index 875d768c6198..9e792e43db08 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 1b4fa7fe3db9..c0787c80ba47 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-07-24 18:58:02 UTC +--- base/files/file_util.h.orig 2019-10-21 19:06:18 UTC +++ base/files/file_util.h -@@ -476,7 +476,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -497,7 +497,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 b5cfff0a33ba..85b725392a0b 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-06-04 18:55:15 UTC +--- base/files/file_util_posix.cc.orig 2019-10-21 19:06:18 UTC +++ base/files/file_util_posix.cc -@@ -419,7 +419,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -426,7 +426,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 38cca84921cc..aebed92f4a2a 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-07-24 18:58:02 UTC +--- base/logging_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/logging_unittest.cc -@@ -444,7 +444,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -590,7 +590,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h new file mode 100644 index 000000000000..872aa18a6529 --- /dev/null +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -0,0 +1,29 @@ +--- base/memory/platform_shared_memory_region.h.orig 2019-09-16 12:06:15 UTC ++++ base/memory/platform_shared_memory_region.h +@@ -28,7 +28,7 @@ + #include "base/files/scoped_file.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + namespace content { + class SandboxIPCHandler; + } +@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Structure to limit access to executable region creation. + struct ExecutableRegion { + private: +@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + CheckPlatformHandlePermissionsCorrespondToMode); + static PlatformSharedMemoryRegion Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable = false + #endif diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc new file mode 100644 index 000000000000..a8cdbdc7ac9a --- /dev/null +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -0,0 +1,38 @@ +--- base/memory/platform_shared_memory_region_posix.cc.orig 2019-09-16 12:05:39 UTC ++++ base/memory/platform_shared_memory_region_posix.cc +@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const { + return {fd.get(), readonly_fd.get()}; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { + PlatformSharedMemoryRegion region = +@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: + return region.PassPlatformHandle().fd; + return ScopedFD(); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( +@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable + #endif +@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + // flag. + FilePath directory; + if (!GetShmemTempDir( +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + executable, + #else + false /* executable */, diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h index cd48c1a24031..c088ad9451d0 100644 --- a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h +++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,13 +1,12 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2019-03-11 22:00:51 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2019-09-09 21:55:05 UTC +++ base/numerics/safe_math_shared_impl.h -@@ -19,9 +19,7 @@ - +@@ -23,8 +23,7 @@ // Where available use builtin math overflow support on Clang and GCC. - #if !defined(__native_client__) && \ -- ((defined(__clang__) && \ -- ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -+ ((defined(__clang__) && (__clang_major__ > 6)) || \ - (defined(__GNUC__) && __GNUC__ >= 5)) + #elif !defined(__native_client__) && \ + ((defined(__clang__) && \ +- ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ ++ (__clang_major__ > 6)) || \ + (defined(__GNUC__) && __GNUC__ >= 5)) #include "base/numerics/safe_math_clang_gcc_impl.h" #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 89dbdbcbba11..007e8593b35d 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2019-03-11 22:00:51 UTC +--- base/process/memory.h.orig 2019-10-21 19:06:18 UTC +++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); +@@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index b858c9e73024..1a2457e0d3df 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/memory_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/memory_unittest.cc @@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) { // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan @@ -9,7 +9,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -527,5 +527,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == nullptr); } diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 52c9f6102254..13812613f73f 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.cc -@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() { - return g_unique_id; +@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { + : UniqueProcId(GetCurrentProcId()); } -#if defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { - g_unique_id = MangleProcessId(pid_outside_of_namespace); + DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 976217dea9ad..502beff310e6 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,8 +1,8 @@ ---- base/process/process_handle.h.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.h -@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); - // a process's PID. - BASE_EXPORT uint32_t GetUniqueIdForProcess(); +@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); + // processes may be reused. + BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index c27ece03d2f6..420d563e5b29 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2019-07-24 18:58:02 UTC +--- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -44,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -53,7 +53,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -62,7 +62,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -292,7 +292,7 @@ BASE_EXPORT size_t GetMaxFds(); +@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -71,7 +71,7 @@ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. -@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,7 +80,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -340,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif @@ -89,7 +89,7 @@ defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; @@ -98,7 +98,7 @@ // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) -@@ -376,10 +376,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -111,7 +111,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -452,7 +452,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); @@ -120,7 +120,7 @@ #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. -@@ -547,7 +547,7 @@ class BASE_EXPORT SystemMetrics { +@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index acde968b71f8..e909eeec959b 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_metrics_posix.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics_posix.cc -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ #if defined(OS_MACOSX) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -117,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() { #else return minfo.hblkhd + minfo.arena; #endif diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index d383e54560b5..44e3b0aae8ef 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,6 +1,6 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-07-24 18:58:02 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-09-09 21:55:05 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc -@@ -30,6 +30,10 @@ +@@ -29,6 +29,10 @@ #include <sys/prctl.h> #endif @@ -11,7 +11,7 @@ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ defined(OFFICIAL_BUILD) #include "base/trace_event/cfi_backtrace_android.h" -@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { +@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() { #elif defined(OS_MACOSX) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index fa3ce0e07bca..d719219ca50b 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,18 +1,18 @@ ---- base/syslog_logging.cc.orig 2019-05-01 17:21:47 UTC +--- base/syslog_logging.cc.orig 2019-10-21 19:06:18 UTC +++ base/syslog_logging.cc -@@ -9,7 +9,7 @@ - #include "base/bind.h" - #include "base/callback_helpers.h" +@@ -14,7 +14,7 @@ #include "base/debug/stack_trace.h" + #include "base/strings/string_util.h" + #include "base/win/win_util.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -94,7 +94,7 @@ EventLogMessage::~EventLogMessage() { - 1, 0, strings, nullptr)) { - stream() << " !!NOT ADDED TO EVENTLOG!!"; - } +@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() { + + if (user_sid != nullptr) + ::LocalFree(user_sid); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) const char kEventSource[] = "chrome"; 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 67312e70a631..fa7eed94fdeb 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-03-11 22:00:51 UTC +--- base/system/sys_info_freebsd.cc.orig 2019-09-09 21:55:05 UTC +++ base/system/sys_info_freebsd.cc -@@ -13,26 +13,58 @@ +@@ -13,26 +13,46 @@ namespace base { int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -45,8 +45,8 @@ } - return static_cast<uint64_t>(limit); + return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); -+} -+ + } + +// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; @@ -56,16 +56,4 @@ + return name; + return std::string(); +} -+ -+int SysInfo::NumberOfProcessors() { -+ int mib[] = { CTL_HW, HW_NCPU }; -+ int ncpu; -+ size_t size = sizeof(ncpu); -+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) { -+ NOTREACHED(); -+ return 1; -+ } -+ return ncpu; - } - } // namespace base diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 80aa7d04fcf7..5b79b03dce8a 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,33 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2019-07-24 18:58:02 UTC +--- base/system/sys_info_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/system/sys_info_posix.cc -@@ -38,7 +38,7 @@ - - namespace { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_FUCHSIA) && !defined(OS_BSD) - int NumberOfProcessors() { - // sysconf returns the number of "logical" (not "physical") processors on both - // Mac and Linux. So we get the number of max available "logical" processors. -@@ -64,7 +64,7 @@ int NumberOfProcessors() { - - base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: - Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; --#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) - - #if !defined(OS_FUCHSIA) - int64_t AmountOfVirtualMemory() { -@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, - - namespace base { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_FUCHSIA) && !defined(OS_BSD) - int SysInfo::NumberOfProcessors() { - return g_lazy_number_of_processors.Get().value(); - } -@@ -227,6 +227,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 4f76312eca8f..ef9b64f86bfc 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/launcher/test_launcher.cc.orig 2019-09-09 21:55:05 UTC +++ base/test/launcher/test_launcher.cc -@@ -53,6 +53,7 @@ +@@ -54,6 +54,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index b234740a6dd7..0ff2fc68f36a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +++ base/threading/platform_thread.h -@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread { +@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index ed3ac8500b58..5a65f8ec33c5 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2019-07-24 18:58:02 UTC +--- build/config/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ build/config/BUILD.gn -@@ -161,7 +161,7 @@ config("debug") { +@@ -149,7 +149,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -259,9 +259,7 @@ config("default_libs") { +@@ -247,9 +247,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -349,7 +347,7 @@ config("executable_config") { +@@ -337,7 +335,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni deleted file mode 100644 index c4177a1cdd52..000000000000 --- a/www/chromium/files/patch-build_config_allocator.gni +++ /dev/null @@ -1,20 +0,0 @@ ---- build/config/allocator.gni.orig 2019-04-30 22:22:28 UTC -+++ build/config/allocator.gni -@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni") - - # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. - if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || -- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { -+ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { - _default_allocator = "none" - } else { - _default_allocator = "tcmalloc" -@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls - # against the debug CRT with "is_nacl=false". - if ((is_linux || is_android || is_mac || - (is_win && !is_component_build && !is_debug)) && !is_asan && !is_hwasan && -- !is_lsan && !is_tsan && !is_msan) { -+ !is_lsan && !is_tsan && !is_msan && !is_bsd) { - _default_use_allocator_shim = true - } else { - _default_use_allocator_shim = false diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index a2f56038a0c5..52da08e5ffe6 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2019-07-24 18:58:02 UTC +--- build/config/compiler/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ build/config/compiler/BUILD.gn -@@ -54,7 +54,7 @@ declare_args() { +@@ -57,7 +57,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = @@ -9,16 +9,16 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -269,7 +269,7 @@ config("compiler") { +@@ -288,7 +288,7 @@ config("compiler") { + # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { +- !is_mac && !is_ios && current_os != "aix") { ++ !is_mac && !is_ios && current_os != "aix" && !is_bsd) { # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 -@@ -363,7 +363,7 @@ config("compiler") { + ldflags += [ "-Wl,--fatal-warnings" ] + } +@@ -383,7 +383,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", -@@ -471,7 +471,7 @@ config("compiler") { +@@ -483,7 +483,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -741,7 +741,7 @@ config("compiler_cpu_abi") { +@@ -753,7 +753,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" ] } -@@ -1102,7 +1102,7 @@ config("compiler_deterministic") { +@@ -1104,7 +1104,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,." ] } -@@ -1492,7 +1492,7 @@ config("default_warnings") { +@@ -1493,7 +1493,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 += [ -@@ -1701,7 +1701,7 @@ config("thin_archive") { +@@ -1722,7 +1722,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" ] -@@ -2288,7 +2288,7 @@ config("symbols") { +@@ -2292,7 +2292,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) { -@@ -2309,7 +2309,7 @@ config("symbols") { +@@ -2313,7 +2313,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 e2e1b41576e9..80858f1f0186 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-07-24 18:58:02 UTC +--- build/config/compiler/compiler.gni.orig 2019-10-21 19:06:18 UTC +++ build/config/compiler/compiler.gni -@@ -179,7 +179,7 @@ declare_args() { +@@ -188,7 +188,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index 3d15197f9bb6..c98a61186fa9 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,7 +1,7 @@ ---- build/config/features.gni.orig 2019-06-04 18:55:15 UTC +--- build/config/features.gni.orig 2019-10-21 19:06:18 UTC +++ build/config/features.gni -@@ -45,7 +45,7 @@ declare_args() { - } +@@ -26,7 +26,7 @@ declare_args() { + proprietary_codecs = is_chrome_branded || is_chromecast # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index d0a1400adbbe..f2adaef3dd3d 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-06-04 18:55:15 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2019-10-21 19:06:18 UTC +++ build/toolchain/gcc_toolchain.gni @@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { enable_resource_whitelist_generation = false @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -617,13 +622,23 @@ template("clang_toolchain") { +@@ -589,13 +594,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 1997ef8dff45..b1369bb13ce9 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-07-24 18:58:02 UTC +--- cc/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ cc/BUILD.gn -@@ -566,7 +566,7 @@ cc_test_static_library("test_support") { +@@ -572,7 +572,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers", ] -@@ -767,9 +767,6 @@ cc_test("cc_unittests") { +@@ -776,9 +776,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", @@ -17,5 +17,5 @@ - data_deps = [ - "//third_party/mesa_headers", ] - } + if (enable_vulkan) { diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 9d83c161e7f2..cce0a37e64b1 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-07-24 18:58:03 UTC +--- cc/trees/property_tree.cc.orig 2019-10-21 19:06:18 UTC +++ cc/trees/property_tree.cc -@@ -1348,13 +1348,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1278,13 +1278,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 66e8f3488ba2..3ed8f344098e 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,6 +1,6 @@ ---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-07-29 18:39:15 UTC +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-10-21 19:06:19 UTC +++ chrome/app/chrome_content_browser_overlay_manifest.cc -@@ -79,7 +79,7 @@ +@@ -69,7 +69,7 @@ #include "chrome/services/app_service/public/cpp/manifest.h" #endif @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -240,7 +240,7 @@ const service_manager::Manifest& GetChromeContentBrows +@@ -205,7 +205,7 @@ const service_manager::Manifest& GetChromeContentBrows #else app_management::mojom::PageHandlerFactory, #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 6204c893b3c9..c4e0477762da 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2019-04-30 22:22:30 UTC +--- chrome/app/chrome_main.cc.orig 2019-09-09 21:55:07 UTC +++ chrome/app/chrome_main.cc -@@ -94,11 +94,11 @@ int ChromeMain(int argc, const char** argv) { - #endif +@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) { + MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) 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 09e9d2b6256a..0f03350e9afd 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-07-24 18:58:05 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-10-21 19:06:19 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -100,7 +100,7 @@ +@@ -99,7 +99,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -241,7 +241,7 @@ bool UseHooks() { +@@ -240,7 +240,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; -@@ -300,7 +300,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +36,14 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -345,7 +345,7 @@ bool HandleVersionSwitches(const base::CommandLine& co + bool SubprocessNeedsResourceBundle(const std::string& process_type) { + return +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // 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 return false; } @@ -45,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) || -@@ -355,7 +355,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +61,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -409,7 +409,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,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. -@@ -421,7 +421,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +79,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -478,7 +478,7 @@ void InitLogging(const std::string& process_type) { +@@ -477,7 +477,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); @@ -81,7 +88,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -650,7 +650,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +97,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -674,7 +674,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +106,7 @@ nacl::RegisterPathProvider(); #endif -@@ -868,7 +868,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 4ddacbbdf526..394dcc66449e 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-07-24 18:58:05 UTC +--- chrome/app/chromium_strings.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/chromium_strings.grd -@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like +@@ -694,7 +694,7 @@ Signing in anyway will merge Chromium information like </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> -@@ -815,7 +815,7 @@ Signing in anyway will merge Chromium information like +@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like </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> -@@ -1074,7 +1074,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like </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 5932184926e2..86b72ec17785 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-07-24 18:58:05 UTC +--- chrome/app/generated_resources.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/generated_resources.grd -@@ -4805,7 +4805,7 @@ Keep your key file in a safe place. You will need it t +@@ -4885,7 +4885,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> -@@ -6370,7 +6370,7 @@ the Bookmarks menu."> +@@ -6514,7 +6514,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> -@@ -7223,7 +7223,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7395,7 +7395,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 401aa915e93b..33f8908cc5e9 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-07-24 18:58:05 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/google_chrome_strings.grd -@@ -702,7 +702,7 @@ Signing in anyway will merge Chrome information like b +@@ -706,7 +706,7 @@ Signing in anyway will merge Chrome information like b </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> -@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b +@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b </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> -@@ -1093,7 +1093,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b </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 4d47e4f9413f..120c2acf172b 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-07-24 18:58:07 UTC +--- chrome/app/settings_strings.grdp.orig 2019-10-21 19:06:20 UTC +++ chrome/app/settings_strings.grdp -@@ -653,7 +653,7 @@ +@@ -757,7 +757,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> -@@ -667,7 +667,7 @@ +@@ -771,7 +771,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index b13926ff0562..c55d7c464177 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-07-24 18:58:07 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-09-09 21:55:08 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> @@ -9,7 +9,7 @@ <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" /> </if> -@@ -100,7 +100,7 @@ +@@ -109,7 +109,7 @@ <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" /> <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" /> </if> diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd new file mode 100644 index 000000000000..a6e63ac69942 --- /dev/null +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -0,0 +1,11 @@ +--- chrome/app/theme/theme_resources.grd.orig 2019-10-30 15:46:23 UTC ++++ chrome/app/theme/theme_resources.grd +@@ -25,7 +25,7 @@ + <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST + BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE + SAME CONDITIONALS. --> +- <if expr="is_linux or is_win or chromeos"> ++ <if expr="is_posix or is_win or chromeos"> + <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" /> + </if> + <if expr="toolkit_views and not is_macosx"> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index bde5ef133453..e800ee111a39 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2019-07-24 18:58:07 UTC +--- chrome/browser/about_flags.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/about_flags.cc -@@ -621,7 +621,7 @@ const FeatureEntry::FeatureVariation +@@ -162,7 +162,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/native_theme/native_theme_features.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" + #endif + +@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation nullptr}}; #endif // OS_ANDROID @@ -9,7 +18,7 @@ const FeatureEntry::FeatureParam kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { {autofill::features:: -@@ -668,7 +668,7 @@ const FeatureEntry::FeatureVariation +@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), nullptr}, }; @@ -18,7 +27,25 @@ const FeatureEntry::Choice kMemlogModeChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, -@@ -776,7 +776,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat +@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ + heap_profiling::kMemlogSamplingRate5MB}, + }; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { + {"DocumentUseServerScore", "true"}, + {"DocumentUseClientScore", "false"}, +@@ -854,7 +854,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 {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), nullptr}}; @@ -27,16 +54,16 @@ defined(OS_CHROMEOS) const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; -@@ -792,7 +792,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU +@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}, {"Button_GM2", kTranslateBubbleUIButtonGM2, base::size(kTranslateBubbleUIButton), nullptr}}; -#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS +#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS - const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin0px[] = { - {OmniboxFieldTrial::kUIVerticalMarginParam, "0"}}; -@@ -1567,13 +1567,13 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { + {security_state::features::kMarkHttpAsFeatureParameterName, +@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -52,7 +79,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -1614,14 +1614,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = { "OverrideTranslateTriggerInIndia")}, #endif // OS_ANDROID @@ -61,15 +88,33 @@ defined(OS_CHROMEOS) {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, - FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUI, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi, kTranslateBubbleUIVariations, "UseButtonTranslateBubbleUI")}, -#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS -+#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) {"enable-native-notifications", -@@ -1762,7 +1762,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCrostiniBackupDescription, kOsCrOS, + FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)}, + #endif // OS_CHROMEOS +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + {"terminal-system-app", flag_descriptions::kTerminalSystemAppName, + flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(features::kTerminalSystemApp)}, +@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // OS_CHROMEOS || OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX || defined(OS_BSD) + #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)}, #endif // OS_ANDROID @@ -78,22 +123,22 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2091,12 +2091,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, +@@ -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) - {"passwords-migrate-linux-to-login-db", - flag_descriptions::kPasswordsMigrateLinuxToLoginDBName, - flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux, - FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)}, + {"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, -@@ -2423,7 +2423,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, @@ -102,16 +147,16 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2470,7 +2470,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxDeduplicateDriveUrlsName, - flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)}, +@@ -2806,7 +2806,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kDocumentProvider, + kOmniboxDocumentProviderVariations, + "OmniboxBundledExperimentV1")}, -#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, -@@ -2696,7 +2696,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3026,13 +3026,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -120,64 +165,121 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -2707,7 +2707,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kShowManagedUiDescription, - kOsWin | kOsMac | kOsLinux | kOsCrOS, - FEATURE_VALUE_TYPE(features::kShowManagedUi)}, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) {"chrome-colors", flag_descriptions::kChromeColorsName, -@@ -3514,7 +3514,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, - #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -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[] = { + FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, + #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) + {"enable-reopen-tab-in-product-help", + flag_descriptions::kReopenTabInProductHelpName, + flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)}, +-#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) + + {"enable-audio-focus-enforcement", +@@ -4245,7 +4245,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-always-show-server-cards-in-sync-transport", - flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, + {"enable-autofill-save-credit-card-uses-improved-messaging", + flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, flag_descriptions:: -@@ -3522,7 +3522,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE( - autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, +@@ -4255,7 +4255,7 @@ const FeatureEntry kFeatureEntries[] = { + autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, + kAutofillSaveCreditCardUsesImprovedMessagingVariations, + "AutofillSaveCreditCardUsesImprovedMessaging")}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) - {"enable-custom-mac-paper-sizes", -@@ -3562,13 +3562,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, - #endif // OS_CHROMEOS + #if defined(OS_CHROMEOS) + {"release-notes", flag_descriptions::kReleaseNotesName, +@@ -4337,12 +4337,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-settings-split-by-card-type", - flag_descriptions::kAutofillSettingsSplitByCardTypeName, - flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)}, + {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, + flag_descriptions::kGlobalMediaControlsDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalMediaControls)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if !defined(OS_ANDROID) - {"hardware-media-key-handling", -@@ -3895,7 +3895,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, - FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, + #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) + {"win-use-native-spellchecker", +@@ -4355,12 +4355,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSafetyTipDescription, kOsAll, + FEATURE_VALUE_TYPE(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) - {"enable-autofill-save-credit-card-uses-improved-messaging", - flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, - flag_descriptions:: -@@ -3905,7 +3905,7 @@ const FeatureEntry kFeatureEntries[] = { - autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, - kAutofillSaveCreditCardUsesImprovedMessagingVariations, - "AutofillSaveCreditCardUsesImprovedMessaging")}, + {"animated-avatar-button", flag_descriptions::kAnimatedAvatarButtonName, + flag_descriptions::kAnimatedAvatarButtonDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kAnimatedAvatarButton)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) - {"smart-dim-model-v3", flag_descriptions::kSmartDimModelV3Name, + {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName, +@@ -4484,12 +4484,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kBundledHTTPExchangesDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kBundledHTTPExchanges)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"profile-menu-revamp", flag_descriptions::kProfileMenuRevampName, + flag_descriptions::kProfileMenuRevampDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kProfileMenuRevamp)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName, + flag_descriptions::kPasswordLeakDetectionDescription, kOsAll, +@@ -4543,11 +4543,11 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)}, + #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) + {"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName, + flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)}, +-#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", diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 49e224a58c1c..45d6d7927deb 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,4 +1,4 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; @@ -9,7 +9,7 @@ // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. - return metrics::OmniboxInputType::INVALID; + return metrics::OmniboxInputType::EMPTY; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) // If block state is unknown, check if there is an application registered 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 new file mode 100644 index 000000000000..a45e85ca8f23 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/background/background_mode_manager.cc.orig 2019-10-21 19:06:20 UTC ++++ chrome/browser/background/background_mode_manager.cc +@@ -769,7 +769,7 @@ gfx::ImageSkia GetStatusTrayIcon() { + return gfx::ImageSkia(); + + return family->CreateExact(size).AsImageSkia(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + IDR_PRODUCT_LOGO_128); + #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc new file mode 100644 index 000000000000..6a854f49b1a6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -0,0 +1,14 @@ +--- chrome/browser/browser_features.cc.orig 2019-10-30 15:46:57 UTC ++++ chrome/browser/browser_features.cc +@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{ + "DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kSyncClipboardServiceFeature{ + "SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT}; +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + } // namespace features diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h new file mode 100644 index 000000000000..4b2aa71959b4 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__features.h @@ -0,0 +1,14 @@ +--- chrome/browser/browser_features.h.orig 2019-10-30 15:47:15 UTC ++++ chrome/browser/browser_features.h +@@ -20,9 +20,9 @@ namespace features { + extern const base::Feature kDoubleTapToZoomInTabletMode; + #endif + +-#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 base::Feature kSyncClipboardServiceFeature; +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + } // namespace features + diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 099e3d8e0ffe..0fb0f6eee284 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2019-07-24 18:58:07 UTC +--- chrome/browser/browser_resources.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/browser_resources.grd -@@ -77,7 +77,7 @@ +@@ -106,7 +106,7 @@ <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> @@ -9,8 +9,8 @@ <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" /> -@@ -666,7 +666,7 @@ - <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" /> +@@ -561,7 +561,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" /> - <if expr="is_android or is_linux"> 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 b7710c4836b2..6edbb34ca415 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-07-24 18:58:07 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -220,9 +220,9 @@ +@@ -222,9 +222,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" -@@ -260,7 +260,7 @@ +@@ -261,7 +261,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 -@@ -1079,7 +1079,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1075,7 +1075,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 . -@@ -1088,14 +1088,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1084,14 +1084,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -48,7 +48,7 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -57,15 +57,15 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1291,6 +1291,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1280,6 +1280,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); - BrowserThread::PostAfterStartupTask( -@@ -1299,6 +1300,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::PostTask( +@@ -1288,6 +1289,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 087df4cd43c4..95d1e7c3d996 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,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -16,7 +16,7 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -104,7 +106,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 7cf047cf157e..af0d2171ff2c 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,7 +1,7 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-07-24 18:58:07 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -429,7 +429,7 @@ - #include "chromeos/services/secure_channel/secure_channel_service.h" +@@ -403,7 +403,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" -#elif defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -484,7 +484,7 @@ +@@ -459,7 +459,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -510,7 +510,7 @@ +@@ -485,7 +485,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 -@@ -1250,7 +1250,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1199,7 +1199,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) -@@ -1276,7 +1276,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1225,7 +1225,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 -@@ -2093,7 +2093,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2028,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,16 +54,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2318,7 +2318,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - process_type, - command_line); +@@ -2266,7 +2266,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( + process_type, command_line); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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)) { -@@ -3660,7 +3660,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3574,7 +3574,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -72,7 +72,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4362,7 +4362,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4244,7 +4244,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -81,12 +81,3 @@ std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: MaybeCreateThrottleFor(handle); -@@ -5205,7 +5205,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco - std::unique_ptr<content::OverlayWindow> - ChromeContentBrowserClient::CreateWindowForPictureInPicture( - content::PictureInPictureWindowController* controller) { --#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) - // Note: content::OverlayWindow::Create() is defined by platform-specific - // implementation in chrome/browser/ui/views. This layering hack, which goes 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 d5c03fb8c2ca..59c9ef5ef94d 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-07-24 18:58:07 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -380,12 +380,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -360,12 +360,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; @@ -13,5 +13,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #if defined(OS_WIN) - bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; - base::string16 GetAppContainerSidForSandboxType( + bool PreSpawnRenderer(sandbox::TargetPolicy* policy, + RendererSpawnFlags flags) override; diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc index 7fcec9bf2916..99e12ba44d04 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-03-17 19:35:08 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler( +@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index e8a54be247f8..3f8b5e8f793f 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 638aab69b6b6..7dc4b2023401 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-07-24 18:58:09 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1237,7 +1237,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1257,7 +1257,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 -@@ -1267,7 +1267,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1287,7 +1287,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index b4cd9485a2c8..1681ddb94d94 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-07-24 18:58:09 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/download/download_item_model.cc -@@ -560,7 +560,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -565,7 +565,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(); -@@ -597,7 +597,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -602,7 +602,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_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 42d115e10c9c..75e55d39526b 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-07-24 18:58:09 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") { +@@ -1128,6 +1128,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 86b77fad1e6a..55676a0c8e95 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-06-04 18:55:17 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -53,7 +53,11 @@ +@@ -54,7 +54,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 afda5723498b..ba20982835bf 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,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-04-30 22:22:33 UTC +--- 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 -@@ -128,7 +128,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist - settings_api::PrefType::PREF_TYPE_BOOLEAN; +@@ -155,7 +155,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -138,7 +138,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -165,7 +165,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_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index aeed0db920d9..7440fdc3cc94 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -29,7 +29,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -609,7 +609,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi } bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() { @@ -27,7 +27,7 @@ // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -633,11 +633,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run +@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return true; diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc deleted file mode 100644 index a9e131364d72..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/bookmark_app_extension_util.cc.orig 2019-06-04 18:55:17 UTC -+++ chrome/browser/extensions/bookmark_app_extension_util.cc -@@ -34,7 +34,7 @@ namespace { - - #if !defined(OS_CHROMEOS) - bool CanOsAddDesktopShortcuts() { --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - return true; - #else - return false; diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index bb8e332d5c7b..0465cb456c32 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -94,7 +94,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); 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 0f8d49f35598..47f764d96b5f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -755,7 +755,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -765,7 +765,7 @@ void ExternalProviderImpl::CreateExternalProviders( chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } @@ -8,13 +8,13 @@ +#elif defined(OS_LINUX) || defined(OS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, - new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -782,7 +782,7 @@ void ExternalProviderImpl::CreateExternalProviders( + 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) && defined(CHROMIUM_BUILD)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) +-#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, - new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, + base::MakeRefCounted<ExternalPrefLoader>( diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index 3da7a1c2e1c4..e180c95ab319 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc -@@ -44,7 +44,7 @@ enum class ForcedShowDialogState { +@@ -45,7 +45,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = ForcedShowDialogState::kNotForced; @@ -9,7 +9,7 @@ // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -95,7 +95,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { } void DoPostImportPlatformSpecificTasks(Profile* profile) { diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 46fcefffd808..5220c25e4fb8 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3256,21 +3256,21 @@ const char kInstallableInkDropDescription[] = +@@ -3632,7 +3632,7 @@ const char kZeroStateFilesDescription[] = + + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + 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[] = + "utilization."; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -3670,15 +3670,15 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -14,15 +32,48 @@ -#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) + + 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."; + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = - "If enabled, Chrome will scroll web pages on stylus drag."; +@@ -3715,7 +3715,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa + const char kSyncClipboardServiceDescription[] = + "Enables clipboard syncing via Chrome Sync."; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_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 6a9b4fcdd4c6..4b0b0009c362 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,36 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/flag_descriptions.h -@@ -1963,19 +1963,19 @@ extern const char kInstallableInkDropDescription[]; +@@ -20,9 +20,9 @@ + #include "ui/android/buildflags.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // 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[]; + + #endif // #if defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + extern const char kTerminalSystemAppName[]; + extern const char kTerminalSystemAppDescription[]; + +@@ -2187,7 +2187,7 @@ extern const char kDynamicTcmallocName[]; + extern const char kDynamicTcmallocDescription[]; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -2206,14 +2206,14 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -13,14 +43,45 @@ -#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) + + extern const char kClickToCallContextMenuForSelectedTextName[]; +@@ -2222,10 +2222,10 @@ extern const char kClickToCallContextMenuForSelectedTe + extern const char kClickToCallUIName[]; + 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) + -#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[]; + extern const char kSyncClipboardServiceName[]; + extern const char kSyncClipboardServiceDescription[]; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_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_router_providers_wired__display_wired__display__media__route__provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc index 65359a0157b5..9b007ae67c87 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc @@ -1,14 +1,14 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc @@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool incognito, CreateRouteCallback callback) { - DCHECK(!base::ContainsKey(presentations_, presentation_id)); -+#if defined(OS_BSD) // XXX -+ std::move(callback).Run(base::nullopt, nullptr, -+ std::string("Not implemented"), -+ RouteRequestResult::UNKNOWN_ERROR); -+ return; + DCHECK(!base::Contains(presentations_, presentation_id)); ++#if defined(OS_BSD) ++ std::move(callback).Run(base::nullopt, nullptr, ++ std::string("Not implemented"), ++ RouteRequestResult::UNKNOWN_ERROR); ++ return; +#else base::Optional<Display> display = GetDisplayBySinkId(sink_id); if (!display) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 0128c2679c04..c1ca8fcabf4e 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -393,6 +393,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -358,6 +358,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 4bef24642cc2..401fd8736ac5 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,8 +1,8 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-07-24 18:58:09 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc -@@ -26,10 +26,10 @@ - #include "content/public/browser/content_browser_client.h" +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2019-10-30 15:49:45 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.cc +@@ -24,10 +24,10 @@ #include "content/public/browser/render_process_host.h" + #include "services/service_manager/public/cpp/connector.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -11,23 +11,23 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - using content::BrowserThread; using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging( + +@@ -267,7 +267,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void WebRtcLoggingHandlerHost::GetLogsDirectory( + void WebRtcLoggingController::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -328,7 +328,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces - FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, file_system.id(), registered_name)); +@@ -312,7 +312,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void WebRtcLoggingHandlerHost::OnRtpPacket( + void WebRtcLoggingController::OnRtpPacket( std::unique_ptr<uint8_t[]> packet_header, diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 4ae57195d29b..e3ef33fc829f 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig 2019-04-30 22:22:34 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h -@@ -153,13 +153,13 @@ class WebRtcLoggingHandlerHost : public content::Brows +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2019-10-30 15:50:11 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.h +@@ -129,13 +129,13 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -14,9 +14,9 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - private: - friend class content::BrowserThread; -@@ -226,7 +226,7 @@ class WebRtcLoggingHandlerHost : public content::Brows + // chrome::mojom::WebRtcLoggingClient methods: + void OnAddMessages( +@@ -188,7 +188,7 @@ class WebRtcLoggingController bool success, const std::string& error_message); @@ -25,12 +25,12 @@ // Grants the render process access to the 'WebRTC Logs' directory, and // invokes |callback| with the ids necessary to create a DirectoryEntry // object. If the |logs_path| couldn't be created or found, |error_callback| -@@ -235,7 +235,7 @@ class WebRtcLoggingHandlerHost : public content::Brows +@@ -197,7 +197,7 @@ class WebRtcLoggingController const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback, const base::FilePath& logs_path); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // The render process ID this object belongs to. - const int render_process_id_; + static base::FilePath GetLogDirectoryAndEnsureExists( + const base::FilePath& browser_context_directory_path); diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index bb0ba23c9542..dd487ab9da88 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -44,7 +44,9 @@ +@@ -47,7 +47,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -52,7 +54,7 @@ +@@ -55,7 +57,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif @@ -18,4 +18,4 @@ +#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #if defined(USE_OZONE) || defined(USE_X11) - #include "ui/events/devices/input_device_event_observer.h" + #include "ui/events/devices/device_data_manager.h" 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 691445b63a1e..d77194a37751 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,20 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -902,7 +902,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -721,11 +721,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + #endif // defined(OS_WIN) + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); + #endif // defined(OS_WIN) || defined(OS_MACOSX) || \ +- // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_PLUGINS) + plugin_metrics_provider_ = new PluginMetricsProvider(local_state); +@@ -974,7 +974,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 00bcd9672288..1ea845a99b24 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-07-24 18:58:09 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -360,7 +360,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -378,7 +378,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,12 +9,12 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -383,7 +383,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc - MEMORY_METRICS_HISTOGRAM_MB( - std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint", - pmd.os_dump().shared_footprint_kb / 1024); +@@ -401,7 +401,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".SharedMemoryFootprint", + pmd.os_dump().shared_footprint_kb / 1024); -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - MEMORY_METRICS_HISTOGRAM_MB( - std::string(UMA_PREFIX) + process_name + ".PrivateSwapFootprint", - pmd.os_dump().private_footprint_swap_kb / 1024); + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".PrivateSwapFootprint", + pmd.os_dump().private_footprint_swap_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 new file mode 100644 index 000000000000..e860a6e97dbc --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -225,7 +225,7 @@ const struct { + {base::DIR_APP_DATA, nullptr, true}, + {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux also block access to devices via /dev, as well as security + // sensitive data in /sys and /proc. + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), true}, 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 80a31ea106e6..cc2207a69018 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,21 +1,20 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-07-24 18:58:09 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -72,12 +72,12 @@ +@@ -78,11 +78,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/common/chrome_paths_internal.h" - #include "chrome/common/chrome_switches.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - - namespace { ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) -@@ -191,10 +191,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + #if BUILDFLAG(ENABLE_EXTENSIONS) + #include "extensions/common/constants.h" +@@ -206,10 +206,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -28,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -434,10 +434,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -457,10 +457,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -41,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -486,10 +486,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -509,10 +509,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -54,9 +53,9 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -586,7 +586,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - content::GetNetworkService()->ConfigureStubHostResolver( - stub_resolver_enabled, std::move(dns_over_https_servers)); +@@ -620,7 +620,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + insecure_stub_resolver_enabled, secure_dns_mode, + std::move(dns_over_https_servers)); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index d1f708c3b1c6..842b6ca7ccfa 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #endif -@@ -121,7 +121,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 45506f2dcd70..f94806ea625f 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,8 +1,8 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-07-24 18:58:10 UTC +--- 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 -@@ -82,7 +82,11 @@ +@@ -84,7 +84,11 @@ + #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" - #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" +#if defined(OS_BSD) +#include <re2/re2.h> @@ -11,4 +11,4 @@ +#endif #include "url/url_constants.h" - #if defined(FULL_SAFE_BROWSING) + #if BUILDFLAG(FULL_SAFE_BROWSING) diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index 943f8b9531b9..889049cf9109 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -302,7 +302,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - network_context_getter); +@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + base::TimeDelta::FromSeconds(20)); #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<password_manager::PasswordStoreSigninNotifier> notifier = std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( - profile); + IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index 4d7487bd2f26..98bd40401783 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -1,4 +1,4 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc @@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { #if defined(OS_WIN) @@ -9,7 +9,7 @@ idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); #endif #if defined(OS_MACOSX) -@@ -87,7 +87,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -88,7 +88,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { kDiskUsageHistogramMin, kDiskUsageHistogramMax, kDiskUsageHistogramBucketCount); #endif @@ -18,7 +18,7 @@ UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); #endif -@@ -105,7 +105,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -109,7 +109,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", true); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); #endif -@@ -122,7 +122,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { +@@ -129,7 +129,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { kHistogramBucketCount); if (cpu_usage_ > kHighCPUUtilizationThreshold) UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc index 41051a24fa78..4a22f2d1a9c6 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/plugins/plugin_info_host_impl.cc -@@ -411,7 +411,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( +@@ -383,7 +383,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { if (cus_plugin_info) { output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc new file mode 100644 index 000000000000..b79d0d1d66d8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2019-09-16 07:21:37 UTC ++++ chrome/browser/policy/browser_signin_policy_handler.cc +@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + } + switch (static_cast<BrowserSigninMode>(int_value)) { + case BrowserSigninMode::kForced: +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); + #endif + FALLTHROUGH; 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 70c7fdb4a42c..90345454284e 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-07-24 18:58:10 UTC +--- 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 -@@ -109,7 +109,7 @@ +@@ -113,7 +113,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,10 +9,10 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -321,11 +321,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - { key::kSafeSitesFilterBehavior, - policy_prefs::kSafeSitesFilterBehavior, - base::Value::Type::INTEGER}, +@@ -333,11 +333,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kSafeBrowsingSendFilesForMalwareCheck, + base::Value::Type::INTEGER + }, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, @@ -23,7 +23,7 @@ #if defined(OS_POSIX) { key::kNtlmV2Enabled, prefs::kNtlmV2Enabled, -@@ -1021,7 +1021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1064,7 +1064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -32,3 +32,12 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, +@@ -1125,7 +1125,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + browser_switcher::prefs::kChromeParameters, + base::Value::Type::LIST }, + #endif +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + { key::kBrowserGuestModeEnforced, + prefs::kBrowserGuestModeEnforced, + base::Value::Type::BOOLEAN }, diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc index dac1f7e6fb9a..fc2c8e8b2f06 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -183,6 +183,8 @@ class PolicyTestCase { +@@ -184,6 +184,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); 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 3c36b6b42e3a..5434edaf9f46 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-07-24 18:58:10 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -338,7 +338,7 @@ +@@ -346,7 +346,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -872,7 +872,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -951,7 +951,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 390f3f7adb9f..1180842655b1 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-06-04 18:55:17 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -183,7 +183,7 @@ const char* const kPersistentPrefNames[] = { +@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 4daaedead87e..f8a7db8e85a3 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -94,11 +94,11 @@ +@@ -95,11 +95,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,7 +23,7 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -901,7 +901,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { 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 175c7a801253..69e9d6d67baf 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,15 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-07-24 18:58:10 UTC +--- 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 -@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -181,7 +181,7 @@ + #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.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) + #include "chrome/browser/sync/sync_clipboard_service_factory.h" + #endif + +@@ -336,7 +336,7 @@ void ChromeBrowserMainExtraPartsProfiles:: MediaGalleriesPreferencesFactory::GetInstance(); #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,3 +18,12 @@ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); +@@ -398,7 +398,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + SpellcheckServiceFactory::GetInstance(); + #endif + suggestions::SuggestionsServiceFactory::GetInstance(); +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + SyncClipboardServiceFactory::GetInstance(); + #endif + TabRestoreServiceFactory::GetInstance(); 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 35ec1b1dad33..4626355777af 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-07-24 18:58:10 UTC +--- 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 -@@ -1672,7 +1672,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1699,7 +1699,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, -@@ -1714,7 +1714,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1741,7 +1741,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 -@@ -1994,7 +1994,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2045,7 +2045,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index 992704a5c5e1..6512d38fe080 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -35,7 +35,7 @@ cr.define('settings', function() { +@@ -19,7 +19,7 @@ cr.define('settings', function() { useDefaultTheme() {} @@ -9,7 +9,7 @@ useSystemTheme() {} // </if> -@@ -93,7 +93,7 @@ cr.define('settings', function() { +@@ -59,7 +59,7 @@ cr.define('settings', function() { chrome.send('useDefaultTheme'); } diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 3ddfafe75b08..5e8da694b967 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-04-30 22:22:35 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -64,7 +64,7 @@ +@@ -67,7 +67,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_" external></cr-link-row> @@ -8,16 +8,16 @@ +<if expr="not is_posix or chromeos"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> - <paper-button id="useDefault" on-click="onUseDefaultTap_" -@@ -73,7 +73,7 @@ - </paper-button> + <cr-button id="useDefault" on-click="onUseDefaultTap_"> +@@ -75,7 +75,7 @@ + </cr-button> </template> </if> -<if expr="is_linux and not chromeos"> +<if expr="is_posix and not chromeos"> <div class="settings-row continuation" hidden="[[!showThemesSecondary_( - prefs.extensions.theme.id.value, useSystemTheme_)]]" + prefs.extensions.theme.id.value, useSystemTheme_)]]" @@ -138,7 +138,7 @@ pref="{{prefs.bookmark_bar.show_on_all_tabs}}" label="$i18n{showBookmarksBar}"> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index ad20f24a351f..a866ff36c1e5 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-07-24 18:58:11 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -125,7 +125,7 @@ Polymer({ +@@ -130,7 +130,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', @@ -9,8 +9,8 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -228,7 +228,7 @@ Polymer({ - this.browserProxy_.useDefaultTheme(); +@@ -238,7 +238,7 @@ Polymer({ + this.appearanceBrowserProxy_.useDefaultTheme(); }, - // <if expr="is_linux and not chromeos"> @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -304,10 +304,10 @@ Polymer({ +@@ -315,10 +315,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index d82d2eef714b..dd43dfafca4f 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-04-30 22:22:35 UTC +--- 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 -@@ -716,7 +716,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -713,7 +713,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_local__files__ntp__source.cc b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc deleted file mode 100644 index e25c43ecb50b..000000000000 --- a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- chrome/browser/search/local_files_ntp_source.cc.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/search/local_files_ntp_source.cc -@@ -20,8 +20,13 @@ - #include "build/build_config.h" - #include "chrome/common/url_constants.h" - #include "content/public/browser/url_data_source.h" -+#if defined(OS_BSD) -+#include <re2/re2.h> -+#include <re2/stringpiece.h> -+#else - #include "third_party/re2/src/re2/re2.h" - #include "third_party/re2/src/re2/stringpiece.h" -+#endif - - namespace { - 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 new file mode 100644 index 000000000000..1a59f2f395a8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -0,0 +1,14 @@ +--- 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 +@@ -17,7 +17,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" ++#if defined(OS_BSD) ++#include <re2/re2.h> ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + 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 new file mode 100644 index 000000000000..9ad1c199eb60 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.cc @@ -0,0 +1,17 @@ +--- 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 new file mode 100644 index 000000000000..927471418ea6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.h @@ -0,0 +1,20 @@ +--- 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 fdf032282034..985d9ae9aabb 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,7 +1,7 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-07-24 18:58:11 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/signin/signin_util.cc -@@ -33,7 +33,7 @@ - #include "services/identity/public/cpp/primary_account_mutator.h" +@@ -34,7 +34,7 @@ + #include "google_apis/gaia/gaia_auth_util.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h" -@@ -45,7 +45,7 @@ namespace { +@@ -46,7 +46,7 @@ namespace { constexpr char kSignoutSettingKey[] = "signout_setting"; diff --git a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc index 6171474e7606..3b76cf45fb70 100644 --- a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc +++ b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-07-24 18:58:11 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc @@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) @@ -9,7 +9,7 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -218,7 +218,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -204,7 +204,7 @@ void SSLErrorControllerClient::Proceed() { } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index ca8d85c2b52b..27e51d1d61eb 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,7 +1,7 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -372,7 +372,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - dump_stack)); +@@ -389,7 +389,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + GetSyncableServiceForType(syncer::APP_LIST), dump_stack)); #endif // BUILDFLAG(ENABLE_APP_LIST) -#if defined(OS_LINUX) || defined(OS_WIN) @@ -9,9 +9,9 @@ // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { controllers.push_back( -@@ -382,7 +382,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::Unretained(this), syncer::DICTIONARY), - dump_stack)); +@@ -397,7 +397,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + syncer::DICTIONARY, GetModelTypeStoreService()->GetStoreFactory(), + GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index c9547908221f..1e077a7ff46c 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) @@ -23,8 +23,8 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), - is_backgrounded_(false), -@@ -130,10 +130,10 @@ TaskGroup::TaskGroup( + is_backgrounded_(false) { +@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -301,14 +301,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 4f8e8717df6e..3b055c6018f5 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -36,7 +36,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -119,9 +119,9 @@ class TaskGroup { +@@ -122,9 +122,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) @@ -21,7 +21,7 @@ int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } -@@ -135,9 +135,9 @@ class TaskGroup { +@@ -138,9 +138,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -33,7 +33,7 @@ void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -206,10 +206,10 @@ class TaskGroup { +@@ -209,10 +209,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 3a5e7410c48d..a2ea0b3e146f 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -54,7 +54,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -151,13 +151,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -149,13 +149,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index b83833d2e7d5..cb287277caa7 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -210,11 +210,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -219,11 +219,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { 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 new file mode 100644 index 000000000000..7b7c9443d50a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -0,0 +1,29 @@ +--- chrome/browser/themes/theme_service_factory.cc.orig 2019-10-30 15:53:20 UTC ++++ chrome/browser/themes/theme_service_factory.cc +@@ -18,7 +18,7 @@ + + #if defined(OS_WIN) + #include "chrome/browser/themes/theme_service_win.h" +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #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 + ThemeService* provider = NULL; + #if defined(OS_WIN) + provider = new ThemeServiceWin; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + provider = new ThemeServiceAuraLinux; + #else + provider = new ThemeService; +@@ -72,7 +72,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc + + void ThemeServiceFactory::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool default_uses_system_theme = false; + + const views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index a692188d2a5f..5b223607a463 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 727ed8d20eaa..b20764859537 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-07-24 18:58:12 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-10-21 19:06: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 = -@@ -461,7 +461,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -467,7 +467,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -911,7 +911,7 @@ void BrowserCommandController::InitCommandState() { +@@ -925,7 +925,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_browser__window.h b/www/chromium/files/patch-chrome_browser_ui_browser__window.h deleted file mode 100644 index 5bff1e115a48..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-07-24 18:58:12 UTC -+++ chrome/browser/ui/browser_window.h -@@ -448,7 +448,7 @@ class BrowserWindow : public ui::BaseWindow { - bool is_source_keyboard) = 0; - - #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) - virtual void ShowHatsBubbleFromAppMenuButton() = 0; - #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc index f2e025b23342..d2b8a9c562a4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog( +@@ -336,6 +336,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( 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 611d7d2c0ae2..77885ff8e32a 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-03-11 22:00:54 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -180,7 +180,7 @@ std::vector<int> SadTab::GetSubMessages() { +@@ -181,7 +181,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_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 9d8d22ece35c..933fc2922c0a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -88,7 +88,7 @@ static const char* kBadFlags[] = { +@@ -89,7 +89,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index ca3d2dea58e3..c0bc8c2808df 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -82,7 +82,7 @@ +@@ -85,7 +85,7 @@ #include "chrome/browser/ui/user_manager.h" #endif @@ -9,7 +9,16 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -663,8 +663,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -295,7 +295,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co + // true, send a warning if guest mode is requested but not allowed by policy. + bool IsGuestModeEnforced(const base::CommandLine& command_line, + bool show_warning) { +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + PrefService* service = g_browser_process->local_state(); + DCHECK(service); + +@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 67f7eab232ce..a0ae6605a320 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-07-24 18:58:12 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -119,7 +119,7 @@ +@@ -121,7 +121,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 -@@ -307,11 +307,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -313,11 +313,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,5 +21,5 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktop)) { - HatsHelper::CreateForWebContents(web_contents); + features::kHappinessTrackingSurveysForDesktop) || + base::FeatureList::IsEnabled( diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index 79d1f1fb8d50..082584f23381 100644 --- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -685,7 +685,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } -#if !defined(OS_LINUX) || defined(USE_AURA) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) - case IDC_BOOKMARK_PAGE: - return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile()); + case IDC_BOOKMARK_THIS_TAB: + return !chrome::ShouldRemoveBookmarkThisTabUI(browser_->profile()); case IDC_BOOKMARK_ALL_TABS: diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc new file mode 100644 index 000000000000..cc70bebd77c7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..69428146c774 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -0,0 +1,11 @@ +--- 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_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index a59c0a52a24f..5b89c27e8d36 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-09-09 21:55:11 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -51,7 +51,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -9,7 +9,7 @@ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -81,7 +81,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -18,7 +18,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, @@ -27,7 +27,7 @@ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -124,14 +124,14 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -125,14 +125,14 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 4b980d95c7a5..90ba9d447ddf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -32,7 +32,7 @@ +@@ -36,7 +36,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,17 +9,17 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -42,7 +42,7 @@ +@@ -46,7 +46,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} - -@@ -87,7 +87,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( - g_browser_process->system_network_context_manager()->GetContext()); + // This connector is used in ui_devtools's TracingAgent to hook up with the + // tracing service. +@@ -109,7 +109,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + devtools_server_->tracing_agent()); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -27,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -118,7 +118,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -140,7 +140,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); 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 81ebcce24d95..4ad65dcd3917 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,4 +1,4 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-09-09 21:55:11 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -37,8 +37,10 @@ namespace { @@ -11,7 +11,7 @@ } } // namespace -@@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() { +@@ -108,8 +110,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__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 03cfa74644dc..c1d853c940c7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,15 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -39,7 +39,7 @@ - #include "components/user_manager/user_manager.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" - #endif - -@@ -50,7 +50,7 @@ +@@ -46,7 +46,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { @@ -18,12 +9,3 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -111,7 +111,7 @@ void BrowserFrame::InitBrowserFrame() { - non_client_view()->set_context_menu_controller(this); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); - #endif - } 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 159ec7f62f8e..ca73273451ed 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-07-24 18:58:12 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1557,7 +1557,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1581,7 +1581,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 61d4bb6d6cfe..f87a008d7e52 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-07-24 18:58:13 UTC +--- 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 @@ -47,7 +47,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -353,7 +353,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt +@@ -352,7 +352,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( -@@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 90627603db72..3f40613c5528 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-07-24 18:58:13 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -79,7 +79,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -80,7 +80,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -127,7 +127,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -131,7 +131,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } 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 b21dd7a39c6c..902935e6f831 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,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-07-24 18:58:13 UTC +--- 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 @@ -69,7 +69,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) 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 c806dd473555..459025adb691 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-07-29 18:58:58 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -525,7 +525,7 @@ void Tab::OnMouseCaptureLost() { +@@ -512,7 +512,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 } -@@ -535,7 +535,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) +@@ -522,7 +522,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 c9ae2025df96..3543265c74e6 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-07-24 18:58:13 UTC +--- 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 -@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -443,7 +443,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()); -@@ -872,7 +872,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -865,7 +865,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else SetCapture(target_context); @@ -18,9 +18,9 @@ // 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. -@@ -2023,7 +2023,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2003,7 +2003,7 @@ TabDragController::Liveness TabDragController::GetLoca + if (dragged_window) exclude.insert(dragged_window); - } } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 9c0ea349e17d..0a9da7a74d9c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -552,7 +552,7 @@ std::string ChromeURLs() { +@@ -562,7 +562,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest( .GetRawDataResource(idr) .as_string(); } 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 e2c08a27ae5c..4b9c59197135 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,7 +1,7 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-07-24 18:58:13 UTC +--- 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 -@@ -205,11 +205,11 @@ - #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" +@@ -212,11 +212,11 @@ + #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox_internals_ui.h" #endif -@@ -325,7 +325,7 @@ bool IsAboutUI(const GURL& url) { +@@ -338,7 +338,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) -@@ -627,7 +627,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -654,7 +654,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,7 +32,7 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -672,17 +672,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -702,17 +702,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index c545d3ba2d85..bf333383f3f1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme, base::Unretained(this))); @@ -9,7 +9,7 @@ web_ui()->RegisterMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -59,7 +59,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba +@@ -39,7 +39,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme(); } 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 194ed11744de..033f8f22dee4 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-07-24 18:58:13 UTC +--- 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 -@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -702,7 +702,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}, -@@ -605,7 +605,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -722,7 +722,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_bookmark__app__finalizer__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc new file mode 100644 index 000000000000..9b0d271a91c7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2019-10-30 15:54:13 UTC ++++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc +@@ -15,7 +15,7 @@ namespace { + + #if !defined(OS_CHROMEOS) + bool CanOsAddDesktopShortcuts() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return true; + #else + return false; diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 601d96b5fc62..6bc894c9e1e4 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-07-24 18:58:13 UTC +--- chrome/common/BUILD.gn.orig 2019-10-21 19:06:25 UTC +++ chrome/common/BUILD.gn -@@ -298,6 +298,10 @@ static_library("common") { +@@ -293,6 +293,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 129c37bd3e94..f9b5df36a171 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-07-24 18:58:13 UTC +--- chrome/common/chrome_features.cc.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_features.cc -@@ -98,13 +98,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc +@@ -84,13 +84,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) @@ -16,7 +16,7 @@ // Enables or disables whether permission prompts are automatically blocked // after the user has explicitly dismissed them too many times. -@@ -150,7 +150,7 @@ const base::Feature kThirdPartyModulesBlocking{ +@@ -140,7 +140,7 @@ const base::Feature kThirdPartyModulesBlocking{ "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index c6957e6df02e..a56d7d0fa766 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-07-24 18:58:13 UTC +--- chrome/common/chrome_features.h.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_features.h -@@ -65,10 +65,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -64,10 +64,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutoFetchOnNetErrorPage; #endif @@ -13,9 +13,9 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -84,7 +84,7 @@ extern const base::Feature kBrowserHangFixesExperiment +@@ -86,7 +86,7 @@ extern const base::Feature kBundledConnectionHelpFeatu COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kBundledConnectionHelpFeature; + extern const base::Feature kCaptionSettings; -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 41357f8211b1..0081f7d6de55 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_paths.cc.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_paths.cc @@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); @@ -9,12 +9,13 @@ // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = - #if defined(GOOGLE_CHROME_BUILD) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); - #endif // defined(GOOGLE_CHROME_BUILD) + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) // The path to the hint file that tells the pepper plugin loader // where it can find the latest component updated flash. @@ -34,29 +35,16 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -459,17 +459,19 @@ bool PathProvider(int key, base::FilePath* result) { - if (!base::PathExists(cur)) // We don't want to create this - return false; - break; --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) - case chrome::DIR_POLICY_FILES: { - #if defined(GOOGLE_CHROME_BUILD) - cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); -+#elif defined(OS_BSD) -+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); - #else - cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); - #endif - break; +@@ -489,7 +489,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif --#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || defined(OS_BSD) || \ - defined(OS_MACOSX) + #if defined(OS_CHROMEOS) || \ +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) ++ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; +@@ -497,7 +497,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -65,7 +53,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -532,7 +532,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -73,9 +61,9 @@ +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) - #if defined(GOOGLE_CHROME_BUILD) -@@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) { - #if defined(GOOGLE_CHROME_BUILD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -546,6 +546,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")); +#elif defined(OS_BSD) @@ -84,7 +72,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -558,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -93,7 +81,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -566,7 +569,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) @@ -102,7 +90,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -574,7 +577,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 3237b6aa4468..70381fa7d824 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,15 +1,15 @@ ---- chrome/common/chrome_paths.h.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_paths.h.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_paths.h -@@ -51,7 +51,7 @@ enum { - // to set policies for chrome. This directory - // contains subdirectories. +@@ -53,7 +53,7 @@ enum { + // contains subdirectories. #endif --#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ - defined(OS_MACOSX) + #if defined(OS_CHROMEOS) || \ +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) ++ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. -@@ -60,7 +60,7 @@ enum { + // On Chrome OS, this path is used for OEM +@@ -61,7 +61,7 @@ enum { // create it. #endif @@ -18,23 +18,23 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -107,7 +107,7 @@ enum { +@@ -119,7 +119,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. -#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) - DIR_NATIVE_MESSAGING, // System directory where native messaging host - // manifest files are stored. - DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -122,10 +122,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. ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + 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 { + 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. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to - // the component updated flash plugin. + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index a29c37867348..22ca9df81e2f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_switches.cc.orig 2019-07-24 18:58:13 UTC +--- chrome/common/chrome_switches.cc.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_switches.cc @@ -853,7 +853,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; @@ -7,5 +7,5 @@ -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; - #endif + // Causes the browser to launch directly in guest mode. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 9a7d74efaef0..15b4de6a5158 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2019-07-24 18:58:13 UTC +--- chrome/common/chrome_switches.h.orig 2019-10-21 19:06:25 UTC +++ chrome/common/chrome_switches.h -@@ -265,7 +265,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -264,7 +264,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) extern const char kEnableNewAppMenuIcon[]; + extern const char kGuest[]; #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 cc8ae9e5c9f3..b5cdea078543 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-07-24 18:58:13 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-10-21 19:06:25 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -106,7 +106,7 @@ if (is_chromeos) { +@@ -109,7 +109,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 277fce476cef..c76d32938d76 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-07-24 18:58:14 UTC +--- chrome/common/features.gni.orig 2019-10-21 19:06:26 UTC +++ chrome/common/features.gni -@@ -41,9 +41,9 @@ declare_args() { +@@ -42,9 +42,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 eecf4c8204ce..2cbe5253509d 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-07-24 18:58:14 UTC +--- chrome/common/pref_names.cc.orig 2019-10-21 19:06:26 UTC +++ chrome/common/pref_names.cc -@@ -982,7 +982,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1026,7 +1026,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 -@@ -1076,7 +1076,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1153,7 +1153,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"; -@@ -1468,7 +1468,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1540,7 +1540,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 -@@ -1730,12 +1730,12 @@ const char kAuthAndroidNegotiateAccountType[] = +@@ -1791,12 +1791,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 67623a3c23fe..7b95903f1916 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-07-24 18:58:14 UTC +--- chrome/common/pref_names.h.orig 2019-10-21 19:06:26 UTC +++ chrome/common/pref_names.h -@@ -309,7 +309,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -326,7 +326,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[]; -@@ -339,7 +339,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -357,7 +357,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) -@@ -496,7 +496,7 @@ extern const char kAppWindowPlacement[]; +@@ -511,7 +511,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) -@@ -696,9 +696,9 @@ extern const char kGSSAPILibraryName[]; +@@ -708,9 +708,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 33b27e9f08b9..c83226b94082 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-07-24 18:58:14 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-10-21 19:06:26 UTC +++ chrome/common/webui_url_constants.cc -@@ -299,7 +299,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -311,7 +311,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { const char kChromeUICastHost[] = "cast"; #endif @@ -9,7 +9,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -310,17 +310,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -322,17 +322,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -30,7 +30,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -525,13 +525,13 @@ const char* const kChromeHostURLs[] = { +@@ -586,13 +586,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 2355e0a4e503..8c22927da6bd 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-07-24 18:58:14 UTC +--- chrome/common/webui_url_constants.h.orig 2019-10-21 19:06:26 UTC +++ chrome/common/webui_url_constants.h -@@ -262,7 +262,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -270,7 +270,7 @@ bool IsSystemWebUIHost(base::StringPiece host); extern const char kChromeUICastHost[]; #endif @@ -9,7 +9,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -274,17 +274,17 @@ extern const char kChromeUIHatsURL[]; +@@ -282,17 +282,17 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index 58a2217abe7e..369fc1e77fc0 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,11 +1,45 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-07-24 18:58:14 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-10-21 19:06:26 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1011,7 +1011,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -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( } case chrome::mojom::PluginStatus::kRestartRequired: { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - placeholder = create_blocked_plugin( - IDR_BLOCKED_PLUGIN_HTML, - l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED, + 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 8b33510aee79..48dc9c5921d0 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/test/BUILD.gn.orig 2019-07-24 18:58:15 UTC +--- chrome/test/BUILD.gn.orig 2019-10-21 19:06:26 UTC +++ chrome/test/BUILD.gn -@@ -5475,7 +5475,7 @@ test("chrome_app_unittests") { - "//components/crash/core/common", - "//components/flags_ui:switches", +@@ -5797,7 +5797,7 @@ test("chrome_app_unittests") { + "//components/safe_browsing:buildflags", + "//components/tracing", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { 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 0f98cebed8e2..7146f29b28b0 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-07-24 18:58:15 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-09-09 21:55:11 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -75,6 +75,10 @@ +@@ -76,6 +76,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" -@@ -101,7 +105,7 @@ +@@ -103,7 +107,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index f88d7c1bd355..97a81118bddd 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2019-07-24 18:58:15 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-09-09 21:55:11 UTC +++ chrome/test/base/testing_browser_process.h -@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -116,8 +116,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; StartupData* startup_data() override; @@ -10,4 +10,4 @@ + void StartAutoupdateTimer() /*override*/ {} #endif - net_log::ChromeNetLog* net_log() override; + component_updater::ComponentUpdateService* component_updater() override; 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 8b2918d07030..8e2b814ce9f2 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-04-30 22:22:38 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-09-09 21:55:12 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -66,6 +66,10 @@ +@@ -67,6 +67,10 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" #endif 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 c54ba38f7eba..4d56e4983f56 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-07-24 18:58:17 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-10-21 19:06:28 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -68,7 +68,7 @@ +@@ -71,7 +71,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> -@@ -280,7 +280,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -283,7 +283,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. -@@ -290,7 +290,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -293,7 +293,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -27,7 +27,7 @@ // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -435,7 +435,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -433,7 +433,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 1f934b98cfb3..c37b56bfd60d 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2019-07-24 18:58:17 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-10-21 19:06:28 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -576,7 +576,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -534,7 +534,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc new file mode 100644 index 000000000000..d141e1f0a1cb --- /dev/null +++ b/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc @@ -0,0 +1,23 @@ +--- chromecast/media/base/monotonic_clock.cc.orig 2019-10-30 15:55:35 UTC ++++ chromecast/media/base/monotonic_clock.cc +@@ -9,9 +9,9 @@ + #include "base/time/time.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include "chromecast/media/base/buildflags.h" +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + #include <zircon/syscalls.h> +@@ -20,7 +20,7 @@ + namespace chromecast { + namespace media { + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + int64_t MonotonicClockNow() { + timespec now = {0, 0}; + #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc deleted file mode 100644 index f64cb5f727f3..000000000000 --- a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-06-04 18:55:21 UTC -+++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc -@@ -16,9 +16,9 @@ - #include "chromecast/media/cma/backend/av_sync.h" - #include "chromecast/media/cma/backend/video_decoder_for_mixer.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chromecast/media/cma/backend/audio_buildflags.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_FUCHSIA) - #include <zircon/syscalls.h> -@@ -239,7 +239,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const { - return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner(); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const { - timespec now = {0, 0}; - #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) 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 6102d4b3edaf..69bb7570916a 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,4 +1,4 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-06-04 18:55:21 UTC +--- 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 @@ -36,7 +36,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" @@ -11,4 +11,4 @@ +#endif #include "url/gurl.h" - using blink::WebFormControlElement; + using blink::WebElement; 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 325527a66d53..5f09a7431121 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-07-24 18:58:18 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-10-21 19:06:28 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -215,7 +215,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -234,7 +234,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 600810092a1d..4f837011d40a 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-07-24 18:58:18 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-10-21 19:06:28 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1940,10 +1940,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1925,10 +1925,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 new file mode 100644 index 000000000000..16ee9ec76080 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_payments_features.cc.orig 2019-10-21 19:06:28 UTC ++++ components/autofill/core/common/autofill_payments_features.cc +@@ -159,7 +159,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio + + bool ShouldShowImprovedUserConsentForCreditCardSave() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The new user consent UI is fully launched on MacOS, Windows and Linux. + return true; + #endif diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index 4bb0156fb1e1..f4cdea27b407 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-07-24 18:58:18 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2019-09-09 21:55:14 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -213,7 +213,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { 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 53de5d05b67e..77ad6adbcb82 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-07-24 18:58:18 UTC +--- components/crash/content/app/BUILD.gn.orig 2019-10-21 19:06:28 UTC +++ components/crash/content/app/BUILD.gn -@@ -37,7 +37,7 @@ static_library("app") { +@@ -54,7 +54,7 @@ static_library("app") { sources += [ "crashpad.cc" ] } @@ -9,12 +9,12 @@ sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -78,7 +78,7 @@ static_library("app") { - "//sandbox", +@@ -98,7 +98,7 @@ static_library("app") { ] + } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ "//third_party/breakpad:client" ] } + 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 0ffc64ea8f92..8106169d6434 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-07-24 18:58:18 UTC +--- components/crash/core/common/BUILD.gn.orig 2019-09-09 21:55:14 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -21,8 +21,8 @@ sources += [ "objc_zombie_unittest.mm" ] } -- if (!is_mac && !is_win && !is_fuchsia && !is_android) { -+ if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { +- if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android) { ++ if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android && !is_bsd) { include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index c60473f30393..d8160b32a023 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,4 +1,4 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-04-30 22:22:41 UTC +--- 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 @@ -32,7 +32,7 @@ #include "components/discardable_memory/common/discardable_shared_memory_heap.h" @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" -@@ -170,7 +170,7 @@ int64_t GetDefaultMemoryLimit() { +@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() { max_default_memory_limit /= 8; #endif 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 a4a10cdb5790..85ad0d894e89 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,20 +1,20 @@ ---- components/download/internal/common/base_file.cc.orig 2019-07-24 18:58:19 UTC +--- components/download/internal/common/base_file.cc.orig 2019-10-21 19:06:28 UTC +++ components/download/internal/common/base_file.cc -@@ -516,7 +516,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { - } - #endif // defined(OS_ANDROID) +@@ -593,7 +593,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, + + } // namespace -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - namespace { + DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( + const std::string& client_guid, +@@ -611,7 +611,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn -@@ -600,7 +600,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn - } - return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; + return QuarantineFileResultToReason(result); } -#else // !OS_WIN && !OS_MACOSX && !OS_LINUX +#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD - DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( + DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( const std::string& client_guid, const GURL& source_url, diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index 1b6be4c76a46..c3f905913522 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,14 +1,27 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2019-07-24 18:58:19 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2019-10-21 19:06:29 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -29,9 +29,9 @@ const char kFocusModeOpened[] = "focus_mode_opened"; - const char kFocusModeConditionsMet[] = "focus_mode_conditions_met"; - #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) +@@ -12,12 +12,12 @@ namespace feature_engagement { + namespace events { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kNewTabOpened[] = "new_tab_opened"; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || +- // defined(OS_LINUX) || defined(OS_CHROMEOS) ++ // 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) + const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met"; + const char kTabReopened[] = "tab_reopened"; +@@ -39,7 +39,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo + const char kIncognitoWindowSessionTimeMet[] = + "incognito_window_session_time_met"; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if defined(OS_IOS) - const char kChromeOpened[] = "chrome_opened"; diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index fca3b9dd3629..57d16d3d3d3c 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,20 +1,30 @@ ---- components/feature_engagement/public/event_constants.h.orig 2019-07-24 18:58:19 UTC +--- components/feature_engagement/public/event_constants.h.orig 2019-10-21 19:06:29 UTC +++ components/feature_engagement/public/event_constants.h -@@ -57,7 +57,7 @@ extern const char kFocusModeOpened[]; - extern const char kFocusModeConditionsMet[]; - #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) +@@ -14,15 +14,15 @@ namespace events { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) - // This event is included in the deferred onboarding events for the New Tab - // described above, but it is also used on iOS, so it must be compiled - // separately. -@@ -65,7 +65,7 @@ extern const char kFocusModeConditionsMet[]; + // Desktop and IOS. + #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || +- // defined(OS_LINUX) || defined(OS_CHROMEOS) ++ // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Desktop +-#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) + // All conditions for reopen closed tab IPH were met. Since this IPH needs to + // track user events (opening/closing tabs, focusing the omnibox, etc) on the +@@ -75,7 +75,7 @@ extern const char kIncognitoWindowOpened[]; + extern const char kIncognitoWindowSessionTimeMet[]; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if defined(OS_IOS) - // The user has opened Chrome (cold start or from background). diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc new file mode 100644 index 000000000000..202dd27a0bc9 --- /dev/null +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_constants.cc.orig 2019-10-21 19:06:29 UTC ++++ components/feature_engagement/public/feature_constants.cc +@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", + const base::Feature kIPHDummyFeature{"IPH_Dummy", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-#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 kIPHFocusModeFeature{"IPH_FocusMode", + base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -31,7 +31,7 @@ const base::Feature kIPHIncognitoWindowFeature{ + const base::Feature kIPHNewTabFeature{"IPH_NewTab", + base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h new file mode 100644 index 000000000000..f52733e61231 --- /dev/null +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_constants.h.orig 2019-10-21 19:06:29 UTC ++++ components/feature_engagement/public/feature_constants.h +@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode; + // A feature to ensure all arrays can contain at least one feature. + extern const base::Feature kIPHDummyFeature; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + extern const base::Feature kIPHFocusModeFeature; + extern const base::Feature kIPHGlobalMediaControlsFeature; +@@ -28,7 +28,7 @@ extern const base::Feature kIPHBookmarkFeature; + extern const base::Feature kIPHIncognitoWindowFeature; + extern const base::Feature kIPHNewTabFeature; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH) +-#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) + + // All the features declared for Android below that are also used in Java, 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 new file mode 100644 index 000000000000..fc76484cb43d --- /dev/null +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_list.cc.orig 2019-10-21 19:06:29 UTC ++++ components/feature_engagement/public/feature_list.cc +@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHBadgedReadingListFeature, + &kIPHBadgedTranslateManualTriggerFeature, + #endif // defined(OS_IOS) +-#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) + &kIPHFocusModeFeature, + &kIPHGlobalMediaControlsFeature, +@@ -67,7 +67,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHIncognitoWindowFeature, + &kIPHNewTabFeature, + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#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) + }; + } // namespace 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 new file mode 100644 index 000000000000..ddef7a13a234 --- /dev/null +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -0,0 +1,38 @@ +--- components/feature_engagement/public/feature_list.h.orig 2019-10-21 19:06:29 UTC ++++ components/feature_engagement/public/feature_list.h +@@ -107,7 +107,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge + "IPH_BadgedTranslateManualTrigger"); + #endif // defined(OS_IOS) + +-#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) + DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); + DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); +@@ -117,7 +117,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) +-#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) + + } // namespace +@@ -166,7 +166,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), + VARIATION_ENTRY(kIPHBadgedReadingListFeature), + VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), +-#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + VARIATION_ENTRY(kIPHFocusModeFeature), + VARIATION_ENTRY(kIPHGlobalMediaControls), +@@ -176,7 +176,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHIncognitoWindowFeature), + VARIATION_ENTRY(kIPHNewTabFeature), + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#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-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 56186203822c..3b3abd6eb95c 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,6 +1,6 @@ ---- components/feedback/anonymizer_tool.cc.orig 2019-03-11 22:00:56 UTC +--- components/feedback/anonymizer_tool.cc.orig 2019-10-21 19:06:29 UTC +++ components/feedback/anonymizer_tool.cc -@@ -13,7 +13,11 @@ +@@ -14,7 +14,11 @@ #include "base/strings/stringprintf.h" #include "content/public/browser/browser_thread.h" #include "net/base/ip_address.h" diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 72303e70ab19..83d44eec10a5 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2019-04-30 22:22:42 UTC +--- components/flags_ui/flags_state.cc.orig 2019-10-21 19:06:29 UTC +++ components/flags_ui/flags_state.cc -@@ -616,7 +616,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -690,7 +690,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h index 25e9740ff93f..11bfabf9e80a 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client.h.orig 2019-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client.h.orig 2019-10-21 19:06:29 UTC +++ components/gcm_driver/gcm_client.h -@@ -85,6 +85,7 @@ class GCMClient { +@@ -86,6 +86,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index 21f35446e18e..adc63d75db2f 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2019-07-24 18:58:19 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2019-09-09 21:55:14 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -149,6 +149,9 @@ void ToCheckinProtoVersion( +@@ -134,6 +134,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 05a61bd2fa4b..cd02d75b2700 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-07-24 18:58:19 UTC +--- components/metrics/BUILD.gn.orig 2019-10-21 19:06:29 UTC +++ components/metrics/BUILD.gn -@@ -146,6 +146,11 @@ jumbo_static_library("metrics") { +@@ -164,6 +164,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 4e1e83b76db8..22cb98c234a2 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2019-07-24 18:58:19 UTC +--- components/metrics/metrics_log.cc.orig 2019-10-21 19:06:29 UTC +++ components/metrics/metrics_log.cc -@@ -210,7 +210,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -202,7 +202,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc index e7fb3cdd8939..1cb338f7464b 100644 --- a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-03-11 22:00:56 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-09-09 21:55:14 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) @@ -8,7 +8,7 @@ base::SystemMemoryInfoKB memory; if (!base::GetSystemMemoryInfo(&memory)) return; -@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { +@@ -81,6 +82,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { break; } } 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 f75e956cab6e..075399a29238 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-07-24 18:58:19 UTC +--- 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 -@@ -716,7 +716,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -763,7 +763,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp index d017cf36031e..6677371a0166 100644 --- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp +++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,4 +1,4 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2019-03-11 22:00:56 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2019-09-09 21:55:14 UTC +++ components/new_or_sad_tab_strings.grdp @@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) @@ -9,7 +9,7 @@ <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode."> Open page in a new Incognito window (Ctrl-Shift-N) </message> -@@ -69,7 +69,7 @@ +@@ -66,7 +66,7 @@ Close other tabs or apps </message> </if> @@ -18,7 +18,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> Close other tabs or programs </message> -@@ -79,7 +79,7 @@ +@@ -76,7 +76,7 @@ Close other apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> Close other programs </message> -@@ -94,7 +94,7 @@ +@@ -91,7 +91,7 @@ Restart Chromium </message> </if> 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 dcdc4f09f362..557066418d10 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,7 +1,7 @@ ---- components/policy/resources/policy_templates.json.orig 2019-07-24 18:58:20 UTC +--- components/policy/resources/policy_templates.json.orig 2019-10-21 19:06:29 UTC +++ components/policy/resources/policy_templates.json -@@ -1019,7 +1019,7 @@ - 'name': 'HomepageLocation', +@@ -1038,7 +1038,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], @@ -9,8 +9,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1048,7 +1048,7 @@ - 'name': 'HomepageIsNewTabPage', +@@ -1068,7 +1068,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], @@ -18,8 +18,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1074,7 +1074,7 @@ - 'name': 'NewTabPageLocation', +@@ -1095,7 +1095,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], @@ -27,8 +27,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1767,7 +1767,7 @@ - 'name': 'RemoteAccessHostMatchUsername', +@@ -1821,7 +1821,7 @@ + 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], @@ -36,8 +36,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3399,7 +3399,7 @@ - 'name': 'GSSAPILibraryName', +@@ -3536,7 +3536,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.linux:9-'], @@ -45,8 +45,8 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3450,7 +3450,7 @@ - 'name': 'NtlmV2Enabled', +@@ -3590,7 +3590,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], @@ -54,8 +54,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -6637,7 +6637,7 @@ - 'name': 'RequireOnlineRevocationChecksForLocalAnchors', +@@ -6919,7 +6919,7 @@ + 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], @@ -63,8 +63,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7761,7 +7761,7 @@ - 'name': 'BackgroundModeEnabled', +@@ -8119,7 +8119,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], @@ -72,8 +72,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -8277,7 +8277,7 @@ - 'name': 'FullscreenAllowed', +@@ -8713,7 +8713,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], 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 33c7fd91658e..18fc690f7cea 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,20 +1,19 @@ ---- components/policy/tools/generate_policy_source.py.orig 2019-03-11 22:00:57 UTC +--- components/policy/tools/generate_policy_source.py.orig 2019-10-21 19:06:30 UTC +++ components/policy/tools/generate_policy_source.py -@@ -86,7 +86,7 @@ class PolicyDetails: - if platform not in [ - 'chrome_frame', 'chrome_os', 'android', 'webview_android', - 'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.fuchsia', -- 'chrome.*' -+ 'chrome.freebsd', 'chrome.*' +@@ -92,6 +92,7 @@ class PolicyDetails: + 'chrome.linux', + 'chrome.mac', + 'chrome.fuchsia', ++ 'chrome.freebsd', + 'chrome.*', + 'chrome.win7', ]: - raise RuntimeError('Platform "%s" is not supported' % platform) - -@@ -105,7 +105,7 @@ class PolicyDetails: +@@ -114,7 +115,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux', 'fuchsia']) + self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'freebsd']) + elif platform_sub == 'win7': + self.platforms.append('win') else: - self.platforms.append(platform_sub) - else: diff --git a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc deleted file mode 100644 index 15ae4e284e0b..000000000000 --- a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/services/filesystem/file_system_app.cc.orig 2019-07-24 18:58:21 UTC -+++ components/services/filesystem/file_system_app.cc -@@ -19,7 +19,7 @@ - #elif defined(OS_ANDROID) - #include "base/base_paths_android.h" - #include "base/path_service.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/environment.h" - #include "base/nix/xdg_util.h" - #elif defined(OS_MACOSX) -@@ -68,7 +68,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { - CHECK(base::PathService::Get(base::DIR_APP_DATA, &path)); - #elif defined(OS_ANDROID) - CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<base::Environment> env(base::Environment::Create()); - path = base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc deleted file mode 100644 index cb195fd2fce6..000000000000 --- a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2019-03-17 18:33:50 UTC -+++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -456,7 +456,7 @@ void AddStartupEventsForTelemetry() - // RecordBrowserMainMessageLoopStart, the time since last startup is also logged - // to a histogram suffixed with the startup temperature. - void RecordTimeSinceLastStartup(PrefService* pref_service) { --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - DCHECK(pref_service); - - // Get the timestamp of the current startup. -@@ -485,7 +485,7 @@ void RecordTimeSinceLastStartup(PrefService* pref_serv - // Write the timestamp of the current startup in |pref_service|. - pref_service->SetInt64(prefs::kLastStartupTimestamp, - process_start_time.ToInternalValue()); --#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - } - - // Logs the Startup.SameVersionStartupCount histogram. Relies on |pref_service| diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index cb4df570df73..3d90d22d647b 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,14 +1,10 @@ ---- components/storage_monitor/BUILD.gn.orig 2019-03-11 22:00:57 UTC +--- components/storage_monitor/BUILD.gn.orig 2019-10-21 19:06:30 UTC +++ components/storage_monitor/BUILD.gn -@@ -65,6 +65,17 @@ static_library("storage_monitor") { - ] +@@ -81,6 +81,13 @@ static_library("storage_monitor") { + } } + if (is_bsd) { -+ sources -= [ -+ "mtab_watcher_linux.cc", -+ "mtab_watcher_linux.h", -+ ] + sources += [ + "storage_monitor_freebsd.cc", + "storage_monitor_freebsd.h", @@ -16,5 +12,5 @@ + } + if (use_udev) { - deps += [ "//device/udev_linux" ] - } else if (is_linux) { + sources += [ + "udev_util_linux.cc", diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index a7fac7d5c9ef..7da3a9299fb1 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2019-03-11 22:00:57 UTC +--- components/update_client/update_query_params.cc.orig 2019-10-21 19:06:31 UTC +++ components/update_client/update_query_params.cc -@@ -38,6 +38,8 @@ const char kOs[] = +@@ -39,6 +39,8 @@ const char kOs[] = "fuchsia"; #elif defined(OS_OPENBSD) "openbsd"; 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 57cb14d98fb1..32c532d1cffc 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-07-24 18:58:23 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-10-21 19:06:31 UTC +++ content/app/content_main_runner_impl.cc -@@ -99,17 +99,17 @@ +@@ -102,17 +102,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" -@@ -130,7 +130,7 @@ +@@ -133,7 +133,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" -@@ -322,7 +322,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -318,7 +318,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 -@@ -419,7 +419,7 @@ void PreSandboxInit() { +@@ -415,7 +415,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - } // namespace - -@@ -477,7 +477,7 @@ int RunZygote(ContentMainDelegate* delegate) { + #if !defined(CHROME_MULTIPLE_DLL_CHILD) + void InitializeBrowserClientProcessImpl() { +@@ -482,7 +482,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -642,11 +642,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn deleted file mode 100644 index d4c4492aef33..000000000000 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/BUILD.gn.orig 2019-07-24 18:58:23 UTC -+++ content/browser/BUILD.gn -@@ -2058,7 +2058,7 @@ jumbo_source_set("browser") { - "//chromeos/resources", - "//components/chromeos_camera:mojo_mjpeg_decode_accelerator", - ] -- } else { -+ } else if (!is_bsd) { - sources += [ - "memory/memory_monitor_linux.cc", - "memory/memory_monitor_linux.h", 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 b47373ffcc85..1d171d58e24b 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-07-24 18:58:23 UTC +--- content/browser/browser_main_loop.cc.orig 2019-10-21 19:06:31 UTC +++ content/browser/browser_main_loop.cc -@@ -251,6 +251,13 @@ +@@ -244,6 +244,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 -@@ -576,6 +583,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -573,6 +580,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,16 +26,16 @@ #endif #if defined(USE_X11) -@@ -619,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -618,7 +630,7 @@ int BrowserMainLoop::EarlyInitialization() { } - #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) + #endif // !defined(OS_MACOSX) -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ 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. -@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -628,7 +640,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_builtin__service__manifests.cc b/www/chromium/files/patch-content_browser_builtin__service__manifests.cc deleted file mode 100644 index aa515107168a..000000000000 --- a/www/chromium/files/patch-content_browser_builtin__service__manifests.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/builtin_service_manifests.cc.orig 2019-07-29 19:11:14 UTC -+++ content/browser/builtin_service_manifests.cc -@@ -33,7 +33,7 @@ - #include "services/video_capture/public/cpp/manifest.h" - #include "services/viz/public/cpp/manifest.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/manifest.h" // nogncheck - #endif - -@@ -99,7 +99,7 @@ const std::vector<service_manager::Manifest>& GetBuilt - : service_manager::Manifest::ExecutionMode:: - kInProcessBuiltin), - viz::GetManifest(), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - font_service::GetManifest(), - #endif - #if defined(OS_CHROMEOS) 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 ac2c342888c2..8285bdf3c71e 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-05-04 08:59:22 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-09-09 21:55:16 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -40,7 +40,7 @@ using GetInfoCallback = SystemInfo::Backend::GetInfoCa +@@ -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. 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 7bcb296f41b8..2cdb5abd1d9e 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-07-24 18:58:23 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1062,7 +1062,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1094,7 +1094,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc index 6ae21e6412c6..3296db82abe6 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-06-04 18:55:23 UTC +--- content/browser/media/media_internals.cc.orig 2019-09-09 21:55:16 UTC +++ content/browser/media/media_internals.cc -@@ -785,7 +785,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -505,7 +505,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_memory_memory__monitor.cc b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc deleted file mode 100644 index 816260ba1561..000000000000 --- a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/memory/memory_monitor.cc.orig 2019-03-11 22:00:57 UTC -+++ content/browser/memory/memory_monitor.cc -@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo( - base::GetSystemMemoryInfo(mem_info); - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // TODO(bashi,bcwhite): Remove when memory monitor for mac is available. - std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() { - NOTREACHED(); 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 c66eeab22457..3502703e4cb2 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-07-24 18:58:23 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -370,7 +370,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc index 4dbe486d9251..3d6112bc698b 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-09-09 21:55:16 UTC +++ content/browser/renderer_host/input/input_device_change_observer.cc @@ -10,7 +10,7 @@ @@ -6,7 +6,7 @@ #include "ui/events/devices/input_device_observer_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/events/devices/input_device_manager.h" + #include "ui/events/devices/device_data_manager.h" #elif defined(OS_ANDROID) #include "ui/events/devices/input_device_observer_android.h" @@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R @@ -15,7 +15,7 @@ ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui::InputDeviceManager::GetInstance()->AddObserver(this); + ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); @@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R @@ -24,6 +24,6 @@ ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui::InputDeviceManager::GetInstance()->RemoveObserver(this); + ui::DeviceDataManager::GetInstance()->RemoveObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this); diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 6e9b01d89edc..07e640435561 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2019-05-04 09:07:21 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -432,7 +432,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -452,7 +452,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index b2144f7f4b7a..ae499e70c9fb 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -71,7 +71,7 @@ +@@ -70,7 +70,7 @@ #if defined(OS_MACOSX) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -151,7 +151,7 @@ void RenderMessageFilter::CreateFullscreenWidget( +@@ -148,7 +148,7 @@ void RenderMessageFilter::CreateFullscreenWidget( std::move(callback).Run(route_id); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -172,7 +172,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -169,7 +169,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 fd3e611cc264..90e712047824 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2019-10-21 19:06:32 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -86,14 +86,14 @@ class CONTENT_EXPORT RenderMessageFilter mojom::WidgetPtr widget, CreateFullscreenWidgetCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 437db86a57d7..406cba07a9c6 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,15 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-24 18:58:24 UTC +--- 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 -@@ -229,7 +229,7 @@ - #include "content/browser/compositor/image_transport_factory.h" +@@ -230,7 +230,7 @@ + #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include <sys/resource.h> #include <sys/time.h> - #endif -@@ -1231,7 +1231,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = + +@@ -1194,7 +1194,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; -@@ -1242,7 +1242,7 @@ size_t GetPlatformProcessLimit() { +@@ -1205,7 +1205,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,16 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1654,7 +1654,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1239,7 +1239,7 @@ class RenderProcessHostImpl::IOThreadHostImpl + + // 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() { 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 691d494cdd28..1608202ff669 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-07-24 18:58:24 UTC +--- 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 -@@ -400,10 +400,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -423,10 +423,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 7ca66923447d..7517746e78a3 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-06-04 18:55:23 UTC +--- 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 -@@ -163,7 +163,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr +@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr 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 2502fa83ea02..6b09d525efc3 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-07-24 18:58:24 UTC +--- 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 -@@ -117,7 +117,7 @@ +@@ -116,7 +116,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2200,7 +2200,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2203,7 +2203,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2397,7 +2397,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2388,7 +2388,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index f2c74c926b5e..4d172e488ec5 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -609,7 +609,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -620,7 +620,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc new file mode 100644 index 000000000000..3079f8cf5d63 --- /dev/null +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc @@ -0,0 +1,11 @@ +--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2019-10-21 19:06:32 UTC ++++ content/browser/scheduler/responsiveness/jank_monitor.cc +@@ -293,7 +293,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv + // in context menus, among others). Simply ignore the mismatches for now. + // See https://crbug.com/929813 for the details of why the mismatch + // happens. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + task_execution_metadata_.clear(); + #endif + return; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc new file mode 100644 index 000000000000..30b53519c1b7 --- /dev/null +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc @@ -0,0 +1,20 @@ +--- content/browser/scheduler/responsiveness/watcher.cc.orig 2019-09-16 09:41:14 UTC ++++ content/browser/scheduler/responsiveness/watcher.cc +@@ -96,7 +96,7 @@ void Watcher::DidRunTask(const base::PendingTask* task + // in context menus, among others). Simply ignore the mismatches for now. + // See https://crbug.com/929813 for the details of why the mismatch + // happens. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + return currently_running_metadata_ui_.clear(); + #endif + DCHECK_LE(*mismatched_task_identifiers, 1); +@@ -156,7 +156,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque + mismatched_event_identifiers_ui_ += 1; + // See comment in DidRunTask() for why |currently_running_metadata_ui_| may + // be reset. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + return currently_running_metadata_ui_.clear(); + #endif + DCHECK_LE(mismatched_event_identifiers_ui_, 1); diff --git a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc deleted file mode 100644 index 0d0ec1908d24..000000000000 --- a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-07-24 18:58:24 UTC -+++ content/browser/service_manager/service_manager_context.cc -@@ -98,7 +98,7 @@ - #include "jni/ContentNfcDelegate_jni.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/font_service_app.h" - #include "components/services/font/public/interfaces/constants.mojom.h" // nogncheck - #endif -@@ -342,12 +342,12 @@ void CreateInProcessAudioService( - BrowserMainLoop::GetAudioManager(), std::move(request))); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<service_manager::Service> CreateFontService( - service_manager::mojom::ServiceRequest request) { - return std::make_unique<font_service::FontServiceApp>(std::move(request)); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService( - service_manager::mojom::ServiceRequest request) { -@@ -665,7 +665,7 @@ ServiceManagerContext::ServiceManagerContext( - base::BindRepeating(&CreateVideoCaptureService)); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - RegisterInProcessService( - font_service::mojom::kServiceName, - base::CreateSequencedTaskRunnerWithTraits( 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 f7c1d9642ea3..c0995f1e1dbc 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,11 +1,29 @@ ---- content/browser/utility_process_host.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/utility_process_host.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/utility_process_host.cc -@@ -213,7 +213,7 @@ UtilityProcessHost::UtilityProcessHost( - : client_(client), - client_task_runner_(client_task_runner), - sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), +@@ -55,7 +55,7 @@ + #include "services/network/network_sandbox_win.h" + #endif + +-#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 +@@ -216,7 +216,7 @@ UtilityProcessHost::UtilityProcessHost() + + UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) + : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), +@@ -515,7 +515,7 @@ void UtilityProcessHost::OnProcessCrashed(int exit_cod + + void UtilityProcessHost::BindHostReceiver( + mojo::GenericPendingReceiver receiver) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index 767ca6f739f5..a550054084a2 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-07-24 18:58:24 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-10-21 19:06:32 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -119,12 +119,12 @@ const std::map<int, std::string> CreateMojoResourceIdT +@@ -123,12 +123,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 e149fe9db7b5..58bac736ee1c 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-07-24 18:58:24 UTC +--- content/common/BUILD.gn.orig 2019-10-21 19:06:32 UTC +++ content/common/BUILD.gn -@@ -381,6 +381,12 @@ source_set("common") { +@@ -367,6 +367,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 002892b99d10..cee20f80371c 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,8 +1,8 @@ ---- content/common/user_agent.cc.orig 2019-03-11 22:00:58 UTC +--- content/common/user_agent.cc.orig 2019-09-09 21:55:16 UTC +++ content/common/user_agent.cc -@@ -131,6 +131,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ +@@ -124,6 +124,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ #endif - ); // NOLINT + ); +#if defined(OS_BSD) +#if defined(__x86_64__) diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index ae4a514badf4..ad00bb358264 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-06-04 18:55:23 UTC +--- content/gpu/BUILD.gn.orig 2019-09-09 21:55:16 UTC +++ content/gpu/BUILD.gn -@@ -124,7 +124,7 @@ target(link_target_type, "gpu_sources") { +@@ -125,7 +125,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 ee699a82ce2e..09c0f351a188 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2019-07-24 18:58:24 UTC +--- content/gpu/gpu_main.cc.orig 2019-10-21 19:06:32 UTC +++ content/gpu/gpu_main.cc -@@ -79,7 +79,7 @@ +@@ -82,7 +82,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -112,7 +112,7 @@ namespace content { +@@ -111,7 +111,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -173,7 +173,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -172,7 +172,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,16 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -369,7 +369,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -276,7 +276,7 @@ int GpuMain(const MainFunctionParams& parameters) { + main_thread_task_executor = + std::make_unique<base::SingleThreadTaskExecutor>( + gpu_preferences.message_pump_type); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #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) { namespace { @@ -36,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -404,7 +404,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -418,7 +418,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index b9266e56d4aa..f84cd2b50156 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-07-24 18:58:24 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-10-21 19:06:32 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = +@@ -96,8 +96,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -287,8 +288,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -299,8 +300,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -303,6 +306,7 @@ void LoadArmGpuLibraries() { +@@ -315,6 +318,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -358,6 +362,7 @@ bool LoadLibrariesForGpu( +@@ -370,6 +374,7 @@ bool LoadLibrariesForGpu( return true; } @@ -38,7 +38,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -378,13 +383,17 @@ bool BrokerProcessPreSandboxHook( +@@ -390,13 +395,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index 0860cc595a92..0a94e120e039 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,24 +1,24 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-10-21 19:06:32 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" + #include "mojo/public/cpp/bindings/pending_remote.h" #endif - @@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = - sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector()); - SkFontConfigInterface::SetGlobal(font_loader_); -@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { + mojo::PendingRemote<font_service::mojom::FontService> font_service; + ChildThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -51,7 +51,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() -@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { +@@ -61,7 +61,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { } blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index 507f6788c8d5..d246feb0e6c4 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-10-21 19:06:32 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -9,8 +9,8 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -41,11 +41,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp - bool sync_dir) override; +@@ -36,11 +36,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp + blink::WebThemeEngine* ThemeEngine() override; private: -#if defined(OS_LINUX) || defined(OS_MACOSX) diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc new file mode 100644 index 000000000000..3ca404881fac --- /dev/null +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc @@ -0,0 +1,18 @@ +--- content/public/app/content_main_delegate.cc.orig 2019-09-16 15:21:10 UTC ++++ content/public/app/content_main_delegate.cc +@@ -38,13 +38,13 @@ bool ContentMainDelegate::DelaySandboxInitialization( + return false; + } + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + + void ContentMainDelegate::ZygoteStarting( + std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* + delegates) {} + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + int ContentMainDelegate::TerminateForFatalInitializationError() { + CHECK(false); diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h new file mode 100644 index 000000000000..7039e037f355 --- /dev/null +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h @@ -0,0 +1,20 @@ +--- content/public/app/content_main_delegate.h.orig 2019-09-16 14:44:25 UTC ++++ content/public/app/content_main_delegate.h +@@ -71,7 +71,7 @@ class CONTENT_EXPORT ContentMainDelegate { + // want it at all. + virtual bool DelaySandboxInitialization(const std::string& process_type); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Tells the embedder that the zygote process is starting, and allows it to + // specify one or more zygote delegates if it wishes by storing them in + // |*delegates|. +@@ -81,7 +81,7 @@ class CONTENT_EXPORT ContentMainDelegate { + + // Called every time the zygote process forks. + virtual void ZygoteForked() {} +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Allows the embedder to prevent locking the scheme registry. The scheme + // registry is the list of URL schemes we recognize, with some additional diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index d7f2fe5c2985..a85aa2e72bfb 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- content/public/common/child_process_host.h.orig 2019-07-24 18:58:24 UTC +--- content/public/common/child_process_host.h.orig 2019-10-21 19:06:32 UTC +++ content/public/common/child_process_host.h -@@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -52,7 +52,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, 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 94548e336aa5..67333e6652bd 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-07-24 18:58:24 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-09-09 21:55:16 UTC +++ content/public/common/common_param_traits_macros.h -@@ -329,7 +329,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -337,7 +337,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 0bf68d97af34..c6676f3c7402 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,15 @@ ---- content/public/common/content_features.cc.orig 2019-07-24 18:58:24 UTC +--- content/public/common/content_features.cc.orig 2019-10-21 19:06:32 UTC +++ content/public/common/content_features.cc -@@ -577,7 +577,7 @@ const base::Feature kWebAssemblyThreads { +@@ -47,7 +47,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ + const base::Feature kAudioServiceOutOfProcess{ + "AudioServiceOutOfProcess", + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -9,7 +18,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -612,7 +612,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -669,7 +669,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 08f41bb44f03..eacb08b5ba7e 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,8 +1,8 @@ ---- content/public/common/content_switches.cc.orig 2019-07-24 18:58:24 UTC +--- content/public/common/content_switches.cc.orig 2019-10-21 19:06:32 UTC +++ content/public/common/content_switches.cc -@@ -949,7 +949,7 @@ const char kEnableAutomation[] = "enable-automation"; - const char kDisablePanelFitting[] = "disable-panel-fitting"; - #endif +@@ -980,7 +980,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = + // Enable indication that browser is controlled by automation. + const char kEnableAutomation[] = "enable-automation"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) 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 7e6bd5f8314a..4b1e7397961e 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,7 +1,7 @@ ---- content/public/common/content_switches.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_switches.h.orig 2019-10-21 19:06:32 UTC +++ content/public/common/content_switches.h -@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ - CONTENT_EXPORT extern const char kDisablePanelFitting[]; +@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke + CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) 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 54b76f65a09e..4a003b951056 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-07-24 18:58:24 UTC +--- content/public/test/browser_test_base.cc.orig 2019-10-21 19:06:32 UTC +++ content/public/test/browser_test_base.cc -@@ -75,6 +75,10 @@ +@@ -96,6 +96,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc index 8a7f11726d24..ffcf97d087fb 100644 --- a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc +++ b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-04-30 22:22:47 UTC +--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-10-21 19:06:32 UTC +++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc -@@ -204,7 +204,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) { +@@ -244,7 +244,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) { TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) { SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index 36742f1dfeda..efc61cde9ec7 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,6 +1,15 @@ ---- content/renderer/render_process_impl.cc.orig 2019-07-24 18:58:25 UTC +--- content/renderer/render_process_impl.cc.orig 2019-10-21 19:06:33 UTC +++ content/renderer/render_process_impl.cc -@@ -157,7 +157,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -43,7 +43,7 @@ + #if defined(OS_WIN) + #include "base/win/win_util.h" + #endif +-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) + #include "v8/include/v8-wasm-trap-handler-posix.h" + #endif + namespace { +@@ -158,7 +158,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 85394137eeab..f76f297f7d17 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-07-24 18:58:25 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-10-21 19:06:33 UTC +++ content/renderer/render_thread_impl.cc -@@ -187,12 +187,21 @@ +@@ -185,12 +185,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -907,7 +916,7 @@ void RenderThreadImpl::Init() { +@@ -901,7 +910,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,16 +31,16 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -939,7 +948,7 @@ void RenderThreadImpl::Init() { - GetConnector()->BindInterface(mojom::kBrowserServiceName, - mojo::MakeRequest(&storage_partition_service_)); +@@ -930,7 +939,7 @@ void RenderThreadImpl::Init() { + base::DiscardableMemoryAllocator::SetInstance( + discardable_shared_memory_manager_.get()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - render_message_filter()->SetThreadPriority( - ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); - #endif -@@ -1321,7 +1330,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + if (base::FeatureList::IsEnabled( + blink::features::kBlinkCompositorUseDisplayThreadPriority)) { + render_message_filter()->SetThreadPriority( +@@ -1309,7 +1318,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 fe449c23578a..271593cdf0b3 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-07-24 18:58:25 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-10-21 19:06:33 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -108,7 +108,7 @@ +@@ -102,7 +102,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,25 +9,25 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - ->Clone(); +@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + if (RenderThreadImpl::current()) { + io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); - blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get()); - SkFontConfigInterface::SetGlobal(font_loader_); + mojo::PendingRemote<font_service::mojom::FontService> font_service; + RenderThreadImpl::current()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif -@@ -208,7 +208,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - connector_ = service_manager::Connector::Create(&request); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (g_sandbox_enabled && sandboxEnabled()) { + if (sandboxEnabled()) { #if defined(OS_MACOSX) - sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -236,7 +236,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( + std::unique_ptr<service_manager::Connector> sandbox_connector; +@@ -224,7 +224,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() -@@ -311,7 +311,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -289,7 +289,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); -@@ -324,7 +324,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -302,7 +302,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 57e23d4585ea..d81cdb167fee 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,16 +1,16 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-07-24 18:58:25 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-10-21 19:06:33 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ + #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" - #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - std::unique_ptr<service_manager::Connector> connector_; +@@ -225,7 +225,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + scoped_refptr<base::SingleThreadTaskRunner> io_runner_; -#if defined(OS_LINUX) || defined(OS_MACOSX) @@ -18,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -296,7 +296,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr<blink::WebTransmissionEncodingInfoHandler> web_transmission_encoding_info_handler_; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 833001dcb9b0..5749dd06e011 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-07-24 18:58:25 UTC +--- content/shell/BUILD.gn.orig 2019-10-21 19:06:33 UTC +++ content/shell/BUILD.gn -@@ -961,7 +961,7 @@ group("content_shell_crash_test") { +@@ -962,7 +962,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 a40dcd5bd1f2..8d397e79a3dc 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-07-29 19:14:59 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2019-10-21 19:06:33 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) -@@ -314,7 +314,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit +@@ -317,7 +317,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit } void ShellMainDelegate::PreSandboxStartup() { diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index f8fb589f6246..d9388fc9f1d2 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-07-24 18:58:25 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-10-21 19:06:33 UTC +++ content/shell/browser/shell_browser_context.cc @@ -32,7 +32,7 @@ @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -115,7 +115,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -107,7 +107,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 2d060a4979d9..23a994c6073c 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { +@@ -125,7 +125,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc index 2b4d8ed2fb5a..09e1ba7472eb 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/web_test/web_test_browser_context.cc.orig 2019-04-30 22:22:48 UTC +--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2019-10-21 19:06:33 UTC +++ content/shell/browser/web_test/web_test_browser_context.cc -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc index fce9b779f199..7aa29e2df609 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-07-24 18:58:25 UTC +--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC +++ content/shell/browser/web_test/web_test_browser_main_parts.cc -@@ -37,7 +37,7 @@ +@@ -36,7 +36,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc index 808ff4655bd7..adfd52c8e48e 100644 --- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc @@ -1,6 +1,6 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-07-24 18:58:25 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-10-21 19:06:33 UTC +++ content/shell/test_runner/test_runner.cc -@@ -66,7 +66,7 @@ +@@ -64,7 +64,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" @@ -9,7 +9,7 @@ #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1538,7 +1538,7 @@ void TestRunner::Reset() { +@@ -1533,7 +1533,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); @@ -18,7 +18,7 @@ blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2065,7 +2065,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2118,7 +2118,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { 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 8463a3b71752..67b879d25bf7 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,6 +1,6 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-03-11 22:00:58 UTC +--- 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 -@@ -8,7 +8,7 @@ +@@ -9,7 +9,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,16 +9,16 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -17,7 +17,7 @@ namespace content { +@@ -18,7 +18,7 @@ namespace content { UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl( service_manager::Connector* connector) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp<font_service::FontLoader>(connector); - SkFontConfigInterface::SetGlobal(font_loader_); - sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_); -@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: + mojo::PendingRemote<font_service::mojom::FontService> font_service; + UtilityThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index a12985011fa7..ee6969e5bdc2 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- device/bluetooth/BUILD.gn.orig 2019-09-09 21:55:17 UTC +++ device/bluetooth/BUILD.gn -@@ -274,7 +274,7 @@ component("bluetooth") { +@@ -277,7 +277,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 4d7296969f8f..7aa6a6c4d30d 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,4 +1,4 @@ ---- device/gamepad/gamepad_provider.cc.orig 2019-06-04 18:55:24 UTC +--- device/gamepad/gamepad_provider.cc.orig 2019-10-21 19:06:34 UTC +++ device/gamepad/gamepad_provider.cc @@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. - const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO; + const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc new file mode 100644 index 000000000000..f962ad16a8f5 --- /dev/null +++ b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc @@ -0,0 +1,11 @@ +--- device/gamepad/hid_writer_linux.cc.orig 2019-10-31 07:37:06 UTC ++++ device/gamepad/hid_writer_linux.cc +@@ -4,6 +4,8 @@ + + #include "device/gamepad/hid_writer_linux.h" + ++#include <unistd.h> ++ + #include "base/posix/eintr_wrapper.h" + + namespace device { diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 732fe5e884f2..697ace21a29a 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-07-24 18:58:27 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-10-21 19:06:34 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -29,7 +29,11 @@ +@@ -27,7 +27,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" @@ -10,5 +10,5 @@ #include "third_party/re2/src/re2/re2.h" +#endif - using content::ResourceRequestInfo; using extension_web_request_api_helpers::EventResponseDelta; + diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 69a2fd402969..164b15123d4c 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2019-06-04 18:55:24 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2019-09-09 21:55:17 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -61,7 +61,7 @@ namespace { @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -382,7 +382,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; @@ -18,7 +18,7 @@ bool has_permission = extension->permissions_data()->HasAPIPermission( APIPermission::kNativeMessaging); if (!has_permission) { -@@ -433,11 +433,11 @@ void MessageService::OpenChannelToNativeApp( +@@ -432,11 +432,11 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 0ce7f4e6ffa8..0d61e119064b 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2019-07-24 18:58:27 UTC +--- extensions/common/api/_permission_features.json.orig 2019-10-21 19:06:34 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -469,7 +469,7 @@ +@@ -461,7 +461,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -500,7 +500,7 @@ +@@ -492,7 +492,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_feature__switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc index c59bf0a971d5..9cac45bedcb2 100644 --- a/www/chromium/files/patch-extensions_common_feature__switch.cc +++ b/www/chromium/files/patch-extensions_common_feature__switch.cc @@ -1,14 +1,16 @@ ---- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/feature_switch.cc.orig 2019-10-21 19:06:34 UTC +++ extensions/common/feature_switch.cc -@@ -44,11 +44,7 @@ class CommonSwitches { +@@ -42,11 +42,11 @@ class CommonSwitches { FeatureSwitch::DEFAULT_ENABLED), load_media_router_component_extension( kLoadMediaRouterComponentExtensionFlag, --#if defined(GOOGLE_CHROME_BUILD) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) FeatureSwitch::DEFAULT_ENABLED) --#else -- FeatureSwitch::DEFAULT_DISABLED) --#endif // defined(GOOGLE_CHROME_BUILD) + #else + FeatureSwitch::DEFAULT_DISABLED) +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) { } diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index 8d14f11a8934..196003fc999d 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2019-09-09 21:55:17 UTC +++ extensions/shell/app/shell_main_delegate.cc @@ -38,7 +38,7 @@ @@ -9,15 +9,6 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -52,7 +52,7 @@ - - namespace { - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - extensions::ShellCrashReporterClient* GetCrashReporterClient() { - static base::NoDestructor<extensions::ShellCrashReporterClient> instance; - return instance.get(); @@ -70,7 +70,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc new file mode 100644 index 000000000000..194f3950299b --- /dev/null +++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -0,0 +1,11 @@ +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2019-09-16 09:48:37 UTC ++++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc +@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin + bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { + #if defined(OS_CHROMEOS) + info->os = api::runtime::PLATFORM_OS_CROS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + info->os = api::runtime::PLATFORM_OS_LINUX; + #endif + return true; diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index a872a4a3f47e..7333dad7d6bf 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2019-05-01 16:41:39 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2019-09-09 21:55:17 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" #include "extensions/shell/browser/shell_web_view_guest_delegate.h" @@ -9,8 +9,8 @@ #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" #endif -@@ -46,7 +46,7 @@ ShellExtensionsAPIClient::CreateVirtualKeyboardDelegat - return std::make_unique<ShellVirtualKeyboardDelegate>(); +@@ -52,7 +52,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() + return std::make_unique<ShellDisplayInfoProvider>(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index b1ee7b7323f2..31f01db1d1d5 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,9 +1,9 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2019-04-30 22:22:49 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2019-09-09 21:55:17 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -30,14 +30,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC - WebViewGuest* web_view_guest) const override; - std::unique_ptr<VirtualKeyboardDelegate> CreateVirtualKeyboardDelegate( +@@ -32,14 +32,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC content::BrowserContext* browser_context) const override; + std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() + const override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) FileSystemDelegate* GetFileSystemDelegate() override; diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index 28d60e8b1438..b9bfb1b60e04 100644 --- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,6 +1,6 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-06-04 18:55:24 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-10-21 19:06:34 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc -@@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; +@@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. @@ -16,7 +16,7 @@ } // namespace -@@ -188,7 +188,7 @@ void HeartbeatManager::RestartTimer() { +@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() { base::Bind(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); @@ -25,7 +25,7 @@ // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. -@@ -197,7 +197,7 @@ void HeartbeatManager::RestartTimer() { +@@ -200,7 +200,7 @@ void HeartbeatManager::RestartTimer() { base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, weak_ptr_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); @@ -34,14 +34,14 @@ } void HeartbeatManager::CheckForMissedHeartbeat() { -@@ -213,14 +213,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -216,14 +216,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { return; } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Otherwise check again later. - base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + io_task_runner_->PostDelayedTask( FROM_HERE, base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, weak_ptr_factory_.GetWeakPtr()), 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 f503dac620b2..16fb4c6c7a86 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-06-04 18:55:24 UTC +--- 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 -@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf +@@ -88,7 +88,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 d8cf13ba65e5..55fdd9fcf201 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,15 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-07-24 18:58:27 UTC +--- 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 -@@ -26,7 +26,7 @@ +@@ -23,7 +23,7 @@ + #include "ui/gl/buildflags.h" + #include "ui/gl/gl_context.h" + +-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) + #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" + #endif + +@@ -31,7 +31,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -9,16 +18,34 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -439,7 +439,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -504,7 +504,7 @@ std::unique_ptr<SharedImageRepresentationDawn> + ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, + MemoryTypeTracker* tracker, + DawnDevice dawnDevice) { +-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) + if (!dawn_format_) { + DLOG(ERROR) << "Format not supported for Dawn"; + return nullptr; +@@ -527,7 +527,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()); +-#else // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN) ++#else // !defined(OS_LINUX) || !defined(OS_BSD) || !BUILDFLAG(USE_DAWN) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; + #endif +@@ -544,7 +544,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa #if defined(OS_FUCHSIA) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - if (!texture_) { - VkMemoryGetFdInfoKHR get_fd_info; - get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; -@@ -502,7 +502,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + GrVkImageInfo image_info; + bool result = backend_texture_.getVkImageInfo(&image_info); + DCHECK(result); +@@ -604,7 +604,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa } return std::make_unique<ExternalVkImageGlRepresentation>( manager, this, tracker, texture_, texture_->service_id()); @@ -27,3 +54,12 @@ #error Unsupported OS #endif } +@@ -630,7 +630,7 @@ ExternalVkImageBacking::ProduceSkia( + tracker); + } + +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) { + VkMemoryGetFdInfoKHR get_fd_info; + get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; 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 new file mode 100644 index 000000000000..e82d53b5eeb2 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h @@ -0,0 +1,11 @@ +--- 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 +@@ -133,7 +133,7 @@ class ExternalVkImageBacking : public SharedImageBacki + base::Optional<DawnTextureFormat> dawn_format, + base::Optional<uint32_t> memory_type_index); + +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + // Extract file descriptor from image + int GetMemoryFd(const GrVkImageInfo& image_info); + #endif 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 83495ad0fe0e..dbe368005b49 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-06-04 18:55:24 UTC +--- 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 -@@ -128,7 +128,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph +@@ -183,7 +183,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:" -@@ -143,7 +143,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph +@@ -198,7 +198,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph fd.release()); return gl_semaphore; diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc index 46f3b9ad1a32..d34142ecbd39 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-04-30 22:22:49 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc -@@ -593,7 +593,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -638,7 +638,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index b03603d96bda..aed8047fac5b 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -23,7 +23,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -429,7 +429,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -443,7 +443,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h index 067b9a1fb1b8..2a43e73c2793 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-03-17 17:06:38 UTC +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-10-21 19:06:35 UTC +++ gpu/command_buffer/tests/gl_test_utils.h -@@ -112,7 +112,7 @@ class GpuCommandBufferTestEGL { +@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL { return gfx::HasExtension(gl_extensions_, extension); } diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index d158686e6f56..e89c9a43b474 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/config/gpu_control_list.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -700,7 +704,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -707,7 +711,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index 5f486e27a8cf..b63daae1819f 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-06-04 18:55:24 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-10-21 19:06:35 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,7 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo +@@ -110,7 +110,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo #elif defined(USE_OZONE) return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( format, usage); @@ -45,7 +45,7 @@ return false; // TODO(julian.isorce): Add linux support. #elif defined(OS_WIN) switch (usage) { -@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 5aab116e20b1..2f59e8f820e1 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-07-24 18:58:27 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif } @@ -9,16 +9,16 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -120,7 +120,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } -#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST +#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD - } // namespace - -@@ -150,7 +150,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + class GpuWatchdogInit { + public: +@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -220,7 +220,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; @@ -36,7 +36,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -229,7 +229,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -45,7 +45,42 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -304,14 +304,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + if (gl_initialized && use_swiftshader && + gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { +-#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; + #else + gl::init::ShutdownGL(true); + gl_initialized = false; +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + } + 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) { +-#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"; + return false; + } +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + } + } + +@@ -377,7 +377,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -54,8 +89,8 @@ // 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. -@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } +@@ -396,7 +396,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + return false; } } -#endif // defined(OS_LINUX) @@ -63,7 +98,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -516,7 +516,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -569,7 +569,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -72,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. -@@ -536,7 +536,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -589,7 +589,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 8021272770eb..bdfa06c97b69 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,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-07-24 18:58:27 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -55,8 +55,10 @@ const int kGpuTimeout = 10000; +@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000; #endif #if defined(USE_X11) @@ -11,18 +11,21 @@ const unsigned char text[20] = "check"; #endif -@@ -79,8 +81,10 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + , display_(nullptr), window_(0), - atom_(x11::None), +- atom_(x11::None), ++ atom_(x11::None) +#if !defined(OS_BSD) - host_tty_(-1), ++ , + host_tty_(-1) #endif +#endif - weak_factory_(this) { + { base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); -@@ -95,7 +99,9 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() #endif #if defined(USE_X11) @@ -32,8 +35,8 @@ SetupXServer(); #endif base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -231,8 +237,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { - power_monitor->RemoveObserver(this); +@@ -231,8 +238,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { + base::PowerMonitor::RemoveObserver(this); #if defined(USE_X11) +#if !defined(OS_BSD) @@ -43,7 +46,7 @@ if (display_) { DCHECK(window_); XDestroyWindow(display_, window_); -@@ -436,7 +444,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover +@@ -432,7 +441,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif @@ -52,7 +55,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) { -@@ -510,7 +518,9 @@ void GpuWatchdogThread::SetupXServer() { +@@ -516,7 +525,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() { CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); atom_ = XInternAtom(display_, "CHECK", x11::False); } @@ -61,13 +64,13 @@ +#endif } - void GpuWatchdogThread::SetupXChangeProp() { -@@ -611,7 +621,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT + void GpuWatchdogThreadImplV1::SetupXChangeProp() { +@@ -616,7 +627,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - int GpuWatchdogThread::GetActiveTTY() const { + int GpuWatchdogThreadImplV1::GetActiveTTY() const { char tty_string[8] = {0}; if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) && 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 1f736ba2f75f..fc2b8198864d 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-07-24 18:58:27 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-10-21 19:06:35 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -234,8 +234,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 XDisplay* display_; gfx::AcceleratedWidget window_; XAtom atom_; @@ -10,4 +10,4 @@ +#endif #endif - base::RepeatingClosure alternative_terminate_for_testing_; + 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 3093f01c5b61..4452f797874e 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,20 +1,32 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-07-24 18:58:27 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-10-21 19:06:35 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -352,7 +352,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer - - #endif +@@ -731,7 +731,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + } + #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( - vkGetDeviceProcAddrFn(vk_device, "vkGetSemaphoreFdKHR")); -@@ -366,7 +366,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer - - #endif + if (gfx::HasExtension(enabled_extensions, + VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { + vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( +@@ -750,9 +750,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + return false; + } + } +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + if (gfx::HasExtension(enabled_extensions, + VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { + vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( +@@ -763,7 +763,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + return false; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) - vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( - vkGetDeviceProcAddrFn(vk_device, "vkGetMemoryFdKHR")); + #if defined(OS_FUCHSIA) + if (gfx::HasExtension(enabled_extensions, diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 70fcc795f218..a71c10e135b4 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,24 +1,27 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-07-24 18:58:27 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-10-21 19:06:35 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -145,13 +145,13 @@ struct VulkanFunctionPointers { - #endif +@@ -170,14 +170,14 @@ struct VulkanFunctionPointers { + vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr; + #endif // defined(OS_ANDROID) - // Device functions shared between Linux and Android. -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr; PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr; - #endif +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Linux-only device functions. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; - #endif +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) -@@ -313,14 +313,14 @@ struct VulkanFunctionPointers { + #if defined(OS_FUCHSIA) + PFN_vkImportSemaphoreZirconHandleFUCHSIA +@@ -356,16 +356,16 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn - #endif + #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) @@ -26,10 +29,14 @@ gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn #define vkImportSemaphoreFdKHR \ gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn - #endif +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn - #endif +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_FUCHSIA) + #define vkImportSemaphoreZirconHandleFUCHSIA \ 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 c35942a703cc..c53d2905d4d9 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-07-24 18:58:27 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-10-21 19:06:35 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -178,7 +178,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -165,7 +165,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, -@@ -189,7 +189,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -176,7 +176,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 b71066ee7708..3a9227d121c4 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-07-24 18:58:27 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-10-21 19:06:35 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -36,7 +36,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -33,7 +33,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 a09f7a51fa9e..7b601ded02ee 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-04-30 22:22:49 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-10-21 19:06:35 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -34,7 +34,7 @@ namespace headless { +@@ -25,7 +25,7 @@ namespace headless { namespace { @@ -9,7 +9,7 @@ static char kProductName[] = "HeadlessChrome"; #endif -@@ -80,7 +80,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic +@@ -55,7 +55,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic return traffic_annotation; } @@ -18,21 +18,12 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -289,7 +289,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM - proxy_config_monitor_ = - std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner); +@@ -195,7 +195,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM + proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( + base::ThreadTaskRunnerHandle::Get()); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - crypt_config_ = BuildCryptConfigOnce(user_data_path_); - if (network_service_enabled_ && crypt_config_) - content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_)); -@@ -365,7 +365,7 @@ void HeadlessRequestContextManager::InitializeOnIO() { - std::move(protocol_handler.second)); - } - protocol_handlers_.clear(); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (crypt_config_) { - content::GetNetworkServiceImpl()->SetCryptConfig( - std::move(crypt_config_)); + auto crypt_config = BuildCryptConfigOnce(user_data_path_); + if (crypt_config) + content::GetNetworkService()->SetCryptConfig(std::move(crypt_config)); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h deleted file mode 100644 index 7780cfd2173f..000000000000 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/browser/headless_request_context_manager.h.orig 2019-03-17 18:56:16 UTC -+++ headless/lib/browser/headless_request_context_manager.h -@@ -69,7 +69,7 @@ class HeadlessRequestContextManager { - std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_; - bool is_system_context_; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - ::network::mojom::CryptConfigPtr crypt_config_; - #endif - diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc new file mode 100644 index 000000000000..8d2996007abe --- /dev/null +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -0,0 +1,20 @@ +--- headless/lib/headless_content_main_delegate.cc.orig 2019-10-21 19:06:35 UTC ++++ headless/lib/headless_content_main_delegate.cc +@@ -328,7 +328,7 @@ int HeadlessContentMainDelegate::RunProcess( + } + #endif // !defined(CHROME_MULTIPLE_DLL_CHILD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void SIGTERMProfilingShutdown(int signal) { + content::Profiling::Stop(); + struct sigaction sigact; +@@ -363,7 +363,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { + breakpad::InitCrashReporter(process_type); + #endif + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h new file mode 100644 index 000000000000..a805eb5b8352 --- /dev/null +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h @@ -0,0 +1,11 @@ +--- headless/lib/headless_content_main_delegate.h.orig 2019-09-16 09:51:15 UTC ++++ headless/lib/headless_content_main_delegate.h +@@ -58,7 +58,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate + + HeadlessBrowserImpl* browser() const { return browser_.get(); } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void ZygoteForked() override; + #endif + diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index ca14781379c6..935d75382d24 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-04-30 22:22:52 UTC +--- ipc/ipc_channel.h.orig 2019-09-09 21:55:20 UTC +++ ipc/ipc_channel.h -@@ -245,7 +245,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index b5d5bf84b128..b22fecbf6572 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2019-07-24 18:58:29 UTC +--- ipc/ipc_message_utils.h.orig 2019-10-21 19:06:36 UTC +++ ipc/ipc_message_utils.h -@@ -205,7 +205,7 @@ struct ParamTraits<unsigned int> { +@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 26c67105cbcb..39b61db0c9b0 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2019-04-30 22:22:52 UTC +--- media/BUILD.gn.orig 2019-10-21 19:06:36 UTC +++ media/BUILD.gn -@@ -60,6 +60,9 @@ config("media_config") { +@@ -62,6 +62,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 93cc2c74270f..a392b92a41a0 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2019-06-04 18:55:25 UTC +--- media/audio/BUILD.gn.orig 2019-09-09 21:55:20 UTC +++ media/audio/BUILD.gn -@@ -236,8 +236,18 @@ source_set("audio") { +@@ -234,8 +234,18 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h index 0652698c4d51..5b097ec108c3 100644 --- a/www/chromium/files/patch-media_base_scopedfd__helper.h +++ b/www/chromium/files/patch-media_base_scopedfd__helper.h @@ -1,14 +1,18 @@ ---- media/base/scopedfd_helper.h.orig 2019-03-11 22:00:59 UTC +--- media/base/scopedfd_helper.h.orig 2019-09-09 21:55:20 UTC +++ media/base/scopedfd_helper.h -@@ -14,14 +14,14 @@ namespace media { - // since the only current user is V4L2 we are limiting the scope to OS_LINUX so +@@ -11,17 +11,17 @@ + namespace media { + + // Theoretically, we can test on defined(OS_POSIX) || defined(OS_FUCHSIA), but +-// since the only current user is V4L2 we are limiting the scope to OS_LINUX so ++// since the only current user is V4L2 we are limiting the scope to OS_LINUX || OS_BSD so // the binary size does not inflate on non-using systems. Feel free to adapt // this and BUILD.gn as our needs evolve. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Return a new vector containing duplicates of |fds|, or an empty vector in - // case of error. + // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an + // error. MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs( const std::vector<base::ScopedFD>& fds); diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index a40d2bc207fb..2bfb638cddcc 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-07-24 18:58:30 UTC +--- media/base/video_frame.cc.orig 2019-10-21 19:06:36 UTC +++ media/base/video_frame.cc -@@ -53,7 +53,7 @@ static std::string StorageTypeToString( +@@ -52,7 +52,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -68,7 +68,7 @@ static std::string StorageTypeToString( +@@ -67,7 +67,7 @@ static std::string StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -495,7 +495,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva +@@ -185,7 +185,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo + return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // 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 + friend class base::RefCountedThreadSafe<DmabufHolder>; + ~DmabufHolder() = default; + }; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + bool VideoFrame::IsValidConfig(VideoPixelFormat format, +@@ -468,7 +468,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva return frame; } @@ -27,17 +45,17 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -626,7 +626,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -604,7 +604,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // If there are any |dmabuf_fds_| plugged in, we should duplicate them. - if (frame.storage_type() == STORAGE_DMABUFS) { - wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame.dmabuf_fds_); -@@ -950,7 +950,7 @@ size_t VideoFrame::shared_memory_offset() const { - return shared_memory_offset_; + 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]; } -#if defined(OS_LINUX) @@ -45,3 +63,12 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); +@@ -986,7 +986,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, + storage_type_(storage_type), + visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), + natural_size_(natural_size), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), + #endif + timestamp_(timestamp), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 1abbeab3f146..ebe7e4653e35 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,15 +1,27 @@ ---- media/base/video_frame.h.orig 2019-07-24 18:58:30 UTC +--- media/base/video_frame.h.orig 2019-10-21 19:06:36 UTC +++ media/base/video_frame.h -@@ -74,7 +74,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -39,9 +39,9 @@ + #include "base/mac/scoped_cftyperef.h" + #endif // defined(OS_MACOSX) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/scoped_file.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace media { + +@@ -76,7 +76,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, // Pixels are backed by Shared Memory. + STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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 -@@ -268,7 +268,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -229,7 +229,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,21 +30,21 @@ // 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 -@@ -464,7 +464,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // Returns the offset into the shared memory where the frame data begins. - size_t shared_memory_offset() const; +@@ -444,7 +444,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; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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 -@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // memory. - size_t shared_memory_offset_; +@@ -630,7 +630,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + base::UnsafeSharedMemoryRegion owned_shm_region_; + base::WritableSharedMemoryMapping owned_shm_mapping_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + class DmabufHolder; + // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either - // equal or less than the number of planes of the frame. If it is less, then - // the memory area represented by the last FD contains the remaining planes. diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index f5b7886df52a..ab3b5a40d144 100644 --- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2019-10-21 19:06:36 UTC +++ media/capture/video/create_video_capture_device_factory.cc @@ -10,7 +10,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" @@ -8,8 +8,8 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif defined(OS_CHROMEOS) - #include "media/capture/video/chromeos/public/cros_features.h" -@@ -33,7 +33,7 @@ namespace { + #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h" +@@ -82,7 +82,7 @@ CreateChromeOSVideoCaptureDeviceFactory( std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { @@ -17,4 +17,4 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); #elif defined(OS_CHROMEOS) - // On Chrome OS we have to support two use cases: + return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {}); 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 9b6f3f3cae07..9b577f3fb656 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-06-04 18:55:25 UTC +--- 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 -@@ -202,7 +202,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -205,7 +205,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_linux_video__capture__device__factory__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc index a66828aad4da..544c35d92c13 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-09-09 21:55:20 UTC +++ media/capture/video/linux/video_capture_device_factory_linux.cc @@ -259,6 +259,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE)) @@ -9,7 +9,7 @@ VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false); v4l2_fmtdesc fmtdesc = {}; @@ -267,6 +268,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( - if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat)) + if (base::Contains(usable_fourccs, fmtdesc.pixelformat)) return true; } +#endif diff --git a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc deleted file mode 100644 index 9d683ea59bbd..000000000000 --- a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-06-04 18:55:25 UTC -+++ media/capture/video/shared_memory_handle_provider.cc -@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle( - return true; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor( - mojo::ScopedHandle fd_handle, - uint32_t memory_size_in_bytes) { -@@ -80,7 +80,7 @@ bool SharedMemoryHandleProvider::InitAsReadOnlyFromRaw - shared_memory_.emplace(memory_handle, read_only_flag_); - return true; - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - mojo::ScopedSharedBufferHandle - SharedMemoryHandleProvider::GetHandleForInterProcessTransit(bool read_only) { diff --git a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h deleted file mode 100644 index 5508655ecfcf..000000000000 --- a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h +++ /dev/null @@ -1,15 +0,0 @@ ---- media/capture/video/shared_memory_handle_provider.h.orig 2019-06-04 18:55:25 UTC -+++ media/capture/video/shared_memory_handle_provider.h -@@ -38,10 +38,10 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider - - // This requires platforms where base::SharedMemoryHandle is backed by a - // file descriptor. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle, - uint32_t memory_size_in_bytes); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - uint32_t GetMemorySizeInBytes(); - 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 0583c7fbe78a..8fa1201d0fe5 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-06-04 18:55:25 UTC +--- 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 -@@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi +@@ -57,7 +57,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 40b161c1bf98..5b0c0f57fbe2 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-07-24 18:58:30 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-10-21 19:06:36 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -298,7 +298,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -301,7 +301,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_linux_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc index ecff20ff5e8d..2e98aabb9abc 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,6 +1,6 @@ ---- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-07-24 18:58:30 UTC +--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-09-09 21:55:20 UTC +++ media/gpu/linux/platform_video_frame_utils.cc -@@ -107,7 +107,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle DCHECK(video_frame); gfx::GpuMemoryBufferHandle handle; @@ -9,7 +9,7 @@ handle.type = gfx::NATIVE_PIXMAP; std::vector<base::ScopedFD> duped_fds = -@@ -126,7 +126,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle } #else NOTREACHED(); diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc deleted file mode 100644 index 2109b75820e0..000000000000 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-07-24 18:58:30 UTC -+++ media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc -@@ -15,7 +15,7 @@ - #include "media/gpu/vaapi/vaapi_wrapper.h" - #include "media/video/picture.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "media/gpu/linux/platform_video_frame_utils.h" - #endif - -@@ -137,7 +137,7 @@ scoped_refptr<VideoFrame> VaapiDmaBufVideoFrameMapper: - } - - gfx::GpuMemoryBufferHandle gmb_handle; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - gmb_handle = CreateGpuMemoryBufferHandle(video_frame.get()); - #endif - if (gmb_handle.is_null()) { diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc deleted file mode 100644 index 8d5714c32cb2..000000000000 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-07-24 18:58:30 UTC -+++ media/gpu/vaapi/vaapi_video_encode_accelerator.cc -@@ -41,7 +41,7 @@ - #include "media/gpu/vp8_reference_frame_vector.h" - #include "media/gpu/vp9_reference_frame_vector.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "media/gpu/linux/platform_video_frame_utils.h" - #endif - -@@ -558,7 +558,7 @@ scoped_refptr<VaapiEncodeJob> VaapiVideoEncodeAccelera - vaapi_wrapper_, MakeGLContextCurrentCallback(), BindGLImageCallback(), - PictureBuffer(kDummyPictureBufferId, frame->coded_size())); - gfx::GpuMemoryBufferHandle gmb_handle; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - gmb_handle = CreateGpuMemoryBufferHandle(frame.get()); - #endif - if (gmb_handle.is_null()) { diff --git a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc deleted file mode 100644 index f1dbba5e8200..000000000000 --- a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc +++ /dev/null @@ -1,51 +0,0 @@ ---- media/gpu/video_frame_mapper_factory.cc.orig 2019-07-24 18:58:30 UTC -+++ media/gpu/video_frame_mapper_factory.cc -@@ -7,38 +7,38 @@ - #include "build/build_config.h" - #include "media/gpu/buildflags.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "media/gpu/linux/generic_dmabuf_video_frame_mapper.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - --#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.h" --#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - - namespace media { - - // static - std::unique_ptr<VideoFrameMapper> VideoFrameMapperFactory::CreateMapper( - VideoPixelFormat format) { --#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - return CreateMapper(format, false); - #else - return CreateMapper(format, true); --#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - } - - // static - std::unique_ptr<VideoFrameMapper> VideoFrameMapperFactory::CreateMapper( - VideoPixelFormat format, - bool linear_buffer_mapper) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (linear_buffer_mapper) - return GenericDmaBufVideoFrameMapper::Create(format); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - --#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - return VaapiDmaBufVideoFrameMapper::Create(format); --#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) -+#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - - return nullptr; - } 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 new file mode 100644 index 000000000000..5c55600fa7d3 --- /dev/null +++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -0,0 +1,11 @@ +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-09-16 09:54:00 UTC ++++ media/mojo/clients/mojo_video_encode_accelerator.cc +@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< + frame->layout().num_planes()); + DCHECK(vea_.is_bound()); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + 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 new file mode 100644 index 000000000000..69a3cfca2fdc --- /dev/null +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -0,0 +1,20 @@ +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-10-30 16:06:07 UTC ++++ media/mojo/mojom/video_frame_mojom_traits.cc +@@ -52,7 +52,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + mojo_frame->PlaneOffset(media::VideoFrame::kVPlane))); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { + std::vector<mojo::ScopedHandle> dmabuf_fds; + +@@ -145,7 +145,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); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (data.is_dmabuf_data()) { + media::mojom::DmabufVideoFrameDataDataView dmabuf_data; + data.GetDmabufDataDataView(&dmabuf_data); diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc index a121fdc8958b..52b8e1fb7342 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,20 +1,20 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-07-24 18:58:30 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-10-21 19:06:36 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -55,7 +55,7 @@ namespace media { +@@ -65,7 +65,7 @@ namespace media { namespace { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ - defined(OS_WIN) || defined(OS_LINUX) + defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) gpu::CommandBufferStub* GetCommandBufferStub( + scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, - base::UnguessableToken channel_token, -@@ -199,7 +199,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea - std::make_unique<VideoFrameFactoryImpl>( - gpu_task_runner_, std::move(get_stub_cb), gpu_preferences_)); - #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) +@@ -245,7 +245,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea + command_buffer_id->route_id)); + } + +-#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) video_decoder = VdaVideoDecoder::Create( task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, gpu_preferences_, gpu_workarounds_, 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 36519644232a..efc1b9058d2f 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-07-24 18:58:31 UTC +--- 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 -@@ -597,7 +597,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -555,7 +555,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 949727df7d09..34bf5ce73ee3 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2019-07-24 18:58:32 UTC +--- net/BUILD.gn.orig 2019-10-21 19:06:38 UTC +++ net/BUILD.gn -@@ -98,7 +98,7 @@ net_configs = [ +@@ -105,7 +105,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,16 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1919,7 +1919,7 @@ component("net") { +@@ -1924,7 +1924,7 @@ component("net") { + } + } + +- if (is_android || is_chromeos) { ++ if (is_android || is_chromeos || is_bsd) { + sources += [ + "base/network_change_notifier_posix.cc", + "base/network_change_notifier_posix.h", +@@ -1957,7 +1957,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -18,7 +27,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2012,6 +2012,16 @@ component("net") { +@@ -2051,6 +2051,16 @@ component("net") { ] sources -= [ "disk_cache/blockfile/file_posix.cc" ] 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 eb5cb5a0171a..06f21dda1b32 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,8 +1,26 @@ ---- net/base/network_change_notifier.cc.orig 2019-07-24 18:58:32 UTC +--- net/base/network_change_notifier.cc.orig 2019-10-21 19:06:38 UTC +++ net/base/network_change_notifier.cc -@@ -225,7 +225,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +@@ -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) + #include "net/base/network_change_notifier_posix.h" #elif defined(OS_FUCHSIA) - return new NetworkChangeNotifierFuchsia(0 /* required_features */); + #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; +-#elif defined(OS_CHROMEOS) ++#elif defined(OS_CHROMEOS) || defined(OS_BSD) + return std::make_unique<NetworkChangeNotifierPosix>(CONNECTION_NONE, + SUBTYPE_NONE); + #elif defined(OS_LINUX) +@@ -236,7 +236,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + return std::make_unique<NetworkChangeNotifierFuchsia>( + 0 /* required_features */); #else - NOTIMPLEMENTED(); return NULL; diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index 9e63c0c29904..be75a59fbd52 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_util.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/dns_util.cc.orig 2019-10-21 19:06:38 UTC +++ net/dns/dns_util.cc -@@ -36,6 +36,8 @@ const uint16_t kFlagNamePointer = 0xc000; +@@ -38,6 +38,8 @@ const uint16_t kFlagNamePointer = 0xc000; } // namespace diff --git a/www/chromium/files/patch-net_features.gni b/www/chromium/files/patch-net_features.gni index f72e2c847ddb..cb5adcfbf764 100644 --- a/www/chromium/files/patch-net_features.gni +++ b/www/chromium/files/patch-net_features.gni @@ -1,6 +1,6 @@ ---- net/features.gni.orig 2019-07-24 18:58:32 UTC +--- net/features.gni.orig 2019-09-09 21:55:21 UTC +++ net/features.gni -@@ -26,7 +26,7 @@ declare_args() { +@@ -23,7 +23,7 @@ declare_args() { disable_brotli_filter = false # Multicast DNS. diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index 668ecfa1c65f..493f5972c2d4 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2019-07-24 18:58:32 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2019-10-21 19:06:38 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -443,8 +443,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -366,8 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h index 414a8510f947..e333287758ee 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2019-05-04 12:57:12 UTC +--- net/http/http_auth_gssapi_posix.h.orig 2019-09-09 21:55:21 UTC +++ net/http/http_auth_gssapi_posix.h -@@ -19,6 +19,9 @@ +@@ -21,6 +21,9 @@ #include <GSS/gssapi.h> #elif defined(OS_FREEBSD) #include <gssapi/gssapi.h> diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc index 8508a0e707d1..8690e1d62050 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator.cc.orig 2019-04-30 22:22:54 UTC +--- net/nqe/network_quality_estimator.cc.orig 2019-09-09 21:55:22 UTC +++ net/nqe/network_quality_estimator.cc -@@ -100,7 +100,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { +@@ -101,7 +101,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc index b14b4ca1243b..b88d8ab22694 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,11 +1,11 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2019-04-30 22:22:54 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2019-10-21 19:06:38 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2039,7 +2039,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa - +@@ -2144,7 +2144,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // enabled only on certain platforms. --#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // ChromeOS is disabled due to crbug.com/986904 +-#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID)) && \ ++#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)) && \ + !defined(OS_CHROMEOS) #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT #else - #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc index 29126685627d..2a0aa14b8e96 100644 --- a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-07-24 18:58:32 UTC +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-10-21 19:06:38 UTC +++ net/proxy_resolution/proxy_resolution_service.cc @@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1571,7 +1571,7 @@ ProxyResolutionService::CreateSystemProxyConfigService +@@ -1547,7 +1547,7 @@ ProxyResolutionService::CreateSystemProxyConfigService << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc deleted file mode 100644 index 99b6f3a418ca..000000000000 --- a/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-06-04 18:55:27 UTC -+++ net/quic/platform/impl/quic_ip_address_impl.cc -@@ -13,6 +13,7 @@ - #include <ws2bth.h> - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) - #include <netinet/in.h> -+#include <sys/socket.h> - #endif - - using std::string; diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc index d04365d4ee07..927b8a2395d8 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-04-30 22:22:55 UTC +--- net/socket/socket_posix.cc.orig 2019-10-21 19:06:38 UTC +++ net/socket/socket_posix.cc -@@ -569,7 +569,7 @@ void SocketPosix::ReadCompleted() { +@@ -520,7 +520,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 58ca2cbcaf12..c0cfba258179 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,4 +1,4 @@ ---- net/socket/udp_socket_posix.cc.orig 2019-06-04 18:55:27 UTC +--- net/socket/udp_socket_posix.cc.orig 2019-09-09 21:55:22 UTC +++ net/socket/udp_socket_posix.cc @@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = @@ -18,7 +18,7 @@ #if defined(OS_MACOSX) && !defined(OS_IOS) -@@ -645,13 +645,13 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -644,13 +644,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -34,7 +34,7 @@ } int UDPSocketPosix::AllowAddressReuse() { -@@ -666,17 +666,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -665,17 +665,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -57,7 +57,7 @@ rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); return rv == 0 ? OK : MapSystemError(errno); -@@ -938,7 +941,7 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -935,7 +938,7 @@ int UDPSocketPosix::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -66,7 +66,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -950,7 +953,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -947,7 +950,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_address.s_addr = htonl(INADDR_ANY); #endif // !defined(OS_MACOSX) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, @@ -78,7 +78,7 @@ if (rv) return MapSystemError(errno); break; -@@ -1012,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a +@@ -1009,7 +1016,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; @@ -87,7 +87,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -1060,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1057,9 +1064,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc index e79a01ca6cf3..65d641ec320d 100644 --- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -1,6 +1,6 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-07-24 18:58:33 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-10-21 19:06:39 UTC +++ net/tools/quic/quic_http_proxy_backend.cc -@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext +@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext // Enable HTTP2, but disable QUIC on the backend context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h new file mode 100644 index 000000000000..7f70fcc54ea6 --- /dev/null +++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -0,0 +1,20 @@ +--- net/traffic_annotation/network_traffic_annotation.h.orig 2019-09-16 09:58:42 UTC ++++ net/traffic_annotation/network_traffic_annotation.h +@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + } // namespace net + + // Placeholder for unannotated usages. +-#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ + net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") + #endif +@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + // + // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or + // TRAFFIC_ANNOTATION_FOR_TESTS. +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + #define NO_TRAFFIC_ANNOTATION_YET \ + net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.") + diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc new file mode 100644 index 000000000000..36e2fa9c37e2 --- /dev/null +++ b/www/chromium/files/patch-net_url__request_url__fetcher.cc @@ -0,0 +1,11 @@ +--- net/url_request/url_fetcher.cc.orig 2019-10-30 16:19:14 UTC ++++ net/url_request/url_fetcher.cc +@@ -11,7 +11,7 @@ namespace net { + + URLFetcher::~URLFetcher() = default; + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // static + std::unique_ptr<URLFetcher> URLFetcher::Create( + const GURL& url, diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h new file mode 100644 index 000000000000..bd4fbd669d4c --- /dev/null +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -0,0 +1,11 @@ +--- net/url_request/url_fetcher.h.orig 2019-10-30 16:19:33 UTC ++++ net/url_request/url_fetcher.h +@@ -113,7 +113,7 @@ class NET_EXPORT URLFetcher { + // The unannotated Create() methods are not available on desktop Linux + + // Windows. They are available on other platforms, since we only audit network + // annotations on Linux & Windows. +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // |url| is the URL to send the request to. It must be valid. + // |request_type| is the type of request to make. + // |d| the object that will receive the callback on fetch completion. diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc new file mode 100644 index 000000000000..0a92f4cbc106 --- /dev/null +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -0,0 +1,11 @@ +--- net/url_request/url_request_context.cc.orig 2019-10-30 16:19:57 UTC ++++ net/url_request/url_request_context.cc +@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext:: + return &network_session->context(); + } + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + std::unique_ptr<URLRequest> URLRequestContext::CreateRequest( + const GURL& url, + RequestPriority priority, diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h new file mode 100644 index 000000000000..87b9d97abe7b --- /dev/null +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -0,0 +1,11 @@ +--- net/url_request/url_request_context.h.orig 2019-10-30 16:20:11 UTC ++++ net/url_request/url_request_context.h +@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext + // session. + const HttpNetworkSession::Context* GetNetworkSessionContext() const; + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // This function should not be used in Chromium, please use the version with + // NetworkTrafficAnnotationTag in the future. + // 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 7bdf42aa98d1..ae4dbd8aed29 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-07-24 18:58:33 UTC +--- net/url_request/url_request_context_builder.cc.orig 2019-10-21 19:06:39 UTC +++ net/url_request/url_request_context_builder.cc -@@ -534,7 +534,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -519,7 +519,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. -@@ -543,7 +543,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -528,7 +528,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 9da0e9259e1b..960cf2518204 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,74 +1,56 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2019-06-04 18:55:27 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2019-10-21 19:06:39 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -134,7 +134,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT - - PDFiumEngine* g_engine_for_fontmapper = nullptr; +@@ -53,7 +53,7 @@ + #include "ui/gfx/geometry/rect.h" + #include "v8/include/v8.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + #include "pdf/pdfium/pdfium_font_linux.h" + #endif - PP_Instance g_last_instance_id; - -@@ -414,7 +414,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) { - fontinfo_with_metrics->default_sysfontinfo->Release( - fontinfo_with_metrics->default_sysfontinfo); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - PDFiumEngine::CreateDocumentLoaderFunction - g_create_document_loader_for_testing = nullptr; -@@ -664,7 +664,7 @@ bool InitializeSDK() { +@@ -378,7 +378,7 @@ bool InitializeSDK(bool enable_v8) { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Font loading doesn't work in the renderer sandbox in Linux. - FPDF_SetSystemFontInfo(&g_font_info); - #else -@@ -689,7 +689,7 @@ bool InitializeSDK() { - - void ShutdownSDK() { - FPDF_DestroyLibrary(); --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - delete g_font_info; + InitializeLinuxFontMapper(); #endif - TearDownV8(); -@@ -713,7 +713,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, + +@@ -414,7 +414,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. - pp::Instance* instance = client_->GetPluginInstance(); - if (instance) -@@ -1177,7 +1177,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( + SetLastInstance(client_->GetPluginInstance()); + #endif +@@ -870,7 +870,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2978,7 +2978,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2696,7 +2696,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3453,7 +3453,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3190,7 +3190,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/chromium/files/patch-ppapi_proxy_flash__resource.cc b/www/chromium/files/patch-ppapi_proxy_flash__resource.cc new file mode 100644 index 000000000000..a45deba61a6e --- /dev/null +++ b/www/chromium/files/patch-ppapi_proxy_flash__resource.cc @@ -0,0 +1,11 @@ +--- ppapi/proxy/flash_resource.cc.orig 2019-09-16 10:01:18 UTC ++++ ppapi/proxy/flash_resource.cc +@@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan + // require filesystem access prohibited by the sandbox. + // TODO(shess): Figure out why OSX needs the access, the sandbox warmup should + // handle it. http://crbug.com/149006 +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>( + BROWSER, + PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)), diff --git a/www/chromium/files/patch-printing_backend_print__backend__cups.h b/www/chromium/files/patch-printing_backend_print__backend__cups.h deleted file mode 100644 index 816d95f5f5c7..000000000000 --- a/www/chromium/files/patch-printing_backend_print__backend__cups.h +++ /dev/null @@ -1,11 +0,0 @@ ---- printing/backend/print_backend_cups.h.orig 2019-03-11 22:01:01 UTC -+++ printing/backend/print_backend_cups.h -@@ -5,6 +5,8 @@ - #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ - #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ - -+#include <cups/ppd.h> -+ - #include <string> - - #include "base/files/file_util.h" diff --git a/www/chromium/files/patch-remoting_base_chromoting__event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc index 1e4813781028..93df172fe5e5 100644 --- a/www/chromium/files/patch-remoting_base_chromoting__event.cc +++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,8 +1,8 @@ ---- remoting/base/chromoting_event.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/base/chromoting_event.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/base/chromoting_event.cc -@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() { +@@ -188,7 +188,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); - SetString(kOsVersionKey, GetOperatingSystemVersionString()); + SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index e3ebcf149315..d2a35b8d8d01 100644 --- a/www/chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/host_attributes.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/host_attributes.cc -@@ -123,7 +123,7 @@ std::string GetHostAttributes() { +@@ -124,7 +124,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index c221907fcaf0..2467708caed9 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_details.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/host_details.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/host_details.cc -@@ -24,7 +24,7 @@ std::string GetHostOperatingSystemName() { +@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; #elif defined(OS_CHROMEOS) return "ChromeOS"; diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc new file mode 100644 index 000000000000..72f86cb90395 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -0,0 +1,27 @@ +--- remoting/host/host_main.cc.orig 2019-10-30 16:20:58 UTC ++++ remoting/host/host_main.cc +@@ -49,9 +49,9 @@ int DesktopProcessMain(); + int FileChooserMain(); + int RdpDesktopSessionMain(); + #endif // defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int XSessionChooserMain(); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace { + +@@ -146,10 +146,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro + } else if (process_type == kProcessTypeRdpDesktopSession) { + main_routine = &RdpDesktopSessionMain; + #endif // defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (process_type == kProcessTypeXSessionChooser) { + main_routine = &XSessionChooserMain; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + return main_routine; diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 25b9ed454046..8b322d0ffc3e 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-10-21 19:06:39 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -27,12 +27,12 @@ +@@ -28,12 +28,12 @@ #include "remoting/host/resources.h" #include "remoting/host/usage_stats_consent.h" @@ -15,7 +15,7 @@ #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" -@@ -106,7 +106,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -108,7 +108,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -24,7 +24,7 @@ // Required in order for us to run multiple X11 threads. XInitThreads(); -@@ -122,7 +122,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -124,7 +124,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index e1967229aea1..af1299dd2bdf 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2019-04-30 22:22:56 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -131,7 +131,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index d60b26126c50..b40c751440bf 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-07-24 18:58:34 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2019-10-21 19:06:39 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -126,13 +126,13 @@ +@@ -120,13 +120,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -167,11 +167,11 @@ const char kApplicationName[] = "chromoting"; +@@ -161,11 +161,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 -@@ -369,7 +369,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -358,7 +358,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 -@@ -589,10 +589,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -555,10 +555,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; -@@ -788,7 +788,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -753,7 +753,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), -@@ -874,7 +874,7 @@ void HostProcess::StartOnUiThread() { +@@ -839,7 +839,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()-> -@@ -883,7 +883,7 @@ void HostProcess::StartOnUiThread() { +@@ -848,7 +848,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 = -@@ -940,7 +940,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -903,7 +903,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. -@@ -1634,7 +1634,7 @@ void HostProcess::StartHost() { +@@ -1532,7 +1532,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 -@@ -1819,7 +1819,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1711,7 +1711,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_host_switches.cc b/www/chromium/files/patch-remoting_host_switches.cc new file mode 100644 index 000000000000..feb1d19fe0ec --- /dev/null +++ b/www/chromium/files/patch-remoting_host_switches.cc @@ -0,0 +1,14 @@ +--- remoting/host/switches.cc.orig 2019-10-30 16:21:28 UTC ++++ remoting/host/switches.cc +@@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host"; + const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session"; + const char kProcessTypeEvaluateCapability[] = "evaluate_capability"; + const char kProcessTypeFileChooser[] = "file_chooser"; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const char kProcessTypeXSessionChooser[] = "xsession_chooser"; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + const char kEvaluateCapabilitySwitchName[] = "evaluate-type"; + diff --git a/www/chromium/files/patch-remoting_host_switches.h b/www/chromium/files/patch-remoting_host_switches.h new file mode 100644 index 000000000000..39fcdf4bebb2 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_switches.h @@ -0,0 +1,14 @@ +--- remoting/host/switches.h.orig 2019-10-30 16:21:42 UTC ++++ remoting/host/switches.h +@@ -34,9 +34,9 @@ extern const char kProcessTypeHost[]; + extern const char kProcessTypeRdpDesktopSession[]; + extern const char kProcessTypeEvaluateCapability[]; + extern const char kProcessTypeFileChooser[]; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kProcessTypeXSessionChooser[]; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + extern const char kEvaluateCapabilitySwitchName[]; + diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd new file mode 100644 index 000000000000..bb30bf66a69f --- /dev/null +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -0,0 +1,20 @@ +--- remoting/resources/remoting_strings.grd.orig 2019-10-30 16:22:45 UTC ++++ remoting/resources/remoting_strings.grd +@@ -1332,7 +1332,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. + Not Now + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <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. + <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> + Launch the default XSession + </message> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + </messages> + </release> + </grit> diff --git a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc deleted file mode 100644 index 5fbe86cba0ff..000000000000 --- a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- services/content/simple_browser/simple_browser_service.cc.orig 2019-07-24 18:58:34 UTC -+++ services/content/simple_browser/simple_browser_service.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - #include "services/content/simple_browser/window.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "third_party/skia/include/ports/SkFontConfigInterface.h" // nogncheck - #endif - -@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul - - void SimpleBrowserService::OnStart() { - if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = - sk_make_sp<font_service::FontLoader>(service_binding_.GetConnector()); - SkFontConfigInterface::SetGlobal(font_loader_); diff --git a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h deleted file mode 100644 index e117349b35f1..000000000000 --- a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h +++ /dev/null @@ -1,20 +0,0 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-07-24 18:58:34 UTC -+++ services/content/simple_browser/simple_browser_service.h -@@ -15,7 +15,7 @@ - #include "services/service_manager/public/cpp/service_binding.h" - #include "services/service_manager/public/mojom/service.mojom.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/font_loader.h" // nogncheck - #endif - -@@ -45,7 +45,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe - // service_manager::Service: - void OnStart() override; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - sk_sp<font_service::FontLoader> font_loader_; - #endif - diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc index 6c68a384318c..09d0ebb1255d 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2019-05-04 09:19:19 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2019-10-30 16:46:42 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,374 @@ +@@ -0,0 +1,375 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -19,6 +19,7 @@ +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" ++#include "base/files/file.h" +#include "base/location.h" +#include "base/logging.h" +#include "base/posix/eintr_wrapper.h" diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index fa698bc64997..7c3ad6a76957 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2019-07-29 14:20:42 UTC +--- services/device/usb/BUILD.gn.orig 2019-09-09 21:55:22 UTC +++ services/device/usb/BUILD.gn -@@ -111,7 +111,7 @@ static_library("usb") { +@@ -110,7 +110,7 @@ static_library("usb") { ] } diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 8c70cc7e0a3b..7a453e121b53 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-07-24 18:58:34 UTC +--- services/network/BUILD.gn.orig 2019-10-21 19:06:39 UTC +++ services/network/BUILD.gn -@@ -253,7 +253,6 @@ jumbo_component("network_service") { +@@ -261,7 +261,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index fe056ef0561f..edaabbba25d3 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-07-24 18:58:34 UTC +--- services/network/network_context.cc.orig 2019-10-21 19:06:39 UTC +++ services/network/network_context.cc -@@ -1711,7 +1711,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -1776,7 +1776,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 a864991884c2..14c17717564d 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2019-07-24 18:58:34 UTC +--- services/network/network_service.cc.orig 2019-10-21 19:06:39 UTC +++ services/network/network_service.cc -@@ -60,7 +60,7 @@ +@@ -62,7 +62,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -625,7 +625,7 @@ void NetworkService::OnCertDBChanged() { +@@ -596,7 +596,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 d4dd082d0540..0fada718f978 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-07-24 18:58:34 UTC +--- services/network/network_service.h.orig 2019-10-21 19:06:39 UTC +++ services/network/network_service.h -@@ -176,7 +176,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -152,7 +152,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_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index f7f75e7ebc91..4c391c6c24c4 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-07-29 19:31:28 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-09-09 21:55:22 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -42,7 +42,7 @@ namespace { +@@ -43,7 +43,7 @@ namespace { uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -151,7 +151,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-services_service__manager_embedder_main.cc index 3b5397b33b37..9c935b9f16e1 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_main.cc +++ b/www/chromium/files/patch-services_service__manager_embedder_main.cc @@ -1,6 +1,6 @@ ---- services/service_manager/embedder/main.cc.orig 2019-07-24 18:58:35 UTC +--- services/service_manager/embedder/main.cc.orig 2019-10-21 19:06:40 UTC +++ services/service_manager/embedder/main.cc -@@ -271,7 +271,7 @@ int Main(const MainParams& params) { +@@ -272,7 +272,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); 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 c382c4b9c457..8a997f235ebd 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-04-30 22:22:57 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2019-10-21 19:06:40 UTC +++ services/video_capture/broadcasting_receiver.cc @@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( @@ -6,15 +6,15 @@ media::mojom::VideoBufferHandlePtr* target) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - media::SharedMemoryHandleProvider provider; - provider.InitFromMojoHandle( - source->Clone(mojo::SharedBufferHandle::AccessMode::READ_WRITE)); -@@ -174,7 +174,7 @@ void BroadcastingReceiver::BufferContext:: + // |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:: ConvertRawFileDescriptorToSharedBuffer() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - media::SharedMemoryHandleProvider provider; - provider.InitAsReadOnlyFromRawFileDescriptor( - std::move(buffer_handle_->get_shared_memory_via_raw_file_descriptor() + // The conversion unwraps the descriptor from its mojo handle to the raw file + // descriptor (ie, an int). This is used to create a + // PlatformSharedMemoryRegion which is then wrapped as a diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index b3e7a475e7f0..c44a5b2dd9e5 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-07-24 19:03:24 UTC +--- third_party/angle/BUILD.gn.orig 2019-10-21 19:09:09 UTC +++ third_party/angle/BUILD.gn -@@ -322,6 +322,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -353,6 +353,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,8 +8,8 @@ ] } } -@@ -929,10 +930,6 @@ foreach(is_shared_library, - libs = [] +@@ -1076,10 +1077,6 @@ foreach(is_shared_library, + if (is_linux) { sources += util_linux_sources - libs += [ 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 26112b34d95a..e8b9066cbe12 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-04-30 22:25:51 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2019-10-21 19:09:09 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -66,7 +66,7 @@ +@@ -68,7 +68,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" -@@ -261,7 +261,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib +@@ -268,7 +268,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 99bcfb4201b5..0af92b170d06 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-03-11 22:07:59 UTC +--- 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 -@@ -107,7 +107,7 @@ inline bool IsWindows() +@@ -114,7 +114,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index d722560d65a6..aa462a49f11a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-07-24 18:58:40 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-09-09 21:55:24 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -40,7 +40,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = - TimeDelta::FromMicroseconds(100); +@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin + base::TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ -#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index f98dda8efa5f..671f2bbd9987 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-06-04 18:55:29 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-10-21 19:06:43 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -120,7 +120,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -121,7 +121,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 2ae943e28d09..5f3d6ec67939 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-04-30 22:23:01 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-09-09 21:55:24 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -188,7 +188,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -184,7 +184,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t - std::vector<std::string> InspectorMemoryAgent::Symbolize( - const std::vector<void*>& addresses) { + Vector<String> InspectorMemoryAgent::Symbolize( + const WebVector<void*>& addresses) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // TODO(alph): Move symbolization to the client. - std::vector<void*> addresses_to_symbolize; - for (void* address : addresses) { + Vector<void*> addresses_to_symbolize; + for (size_t i = 0; i < addresses.size(); i++) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 3afbacd652da..5e753b6d6dc4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-07-24 18:58:40 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-09-09 21:55:24 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -58,7 +58,7 @@ #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -321,7 +321,7 @@ void LayoutView::UpdateLayout() { +@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index d95abda924a0..89fb20051731 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-04-30 22:23:01 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-10-21 19:06:43 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -103,7 +103,7 @@ namespace { +@@ -104,7 +104,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 7b8bafbb8004..77877fce819f 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,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-06-04 18:55:29 UTC +--- 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 -@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos +@@ -338,7 +338,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { @@ -9,7 +9,7 @@ if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif -@@ -347,7 +347,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin( +@@ -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). diff --git a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc index e99ce330e9fd..b28a35f5256b 100644 --- a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-06-04 18:55:23 UTC -+++ content/renderer/media/stream/processed_local_audio_source.cc -@@ -80,7 +80,7 @@ void LogAudioProcesingProperties( +--- 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 +@@ -84,7 +84,7 @@ void LogAudioProcesingProperties( } // namespace bool IsApmInAudioServiceEnabled() { @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService); #else return false; -@@ -406,7 +406,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -427,7 +427,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 1418dc2178fa..15307cd74348 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-07-24 18:58:42 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-09-09 21:55:25 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -111,6 +111,7 @@ executable("character_data_generator") { +@@ -103,6 +103,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 1be1325ae7dc..a31956efa12c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-07-24 18:58:42 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-09-09 21:55:26 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -72,7 +72,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; +@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -95,7 +95,7 @@ FontCache::FontCache() +@@ -115,7 +115,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index aa278a6fdc03..a0a308a3d525 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-07-24 18:58:42 UTC +--- 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 -@@ -155,7 +155,7 @@ class PLATFORM_EXPORT FontCache { +@@ -158,7 +158,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_; } -@@ -216,7 +216,7 @@ class PLATFORM_EXPORT FontCache { +@@ -233,7 +233,7 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -17,8 +17,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) struct PlatformFallbackFont { String name; - CString filename; -@@ -228,7 +228,7 @@ class PLATFORM_EXPORT FontCache { + std::string filename; +@@ -245,7 +245,7 @@ class PLATFORM_EXPORT FontCache { static void GetFontForCharacter(UChar32, const char* preferred_locale, PlatformFallbackFont*); @@ -27,9 +27,9 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -301,12 +301,12 @@ class PLATFORM_EXPORT FontCache { +@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, - CString& name); + std::string& name); -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) @@ -42,8 +42,8 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -338,7 +338,7 @@ class PLATFORM_EXPORT FontCache { - bool is_test_font_mgr_ = false; +@@ -355,7 +355,7 @@ class PLATFORM_EXPORT FontCache { + mojom::blink::DWriteFontProxyPtr service_; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h deleted file mode 100644 index abf58788f9d5..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h +++ /dev/null @@ -1,78 +0,0 @@ ---- third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h.orig 2019-07-29 20:52:32 UTC -+++ third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h -@@ -251,37 +251,6 @@ struct ShapeResult::RunInfo : public RefCounted<ShapeR - template <bool has_non_zero_glyph_offsets> - struct iterator final {}; - -- // For non-zero glyph offset array -- template <> -- struct iterator<true> final { -- // The constructor for ShapeResult -- explicit iterator(const GlyphOffsetArray& array) -- : pointer(array.storage_.get()) { -- DCHECK(pointer); -- } -- -- // The constructor for ShapeResultView -- explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { -- DCHECK(pointer); -- } -- -- GlyphOffset operator*() const { return *pointer; } -- void operator++() { ++pointer; } -- -- const GlyphOffset* pointer; -- }; -- -- // For zero glyph offset array -- template <> -- struct iterator<false> final { -- explicit iterator(const GlyphOffsetArray& array) { -- DCHECK(!array.HasStorage()); -- } -- explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } -- GlyphOffset operator*() const { return GlyphOffset(); } -- void operator++() {} -- }; -- - template <bool has_non_zero_glyph_offsets> - iterator<has_non_zero_glyph_offsets> GetIterator() const { - return iterator<has_non_zero_glyph_offsets>(*this); -@@ -493,6 +462,37 @@ struct ShapeResult::RunInfo : public RefCounted<ShapeR - unsigned start_index_; - unsigned num_characters_; - float width_; -+}; -+ -+// For non-zero glyph offset array -+template <> -+struct ShapeResult::RunInfo::GlyphOffsetArray::iterator<true> final { -+ // The constructor for ShapeResult -+ explicit iterator(const GlyphOffsetArray& array) -+ : pointer(array.storage_.get()) { -+ DCHECK(pointer); -+ } -+ -+ // The constructor for ShapeResultView -+ explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { -+ DCHECK(pointer); -+ } -+ -+ GlyphOffset operator*() const { return *pointer; } -+ void operator++() { ++pointer; } -+ -+ const GlyphOffset* pointer; -+}; -+ -+// For zero glyph offset array -+template <> -+struct ShapeResult::RunInfo::GlyphOffsetArray::iterator<false> final { -+ explicit iterator(const GlyphOffsetArray& array) { -+ DCHECK(!array.HasStorage()); -+ } -+ explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } -+ GlyphOffset operator*() const { return GlyphOffset(); } -+ void operator++() {} - }; - - // Find the range of HarfBuzzRunGlyphData for the specified character index diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index e42775c2ec2a..01d7699e4ddb 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-07-24 18:58:42 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-09-09 21:55:26 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc -@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -59,7 +59,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +@@ -82,7 +82,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } @@ -18,7 +18,7 @@ void FontCache::PlatformInit() {} -@@ -228,7 +228,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -227,7 +227,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,12 +27,12 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -255,7 +255,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon - CString name; +@@ -254,7 +254,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon + std::string name; sk_sp<SkTypeface> typeface; -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) if (alternate_name == AlternateFontName::kLocalUniqueFace && RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { - typeface = CreateTypefaceFromUniqueName(creation_params, name); + typeface = CreateTypefaceFromUniqueName(creation_params); 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 0c52ba787f29..872b2d82c874 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-03-11 22:01:04 UTC +--- 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 -@@ -52,12 +52,17 @@ +@@ -51,12 +51,17 @@ #include <objc/objc-auto.h> #endif diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index 243f211e49fb..b09577e3c1d7 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,11 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-03-11 22:08:01 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-10-21 19:09:13 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h -@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock; +@@ -63,7 +63,7 @@ class Lock { (private) // Dummy lock implementation on non-POSIX platforms. If you are running on a // different platform and care about thread-safety, please compile with // -DI18N_PHONENUMBERS_USE_BOOST. --#if !defined(__linux__) && !defined(__APPLE__) -+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +-#elif !defined(__linux__) && !defined(__APPLE__) ++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) namespace i18n { namespace phonenumbers { diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp deleted file mode 100644 index 0fad19aace3f..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp.orig 2019-07-29 19:41:09 UTC -+++ third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp -@@ -83,14 +83,14 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) { - } - - void CFWL_NoteDriver::Run() { --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - for (;;) { - CFWL_NoteLoop* pTopLoop = GetTopLoop(); - if (!pTopLoop || !pTopLoop->ContinueModal()) - break; - UnqueueMessageAndProcess(pTopLoop); - } --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - } - - void CFWL_NoteDriver::NotifyTargetHide(CFWL_Widget* pNoteTarget) { 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 6473fc184af1..4ff92b58364b 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-03-11 22:08:02 UTC +--- 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 -@@ -28,6 +28,7 @@ +@@ -40,6 +40,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 -@@ -35,13 +36,15 @@ +@@ -47,13 +48,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 -@@ -49,6 +52,7 @@ +@@ -61,6 +64,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 -@@ -56,6 +60,7 @@ +@@ -68,6 +72,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 -@@ -63,6 +68,7 @@ +@@ -75,6 +80,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_perfetto_include_perfetto_base_event.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h deleted file mode 100644 index bfbfb1266556..000000000000 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/perfetto/include/perfetto/base/event.h.orig 2019-03-11 22:08:02 UTC -+++ third_party/perfetto/include/perfetto/base/event.h -@@ -20,8 +20,9 @@ - #include "perfetto/base/build_config.h" - #include "perfetto/base/scoped_file.h" - --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - #define PERFETTO_USE_EVENTFD() 1 - #else - #define PERFETTO_USE_EVENTFD() 0 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 670eef6f090e..73d6520cda68 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2019-03-11 22:08:02 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2019-10-21 19:09:14 UTC +++ third_party/perfetto/include/perfetto/base/time.h @@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h deleted file mode 100644 index e088531d87c3..000000000000 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2019-03-11 22:08:02 UTC -+++ third_party/perfetto/include/perfetto/base/watchdog_posix.h -@@ -46,7 +46,7 @@ class Watchdog { - Timer(const Timer&) = delete; - Timer& operator=(const Timer&) = delete; - -- timer_t timerid_ = nullptr; -+ timer_t timerid_ = 0; - }; - virtual ~Watchdog(); - diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h new file mode 100644 index 000000000000..e49d012bec39 --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h @@ -0,0 +1,13 @@ +--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2019-09-16 11:03:16 UTC ++++ third_party/perfetto/include/perfetto/ext/base/event_fd.h +@@ -20,8 +20,8 @@ + #include "perfetto/base/build_config.h" + #include "perfetto/ext/base/scoped_file.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) + #define PERFETTO_USE_EVENTFD() 1 + #else + #define PERFETTO_USE_EVENTFD() 0 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h index e2b4905d03eb..929f374fb5fe 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h @@ -1,23 +1,22 @@ ---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2019-04-30 22:25:55 UTC -+++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -33,6 +33,10 @@ +--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2019-09-09 21:57:00 UTC ++++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h +@@ -33,6 +33,9 @@ + #include <sys/types.h> #include <unistd.h> #endif - +#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +#include <pthread_np.h> +#endif -+ + namespace perfetto { namespace base { - -@@ -40,6 +44,11 @@ namespace base { +@@ -41,6 +44,11 @@ namespace base { using PlatformThreadID = pid_t; inline PlatformThreadID GetThreadId() { return gettid(); +} +#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) -+ using PlatformThreadID = int; ++using PlatformThreadID = int; +inline PlatformThreadID GetThreadId() { + return pthread_getthreadid_np(); } diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 81284573e619..019dcdc03d6e 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,16 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-07-24 19:03:29 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-10-21 19:09:15 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2053,7 +2053,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin - - void TracingServiceImpl::UpdateMemoryGuardrail() { - #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - uint64_t total_buffer_bytes = 0; - - // Sum up all the shared memory buffers. -@@ -2106,7 +2107,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr +@@ -2180,7 +2180,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot(); #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ @@ -19,4 +9,4 @@ + !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) struct { clockid_t id; - protos::ClockSnapshot::Clock::Type type; + protos::ClockSnapshot::Clock::BuiltinClocks type; diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 26b4447c272b..2f151107c8c2 100644 --- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,6 +1,6 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-03-11 22:01:16 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-10-21 19:07:25 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h -@@ -117,7 +117,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR +@@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp index a40c444b1336..1241cb9d733b 100644 --- a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp +++ b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-09-09 21:57:02 UTC +++ third_party/skia/src/images/SkJpegEncoder.cpp -@@ -75,9 +75,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -76,9 +76,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr return (transform_scanline_proc) nullptr; }; @@ -15,7 +15,7 @@ case kRGBA_8888_SkColorType: fProc = chooseProc8888(); jpegColorType = JCS_EXT_RGBA; -@@ -88,6 +93,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -89,6 +94,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_BGRA; numComponents = 4; break; @@ -23,7 +23,7 @@ case kRGB_565_SkColorType: fProc = transform_scanline_565; jpegColorType = JCS_RGB; -@@ -107,6 +113,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -108,6 +114,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_GRAYSCALE; numComponents = 1; break; @@ -31,7 +31,7 @@ case kRGBA_F16_SkColorType: if (kUnpremul_SkAlphaType == srcInfo.alphaType() && options.fAlphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack) { -@@ -117,6 +124,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -118,6 +125,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_RGBA; numComponents = 4; break; diff --git a/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h deleted file mode 100644 index ede24774be9e..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2019-03-11 22:08:28 UTC -+++ third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -749,7 +749,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) 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 7bb8d3f1aeb9..dcf9a2e18e69 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-07-24 19:03:37 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-09-09 21:57:02 UTC +++ third_party/skia/src/sksl/SkSLString.h -@@ -22,6 +22,8 @@ - #include "include/core/SkString.h" - #endif +@@ -13,6 +13,8 @@ + #include <stdarg.h> + #include <string> +#include <stdarg.h> + diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index 0a780974a862..9bc2ed01d5e2 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2019-07-24 18:59:14 UTC +--- third_party/sqlite/BUILD.gn.orig 2019-09-09 21:55:43 UTC +++ third_party/sqlite/BUILD.gn -@@ -258,7 +258,7 @@ config("sqlite_warnings") { +@@ -262,7 +262,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn index a2728e56134b..3ce2b88ec045 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-03-11 22:08:03 UTC +--- third_party/swiftshader/BUILD.gn.orig 2019-10-21 19:09:15 UTC +++ third_party/swiftshader/BUILD.gn -@@ -126,9 +126,6 @@ config("swiftshader_config") { +@@ -135,9 +135,6 @@ config("swiftshader_config") { ldflags = [ "-Wl,--gc-sections" ] if (target_cpu == "mipsel") { @@ -10,7 +10,7 @@ if (mips_arch_variant == "r1") { ldflags += [ "-mips32", -@@ -140,11 +137,8 @@ config("swiftshader_config") { +@@ -149,11 +146,8 @@ config("swiftshader_config") { } } else if (target_cpu == "mips64el") { ldflags += [ diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp index 2264ab6c8787..888c476a9108 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-09-09 21:57:01 UTC +++ third_party/swiftshader/src/Main/SwiftConfig.cpp -@@ -762,7 +762,11 @@ namespace sw +@@ -764,7 +764,11 @@ namespace sw struct stat status; int lastModified = ini.getInteger("LastModified", "Time", 0); diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp index d84e619c1bef..7577231bc5a8 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-10-21 19:09:15 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp -@@ -688,7 +688,7 @@ bool Display::isValidWindow(EGLNativeWindowType window +@@ -690,7 +690,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; } return false; @@ -9,7 +9,7 @@ return false; // Non X11 linux is headless only #elif defined(__APPLE__) return sw::OSX::IsValidWindow(window); -@@ -866,7 +866,7 @@ sw::Format Display::getDisplayFormat() const +@@ -868,7 +868,7 @@ sw::Format Display::getDisplayFormat() const { return sw::FORMAT_X8R8G8B8; } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp index 7dfe3a19505f..a21bb4acad17 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-10-21 19:09:15 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp -@@ -360,7 +360,7 @@ bool WindowSurface::checkForResize() +@@ -362,7 +362,7 @@ bool WindowSurface::checkForResize() int windowWidth = windowAttributes.width; int windowHeight = windowAttributes.height; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp index 81af3cbf66e4..8c76e2a88c8a 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-04-30 22:25:56 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-09-09 21:57:02 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp @@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id) // FIXME: Check if display_id is the default display @@ -18,7 +18,7 @@ "EGL_KHR_platform_gbm " #endif #if defined(USE_X11) -@@ -1250,7 +1250,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void * +@@ -1243,7 +1243,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void * { TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list); 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 new file mode 100644 index 000000000000..fd8786353d01 --- /dev/null +++ b/www/chromium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp @@ -0,0 +1,22 @@ +--- 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_llvm-7.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h index 3a8939da33a5..f15230997555 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h @@ -1,4 +1,4 @@ ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-04-30 22:26:00 UTC +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-09 21:57:03 UTC +++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h @@ -8,15 +8,15 @@ #define BUG_REPORT_URL "https://bugs.llvm.org/" @@ -141,7 +141,7 @@ #elif defined(__mips__) #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" #elif defined(__mips64) -@@ -308,7 +308,7 @@ +@@ -310,7 +310,7 @@ #endif /* Define if zlib compression is available */ diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h index cddea0ef0e07..4405e311225b 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h @@ -1,6 +1,6 @@ ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2019-04-30 22:26:00 UTC +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2019-09-09 21:57:03 UTC +++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h -@@ -28,7 +28,7 @@ +@@ -38,7 +38,7 @@ #elif defined(__arm__) #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" #elif defined(__aarch64__) @@ -9,7 +9,7 @@ #elif defined(__mips__) #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" #elif defined(__mips64) -@@ -51,7 +51,7 @@ +@@ -63,7 +63,7 @@ #elif defined(__arm__) #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" #elif defined(__aarch64__) diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 04a6cff87c5f..b99e04b00a2c 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2019-04-30 22:25:58 UTC +--- third_party/webrtc/BUILD.gn.orig 2019-09-09 21:57:03 UTC +++ third_party/webrtc/BUILD.gn -@@ -152,6 +152,9 @@ config("common_inherited_config") { +@@ -160,6 +160,9 @@ config("common_inherited_config") { if (is_linux) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 2b88645680d0..5ebbde95ddbf 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,4 +1,4 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-06-04 18:58:06 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-10-21 19:09:18 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn @@ -265,7 +265,7 @@ rtc_source_set("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index a727ec5a63eb..41cae80d56bd 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,8 +1,8 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-06-04 18:58:07 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-09-09 21:57:05 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -@@ -12,6 +12,7 @@ - +@@ -13,6 +13,7 @@ #include <string.h> + #include <algorithm> +#include <cstdlib> #include <utility> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn deleted file mode 100644 index ddafc6ba9fdd..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-07-24 19:03:36 UTC -+++ third_party/webrtc/rtc_base/BUILD.gn -@@ -952,8 +952,6 @@ rtc_static_library("rtc_base") { - - if (rtc_use_x11) { - libs += [ -- "dl", -- "rt", - "Xext", - "X11", - "Xcomposite", -@@ -961,7 +959,7 @@ rtc_static_library("rtc_base") { - ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs += [ - "dl", - "rt", 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 6baac4f97991..6e2b8acbcd42 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-06-04 18:58:09 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2019-09-09 21:57:05 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__) -@@ -764,7 +764,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ +@@ -765,7 +765,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) { -@@ -807,7 +807,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo +@@ -808,7 +808,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_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index c13f1619297d..5059d15f5f57 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,28 +1,27 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-03-11 22:08:16 UTC +--- 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 -@@ -11,7 +11,9 @@ +@@ -11,7 +11,11 @@ #include "rtc_base/platform_thread_types.h" #if defined(WEBRTC_LINUX) +#if !defined(__FreeBSD__) #include <sys/prctl.h> ++#else ++#include <pthread_np.h> +#endif #include <sys/syscall.h> #endif -@@ -27,8 +29,10 @@ PlatformThreadId CurrentThreadId() { +@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__) - return syscall(__NR_gettid); +#elif defined(__FreeBSD__) -+ return reinterpret_cast<uint64_t>(pthread_self()); - #else - // Default implementation for nacl and solaris. - return reinterpret_cast<pid_t>(pthread_self()); -@@ -55,6 +59,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons ++ return pthread_getthreadid_np(); + #elif defined(WEBRTC_LINUX) + return syscall(__NR_gettid); + #elif defined(__EMSCRIPTEN__) +@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -30,7 +29,7 @@ #if defined(WEBRTC_WIN) struct { DWORD dwType; -@@ -72,6 +77,7 @@ void SetCurrentThreadName(const char* name) { +@@ -74,6 +81,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-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 8f543b1439cc..bb0b3df2b288 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-06-04 18:58:11 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-09-09 21:57:06 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -57,8 +57,6 @@ rtc_static_library("system_wrappers") { +@@ -58,8 +58,6 @@ rtc_static_library("system_wrappers") { if (!build_with_chromium) { deps += [ ":cpu_features_linux" ] } diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 34b612046ca9..e40888be26ac 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,14 +1,5 @@ ---- tools/gn/build/gen.py.orig 2019-07-24 19:05:33 UTC +--- tools/gn/build/gen.py.orig 2019-09-09 21:59:05 UTC +++ tools/gn/build/gen.py -@@ -46,7 +46,7 @@ class Platform(object): - - @staticmethod - def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd'] - - def platform(self): - return self._platform @@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): return self._platform == 'aix' @@ -19,7 +10,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -335,6 +338,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -337,6 +340,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_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index 9096172bd0e5..ff3d4b64bbc7 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-07-24 18:59:16 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-09-09 21:55:45 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -213,6 +213,7 @@ FEATURE_GRAMMAR = ( +@@ -215,6 +215,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 a64e68274edd..f1c67a23e235 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-06-04 18:55:48 UTC +--- tools/json_schema_compiler/model.py.orig 2019-10-21 19:07:27 UTC +++ tools/json_schema_compiler/model.py -@@ -605,7 +605,7 @@ class Platforms(object): +@@ -603,7 +603,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 d9f731193455..65de83eb7ce4 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-07-24 18:59:19 UTC +--- ui/base/resource/resource_bundle.cc.orig 2019-10-21 19:07:28 UTC +++ ui/base/resource/resource_bundle.cc -@@ -701,7 +701,7 @@ void ResourceBundle::ReloadFonts() { +@@ -793,7 +793,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -754,7 +754,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -846,7 +846,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 a7eb2140d7a9..65f772826809 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-06-04 18:55:49 UTC +--- ui/base/ui_base_features.cc.orig 2019-10-21 19:07:28 UTC +++ ui/base/ui_base_features.cc -@@ -108,7 +108,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo +@@ -112,7 +112,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) @@ -9,12 +9,12 @@ // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -118,7 +118,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -122,7 +122,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - const base::Feature kMash = {"Mash", base::FEATURE_DISABLED_BY_DEFAULT}; - + const base::Feature kFormControlsRefresh = {"FormControlsRefresh", + base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index 45097a12751c..af2165f69e31 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-06-04 18:55:49 UTC +--- ui/base/ui_base_features.h.orig 2019-10-21 19:07:28 UTC +++ ui/base/ui_base_features.h -@@ -59,10 +59,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) +@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) @@ -11,5 +11,5 @@ -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // Used to have ash (Chrome OS system UI) run in its own process. - // TODO(jamescook): Make flag only available in Chrome OS. + // Used to enable the new controls UI. + COMPONENT_EXPORT(UI_BASE_FEATURES) diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 9b27e63463b8..df1fa86b3c0d 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-03-11 22:01:19 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-09-09 21:55:46 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -828,6 +828,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -826,6 +826,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -838,6 +840,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -836,6 +838,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index b583fe1ae17a..a87a4963a81e 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/BUILD.gn.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/BUILD.gn -@@ -550,7 +550,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -573,7 +573,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } 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 9957241fa529..d0b9f18103f7 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2019-09-09 21:55:46 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -16,6 +16,10 @@ +@@ -18,6 +18,10 @@ #include "base/trace_event/trace_event.h" #include "ui/gfx/font.h" diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index 4fdc86dbf2c2..22be111486c5 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,4 +1,4 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -33,3 +33,12 @@ IPC_STRUCT_TRAITS_MEMBER(fd) #elif defined(OS_FUCHSIA) IPC_STRUCT_TRAITS_MEMBER(vmo) +@@ -80,7 +80,7 @@ IPC_STRUCT_TRAITS_END() + + IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) + IPC_STRUCT_TRAITS_MEMBER(planes) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + IPC_STRUCT_TRAITS_MEMBER(modifier) + #endif + #if defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h deleted file mode 100644 index 3ab3814e827a..000000000000 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-07-24 18:59:22 UTC -+++ ui/gfx/mojo/buffer_types_struct_traits.h -@@ -188,7 +188,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV - } - }; - --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) - template <> - struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, - gfx::NativePixmapPlane> { -@@ -232,7 +232,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData - static bool Read(gfx::mojom::NativePixmapHandleDataView data, - gfx::NativePixmapHandle* out); - }; --#endif // defined(OS_LINUX) || defined(USE_OZONE) -+#endif // defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) - - template <> - struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView, diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index a4d70a061747..a2a977047d43 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-07-24 18:59:22 UTC -+++ ui/gfx/mojo/buffer_types_struct_traits.cc +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2019-10-30 16:33:03 UTC ++++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format); } -#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) mojo::ScopedHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { @@ -37,30 +37,39 @@ return true; } -@@ -71,7 +71,7 @@ bool StructTraits< +@@ -62,7 +62,7 @@ bool StructTraits< + gfx::mojom::NativePixmapHandleDataView, + gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, + gfx::NativePixmapHandle* out) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) out->modifier = data.modifier(); + #endif + +@@ -75,7 +75,7 @@ bool StructTraits< + return data.ReadPlanes(&out->planes); } -#endif // defined(OS_LINUX) || defined(USE_OZONE) -+#endif // defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra +@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: -#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -160,7 +160,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat +@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; -#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: NATIVE_PIXMAP_HANDLE: out->type = gfx::NATIVE_PIXMAP; 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 new file mode 100644 index 000000000000..e46e05f72256 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h @@ -0,0 +1,29 @@ +--- ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2019-10-30 16:35:23 UTC ++++ ui/gfx/mojom/buffer_types_mojom_traits.h +@@ -191,7 +191,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV + } + }; + +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + template <> + struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, + gfx::NativePixmapPlane> { +@@ -217,7 +217,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData + return pixmap_handle.planes; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { + return pixmap_handle.modifier; + } +@@ -241,7 +241,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData + static bool Read(gfx::mojom::NativePixmapHandleDataView data, + gfx::NativePixmapHandle* out); + }; +-#endif // defined(OS_LINUX) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + + template <> + struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView, diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc index 23560ca8052f..7f7678a5e9b1 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -8,7 +8,7 @@ @@ -45,3 +45,12 @@ DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { +@@ -96,7 +96,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + clone.modifier = handle.modifier; + #endif + diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h index 8cbb59807966..6306e267fbeb 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,4 +1,4 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/native_pixmap_handle.h @@ -15,7 +15,7 @@ #include "build/build_config.h" @@ -27,3 +27,12 @@ // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif defined(OS_FUCHSIA) +@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle { + + std::vector<NativePixmapPlane> planes; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The modifier is retrieved from GBM library and passed to EGL driver. + // Generally it's platform specific, and we don't need to modify it in + // Chromium code. Also one per plane per entry. diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 24f52d4575ea..ccf769901898 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2019-07-24 18:59:22 UTC +--- ui/gfx/render_text.cc.orig 2019-09-09 21:55:46 UTC +++ ui/gfx/render_text.cc -@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -983,32 +983,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 4c5e25f11508..72b9e5d93a7b 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-07-24 18:59:22 UTC +--- ui/gl/BUILD.gn.orig 2019-10-21 19:07:29 UTC +++ ui/gl/BUILD.gn -@@ -215,7 +215,7 @@ jumbo_component("gl") { +@@ -219,7 +219,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 de633c85c730..bff2d801541a 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-07-24 18:59:22 UTC +--- ui/gl/generate_bindings.py.orig 2019-10-21 19:07:29 UTC +++ ui/gl/generate_bindings.py -@@ -2684,6 +2684,9 @@ GLX_FUNCTIONS = [ +@@ -2721,6 +2721,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 d1209044abe8..b20f9ea44fb1 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-07-24 18:59:22 UTC +--- ui/gl/gl_surface_glx.cc.orig 2019-09-09 21:55:47 UTC +++ ui/gl/gl_surface_glx.cc -@@ -431,7 +431,10 @@ bool GLSurfaceGLX::InitializeOneOff() { +@@ -461,7 +461,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 976ae17d1ef9..1a3714f271c0 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,9 +1,9 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-07-24 18:59:22 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-09-09 21:55:47 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -103,7 +103,7 @@ void MessagePopupView::AutoCollapse() { +@@ -106,7 +106,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.keep_on_top = true; + params.z_order = ui::ZOrderLevel::kFloatingWindow; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Make the widget explicitly activatable as TYPE_POPUP is not activatable by diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 188ebfb75cfa..af4951e7fb10 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2019-03-11 22:01:19 UTC +--- ui/native_theme/native_theme.h.orig 2019-10-21 19:07:29 UTC +++ ui/native_theme/native_theme.h -@@ -48,7 +48,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -49,7 +49,7 @@ class NATIVE_THEME_EXPORT NativeTheme { // The part to be painted / sized. enum Part { kCheckbox, 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 81633414c0a8..92f14ec28563 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,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2019-03-11 22:01:19 UTC +--- ui/native_theme/native_theme_base.cc.orig 2019-10-21 19:07:29 UTC +++ ui/native_theme/native_theme_base.cc -@@ -172,7 +172,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -177,7 +177,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: - PaintCheckbox(canvas, state, rect, extra.button); + PaintCheckbox(canvas, state, rect, extra.button, color_scheme); break; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) case kFrameTopArea: - PaintFrameTopArea(canvas, state, rect, extra.frame_top_area); - break; + PaintFrameTopArea(canvas, state, rect, extra.frame_top_area, + color_scheme); diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h new file mode 100644 index 000000000000..1734e0d6cb1b --- /dev/null +++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h @@ -0,0 +1,20 @@ +--- ui/platform_window/platform_window_delegate.h.orig 2019-10-30 16:37:03 UTC ++++ ui/platform_window/platform_window_delegate.h +@@ -9,7 +9,7 @@ + + // By default, PlatformWindowDelegateBase is used. However, different platforms + // should specify what delegate they would like to use if needed. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/platform_window/platform_window_delegate_linux.h" + #else + #include "ui/platform_window/platform_window_delegate_base.h" +@@ -17,7 +17,7 @@ + + namespace ui { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + using PlatformWindowDelegate = PlatformWindowDelegateLinux; + #else + using PlatformWindowDelegate = PlatformWindowDelegateBase; diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h new file mode 100644 index 000000000000..e35c3a93855e --- /dev/null +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -0,0 +1,11 @@ +--- ui/platform_window/platform_window_init_properties.h.orig 2019-10-30 16:37:28 UTC ++++ ui/platform_window/platform_window_init_properties.h +@@ -73,7 +73,7 @@ struct PlatformWindowInitProperties { + bool remove_standard_frame = false; + std::string workspace; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + bool prefer_dark_theme = false; + gfx::ImageSkia* icon = nullptr; + base::Optional<int> background_color; diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc index 8dd70fbd3ca6..62ab4cbdabd8 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc @@ -1,4 +1,4 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc @@ -135,7 +135,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index ca844a3bcdb8..6634a4c3e4e4 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-07-24 18:59:22 UTC +--- ui/views/controls/label.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/controls/label.cc -@@ -548,7 +548,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -691,7 +691,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,12 +9,12 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -733,7 +733,7 @@ bool Label::PasteSelectionClipboard() { +@@ -876,7 +876,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (!obscured()) { - ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (!GetObscured()) { + ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index bc17a9e94d20..d3cd68d764f7 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2019-07-24 18:59:22 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -62,7 +62,7 @@ +@@ -60,7 +60,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -165,14 +165,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -178,14 +178,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -240,7 +240,7 @@ bool IsControlKeyModifier(int flags) { +@@ -253,7 +253,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -725,7 +725,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -721,7 +721,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -771,7 +771,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -890,7 +890,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -918,7 +918,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,12 +62,12 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2109,7 +2109,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2170,7 +2170,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) + ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); 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 482362f13ba0..09f8ad21f575 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,11 +1,11 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -35,7 +35,7 @@ constexpr int kCursorOffsetY = 15; +@@ -42,7 +42,7 @@ constexpr int kVerticalPaddingBottom = 5; // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) return false; #else return true; diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index bb142c235433..88f0b3b968ac 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2019-07-24 18:59:23 UTC +--- ui/views/examples/widget_example.cc.orig 2019-09-09 21:55:47 UTC +++ ui/views/examples/widget_example.cc -@@ -80,7 +80,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); 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 ba1229bb969e..c16d73a449a2 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,15 +1,15 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-06-04 18:55:50 UTC +--- 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 -@@ -102,7 +102,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea - const Widget::InitParams& params) { - native_widget_delegate_->OnNativeWidgetCreated(); +@@ -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_); -@@ -552,7 +552,7 @@ void DesktopWindowTreeHostPlatform::Relayout() { +@@ -668,7 +668,7 @@ void DesktopWindowTreeHostPlatform::Relayout() { } void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() { 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 index 5cd4277bdb55..67bec7b41caf 100644 --- 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 @@ -1,8 +1,8 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-03-17 17:59:02 UTC +--- 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 -@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform +@@ -146,7 +146,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform - bool is_active_ = false; + base::string16 window_title_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc deleted file mode 100644 index 689d8e6d8f89..000000000000 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-07-24 18:59:23 UTC -+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -1463,24 +1463,15 @@ void DesktopWindowTreeHostX11::InitX11Window( - if (override_redirect_) - attribute_mask |= CWOverrideRedirect; - -- bool enable_transparent_visuals; -- switch (params.opacity) { -- case Widget::InitParams::OPAQUE_WINDOW: -- enable_transparent_visuals = false; -- break; -- case Widget::InitParams::TRANSLUCENT_WINDOW: -- enable_transparent_visuals = true; -- break; -- case Widget::InitParams::INFER_OPACITY: -- default: -- enable_transparent_visuals = params.type == Widget::InitParams::TYPE_DRAG; -- } -- - Visual* visual = CopyFromParent; - int depth = CopyFromParent; - Colormap colormap = CopyFromParent; -+ -+ // GLSurfaceGLX always create child window with alpha channel. If the parent -+ // window doesn't have alpha channel, it causes flash, so always request argb -+ // visual. - ui::XVisualManager::GetInstance()->ChooseVisualForWindow( -- enable_transparent_visuals, &visual, &depth, &colormap, -+ true /* want_argb_visual */, &visual, &depth, &colormap, - &use_argb_visual_); - - if (colormap != CopyFromParent) { diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 0cd3458e5585..4c35d22da5da 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2019-07-24 18:59:23 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-09-09 21:55:47 UTC +++ ui/views/window/custom_frame_view.cc -@@ -291,7 +291,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index e766577599e6..084818970472 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/window/dialog_delegate.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/window/dialog_delegate.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/window/dialog_delegate.cc -@@ -61,7 +61,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit - params.bounds = bounds; - DialogDelegate* dialog = delegate->AsDialogDelegate(); +@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg + // static + bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // The new style doesn't support unparented dialogs on Linux desktop. - if (dialog) - dialog->supports_custom_frame_ &= parent != nullptr; + return parent != nullptr; + #elif defined(OS_WIN) 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 c9f8d9db27d3..4863df7f9ff1 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2019-07-24 18:59:23 UTC +--- ui/webui/resources/js/cr.js.orig 2019-09-09 21:55:47 UTC +++ ui/webui/resources/js/cr.js -@@ -425,6 +425,11 @@ var cr = cr || function(global) { +@@ -436,6 +436,11 @@ var cr = cr || function(global) { get doc() { return document; }, diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js index e102e257ce76..26d3260b5cff 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_icon.js +++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/icon.js.orig 2019-03-11 22:01:19 UTC +--- ui/webui/resources/js/icon.js.orig 2019-10-21 19:07:29 UTC +++ ui/webui/resources/js/icon.js -@@ -14,7 +14,7 @@ cr.define('cr.icon', function() { +@@ -16,7 +16,7 @@ cr.define('cr.icon', function() { // supports SCALE_FACTOR_100P on all non-iOS platforms. supportedScaleFactors.push(1); } diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 64c843a118be..1937050df23b 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-07-24 19:03:36 UTC +--- v8/BUILD.gn.orig 2019-10-21 19:09:21 UTC +++ v8/BUILD.gn -@@ -3541,7 +3541,7 @@ v8_component("v8_libbase") { +@@ -3588,7 +3588,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3561,6 +3561,12 @@ v8_component("v8_libbase") { +@@ -3608,6 +3608,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3818,6 +3824,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho +@@ -3859,6 +3865,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho "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 cb9ebbb0233d..1bc69f9f39a1 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2019-07-24 19:03:36 UTC +--- v8/src/api/api.cc.orig 2019-10-21 19:09:21 UTC +++ v8/src/api/api.cc -@@ -110,7 +110,7 @@ +@@ -111,7 +111,7 @@ #include "src/wasm/wasm-result.h" #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include "include/v8-wasm-trap-handler-posix.h" #include "src/trap-handler/handler-inside-posix.h" -@@ -5505,7 +5505,7 @@ bool v8::V8::Initialize() { +@@ -5573,7 +5573,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 51d27e4e68ff..305b5e884007 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-06-04 18:58:07 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2019-09-09 21:57:07 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -376,7 +376,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -382,7 +382,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. -@@ -507,6 +507,12 @@ int OS::GetCurrentThreadId() { +@@ -513,6 +513,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 new file mode 100644 index 000000000000..619139191cab --- /dev/null +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -0,0 +1,20 @@ +--- weblayer/browser/browser_main_parts_impl.cc.orig 2019-10-30 16:40:04 UTC ++++ weblayer/browser/browser_main_parts_impl.cc +@@ -34,7 +34,7 @@ + #if defined(USE_AURA) && defined(USE_X11) + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck + #endif +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/base/ime/init/input_method_initializer.h" + #endif + +@@ -70,7 +70,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { + #if defined(USE_X11) + ui::SetDefaultX11ErrorHandlers(); + #endif +-#if defined(USE_AURA) && defined(OS_LINUX) ++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + ui::InitializeInputMethodForTesting(); + #endif + #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-weblayer_shell_app_shell__main.cc b/www/chromium/files/patch-weblayer_shell_app_shell__main.cc new file mode 100644 index 000000000000..4aea81d575c7 --- /dev/null +++ b/www/chromium/files/patch-weblayer_shell_app_shell__main.cc @@ -0,0 +1,20 @@ +--- 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/files/sndio_output.cc b/www/chromium/files/sndio_output.cc index fd299a845bfc..a6719f9aac8d 100644 --- a/www/chromium/files/sndio_output.cc +++ b/www/chromium/files/sndio_output.cc @@ -58,7 +58,7 @@ bool SndioAudioOutputStream::Open() { sio_initpar(&par); par.rate = params.sample_rate(); par.pchan = params.channels(); - par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); par.bps = par.bits / 8; par.sig = sig = par.bits != 8 ? 1 : 0; par.le = SIO_LE_NATIVE; diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 686431396b49..6501cc031ea0 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -8,11 +8,6 @@ bin/chrome %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libVkICD_mock_icd.so -%%DATADIR%%/libVkLayer_core_validation.so -%%DATADIR%%/libVkLayer_object_lifetimes.so -%%DATADIR%%/libVkLayer_stateless_validation.so -%%DATADIR%%/libVkLayer_thread_safety.so -%%DATADIR%%/libVkLayer_unique_objects.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak @@ -132,11 +127,11 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png %%DATADIR%%/resources/inspector/Images/audits_logo.svg -%%DATADIR%%/resources/inspector/Images/breakpoint.png -%%DATADIR%%/resources/inspector/Images/breakpointConditional.png -%%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png -%%DATADIR%%/resources/inspector/Images/breakpoint_2x.png +%%DATADIR%%/resources/inspector/Images/breakpoint.svg +%%DATADIR%%/resources/inspector/Images/breakpointConditional.svg +%%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg %%DATADIR%%/resources/inspector/Images/checker.png +%%DATADIR%%/resources/inspector/Images/chevrons.svg %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png %%DATADIR%%/resources/inspector/Images/chromeLeft.png @@ -144,14 +139,11 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png -%%DATADIR%%/resources/inspector/Images/errorWave.png -%%DATADIR%%/resources/inspector/Images/errorWave_2x.png +%%DATADIR%%/resources/inspector/Images/errorWave.svg %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg -%%DATADIR%%/resources/inspector/Images/largeIcons.png -%%DATADIR%%/resources/inspector/Images/largeIcons_2x.png -%%DATADIR%%/resources/inspector/Images/mediumIcons.png -%%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png +%%DATADIR%%/resources/inspector/Images/largeIcons.svg +%%DATADIR%%/resources/inspector/Images/mediumIcons.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/nodeIcon.png @@ -175,16 +167,13 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png -%%DATADIR%%/resources/inspector/Images/securityIcons.png -%%DATADIR%%/resources/inspector/Images/securityIcons_2x.png -%%DATADIR%%/resources/inspector/Images/smallIcons.png -%%DATADIR%%/resources/inspector/Images/smallIcons_2x.png +%%DATADIR%%/resources/inspector/Images/securityIcons.svg +%%DATADIR%%/resources/inspector/Images/smallIcons.svg %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png -%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png -%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png +%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg %%DATADIR%%/resources/inspector/Images/whatsnew.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js @@ -194,10 +183,10 @@ bin/chrome %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js -%%DATADIR%%/resources/inspector/audits2/audits2_module.js -%%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js -%%DATADIR%%/resources/inspector/audits2_worker.js -%%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js +%%DATADIR%%/resources/inspector/audits/audits_module.js +%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js +%%DATADIR%%/resources/inspector/audits_worker.js +%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js %%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/browser_debugger/browser_debugger_module.js @@ -322,6 +311,11 @@ bin/chrome %%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%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so |