diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-08-12 10:39:48 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-08-12 10:39:48 +0000 |
| commit | 4931d3869a6dd44297e7062d19250b953725dca9 (patch) | |
| tree | ce003d403a39427dd9d741e17935752ff90aa5a6 /www | |
| parent | cb31f1a63f19104a3fae0c9cd4c02b391be40888 (diff) | |
| download | freebsd-ports-4931d3869a6dd44297e7062d19250b953725dca9.zip | |
www/chromium: Update to 76.0.3809.100
Changelog: https://chromium.googlesource.com/chromium/src/+log/75.0.3770.142..76.0.3809.100?pretty=fuller&n=10000
Submitted by: Matthias Wolf <matthias@rheinwolf.de>
MFH: 2019Q3
Diffstat (limited to 'www')
264 files changed, 1689 insertions, 1525 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 59ab3b15a925..c0d5b3878650 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 75.0.3770.142 -PORTREVISION= 3 +PORTVERSION= 76.0.3809.100 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -315,8 +314,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} - # ANGLE -.for f in libEGL.so libGLESv2.so + # 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 ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 7135b0291ccc..7e4f361934c3 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1563322422 -SHA256 (chromium-75.0.3770.142.tar.xz) = 510e6ca7ccc218b401b375c13656f6aecab196b03142026dc3602b9d1804a5ac -SIZE (chromium-75.0.3770.142.tar.xz) = 709968204 -SHA256 (chromium-75.0.3770.142-testdata.tar.xz) = 4a5736d686d4081c2e550089691670d81959a5e7d8f9c02ad973e797390da476 -SIZE (chromium-75.0.3770.142-testdata.tar.xz) = 352138048 +TIMESTAMP = 1565536681 +SHA256 (chromium-76.0.3809.100.tar.xz) = 8cd93ada3e0837ced512f69783400991d3b82e0d9622e04fab5922877577d26d +SIZE (chromium-76.0.3809.100.tar.xz) = 728852892 +SHA256 (chromium-76.0.3809.100-testdata.tar.xz) = 95eed86c25e75b9b8cb611a3a63debb0d9243e2e314ffe121890a80c5446954f +SIZE (chromium-76.0.3809.100-testdata.tar.xz) = 262859232 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 cd9926e30c92..fd5cd8f923c5 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-06-04 18:55:14 UTC +--- BUILD.gn.orig 2019-07-24 18:58:00 UTC +++ BUILD.gn -@@ -385,7 +385,7 @@ group("gn_all") { +@@ -386,7 +386,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -426,8 +426,6 @@ group("gn_all") { +@@ -427,8 +427,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -482,10 +480,6 @@ group("gn_all") { +@@ -483,10 +481,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", -@@ -540,10 +534,6 @@ group("gn_all") { +@@ -541,10 +535,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -618,7 +608,7 @@ group("gn_all") { +@@ -619,7 +609,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)" ] } -@@ -757,7 +747,6 @@ group("gn_all") { +@@ -758,7 +748,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" ] -@@ -876,7 +865,6 @@ if (is_chromeos) { +@@ -877,7 +866,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", -@@ -1029,7 +1017,7 @@ if (!is_ios) { +@@ -1033,7 +1021,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1038,7 +1026,7 @@ if (!is_ios) { +@@ -1042,7 +1030,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)" ] } -@@ -1181,9 +1169,6 @@ group("chromium_builder_perf") { +@@ -1185,9 +1173,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 30a152076cec..8975b8222992 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-06-04 18:55:15 UTC +--- base/BUILD.gn.orig 2019-07-24 18:58:01 UTC +++ base/BUILD.gn -@@ -1234,7 +1234,7 @@ jumbo_component("base") { +@@ -1258,7 +1258,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" ] } -@@ -1260,7 +1260,7 @@ jumbo_component("base") { +@@ -1284,7 +1284,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 += [ -@@ -1813,6 +1813,33 @@ jumbo_component("base") { +@@ -1862,6 +1862,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2910,6 +2937,12 @@ test("base_unittests") { +@@ -2999,6 +3026,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 24588a8948d6..1b79f69c285b 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-04-30 22:22:27 UTC +--- base/allocator/allocator_shim.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim.cc -@@ -69,7 +69,7 @@ inline const base::allocator::AllocatorDispatch* GetCh +@@ -70,7 +70,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_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index af63d279da53..947e49a1167c 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,15 +1,14 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -3,19 +3,28 @@ - // found in the LICENSE file. - +@@ -5,18 +5,28 @@ #include "base/allocator/allocator_shim.h" + + #include <dlfcn.h> +-#include <malloc.h> +#include <stdio.h> +#include <stdlib.h> +#include <malloc_np.h> --#include <malloc.h> -- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. @@ -23,13 +22,13 @@ -void __libc_free(void* ptr); +void* __malloc(size_t size); +void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t size); ++void* __realloc(void* address, size_t len); +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} +int __posix_memalign(void **ptr, size_t alignment, size_t size); @@ -37,7 +36,7 @@ } // extern "C" namespace { -@@ -23,32 +32,32 @@ namespace { +@@ -24,32 +34,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { 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 ec542f9bb84e..fab5ea393ea6 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,7 +1,7 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:55:15 UTC +--- 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 -@@ -14,7 +14,7 @@ - #if defined(OS_MACOSX) +@@ -16,7 +16,7 @@ + #include <mach/mach.h> #endif -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc new file mode 100644 index 000000000000..27fbdf9baac7 --- /dev/null +++ b/www/chromium/files/patch-base_base__switches.cc @@ -0,0 +1,20 @@ +--- base/base_switches.cc.orig 2019-07-29 16:52:17 UTC ++++ base/base_switches.cc +@@ -107,7 +107,7 @@ const char kProfilingFlush[] = "profiling-flush"; + const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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[] = + const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Controls whether or not retired instruction counts are surfaced for threads + // in trace events on Linux. + // diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h new file mode 100644 index 000000000000..395a39f3ec35 --- /dev/null +++ b/www/chromium/files/patch-base_base__switches.h @@ -0,0 +1,20 @@ +--- base/base_switches.h.orig 2019-07-29 18:05:10 UTC ++++ base/base_switches.h +@@ -36,7 +36,7 @@ extern const char kWaitForDebugger[]; + extern const char kDisableUsbKeyboardDetect[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kDisableDevShmUsage[]; + #endif + +@@ -49,7 +49,7 @@ extern const char kEnableReachedCodeProfiler[]; + extern const char kOrderfileMemoryOptimization[]; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kEnableThreadInstructionCount[]; + #endif + diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc new file mode 100644 index 000000000000..b56fe344b0ce --- /dev/null +++ b/www/chromium/files/patch-base_cpu.cc @@ -0,0 +1,38 @@ +--- base/cpu.cc.orig 2019-07-29 18:05:46 UTC ++++ base/cpu.cc +@@ -15,7 +15,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) { + + #endif // ARCH_CPU_X86_FAMILY + +-#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)) + 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() { + return brand; + } + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || +- // defined(OS_LINUX)) ++ // defined(OS_LINUX) || defined(OS_BSD)) + + } // namespace + +@@ -252,7 +252,7 @@ void CPU::Initialize() { + } + } + #elif defined(ARCH_CPU_ARM_FAMILY) +-#if (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in diff --git a/www/chromium/files/patch-base_files_file__path__watcher.cc b/www/chromium/files/patch-base_files_file__path__watcher.cc new file mode 100644 index 000000000000..8617c587be43 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher.cc @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.cc.orig 2019-07-29 18:12:09 UTC ++++ base/files/file_path_watcher.cc +@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() { + // static + bool FilePathWatcher::RecursiveWatchAvailable() { + #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + return true; + #else + // FSEvents isn't available on iOS. diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 36ade4d74565..1b4fa7fe3db9 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-06-04 18:55:15 UTC +--- base/files/file_util.h.orig 2019-07-24 18:58:02 UTC +++ base/files/file_util.h -@@ -467,7 +467,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -476,7 +476,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_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc new file mode 100644 index 000000000000..84ba47ff6aeb --- /dev/null +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -0,0 +1,11 @@ +--- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC ++++ base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 80e0544ed35b..ba2c42de3a2d 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/i18n/icu_util.cc.orig 2019-07-24 18:58:02 UTC +++ base/i18n/icu_util.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -315,7 +315,7 @@ bool InitializeICU() { +@@ -285,7 +285,7 @@ bool InitializeICU() { // TODO(jungshik): Some callers do not care about tz at all. If necessary, // add a boolean argument to this function to init'd the default tz only // when requested. diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 7f2f83724dfe..38cca84921cc 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-04-30 22:22:28 UTC +--- base/logging_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/logging_unittest.cc -@@ -421,7 +421,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -444,7 +444,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 9f7731d5b8ec..8e47c5106248 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,5 +1,23 @@ ---- base/process/process_metrics.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const + std::unique_ptr<DictionaryValue> res(new DictionaryValue()); + + res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); + std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 1b3e36d74918..c27ece03d2f6 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-04-30 22:22:28 UTC +--- base/process/process_metrics.h.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -62,15 +62,15 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -292,7 +292,7 @@ BASE_EXPORT size_t GetMaxFds(); + BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) || 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 { int avail_phys = 0; #endif @@ -80,30 +80,31 @@ // 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 -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -340,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int swap_free = 0; #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) int buffers = 0; int cached = 0; - int active_anon = 0; -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int inactive_file = 0; int dirty = 0; int reclaimable = 0; - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -- // defined(OS_FUCHSIA) -+ // defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || + // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) - int shmem = 0; -@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -376,10 +376,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) @@ -119,3 +120,12 @@ #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. +@@ -547,7 +547,7 @@ class BASE_EXPORT SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index c75d66fbff8a..1dc5323f3252 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics_freebsd.cc @@ -5,6 +5,7 @@ #include "base/process/process_metrics.h" @@ -8,7 +8,7 @@ #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -14,11 +15,15 @@ +@@ -14,11 +15,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -18,7 +18,21 @@ +#include <libutil.h> + namespace base { ++namespace { ++int GetPageShift() { ++ int pagesize = getpagesize(); ++ int pageshift = 0; ++ ++ while (pagesize > 1) { ++ pageshift++; ++ pagesize >>= 1; ++ } ++ ++ return pageshift; ++} ++} ++ ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -26,7 +40,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -110,13 +124,136 @@ + return total_count; +} + ++size_t ProcessMetrics::GetResidentSetSize() const { ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t rss; ++ ++ if (nproc > 0) { ++ rss = pp->ki_rssize << GetPageShift(); ++ } else { ++ rss = 0; ++ } ++ ++ kvm_close(kd); ++ return rss; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ NOTIMPLEMENTED(); -+ return 0; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t swrss; ++ ++ if (nproc > 0) { ++ swrss = pp->ki_swrss > pp->ki_rssize ++ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() ++ : 0; ++ } else { ++ swrss = 0; ++ } ++ ++ kvm_close(kd); ++ return swrss; +} + +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; +} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr<Value> SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast<double>(reads)); ++ res->SetDouble("reads_merged", static_cast<double>(reads_merged)); ++ res->SetDouble("sectors_read", static_cast<double>(sectors_read)); ++ res->SetDouble("read_time", static_cast<double>(read_time)); ++ res->SetDouble("writes", static_cast<double>(writes)); ++ res->SetDouble("writes_merged", static_cast<double>(writes_merged)); ++ res->SetDouble("sectors_written", static_cast<double>(sectors_written)); ++ res->SetDouble("write_time", static_cast<double>(write_time)); ++ res->SetDouble("io", static_cast<double>(io)); ++ res->SetDouble("io_time", static_cast<double>(io_time)); ++ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ res->SetIntKey("total", total); ++ res->SetIntKey("free", free); ++ res->SetIntKey("available", available); ++ res->SetIntKey("buffers", buffers); ++ res->SetIntKey("cached", cached); ++ res->SetIntKey("active_anon", active_anon); ++ res->SetIntKey("inactive_anon", inactive_anon); ++ res->SetIntKey("active_file", active_file); ++ res->SetIntKey("inactive_file", inactive_file); ++ res->SetIntKey("swap_total", swap_total); ++ res->SetIntKey("swap_free", swap_free); ++ res->SetIntKey("swap_used", swap_total - swap_free); ++ res->SetIntKey("dirty", dirty); ++ res->SetIntKey("reclaimable", reclaimable); ++ ++ return res; ++} ++ ++std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ res->SetIntKey("pswpin", pswpin); ++ res->SetIntKey("pswpout", pswpout); ++ res->SetIntKey("pgmajfault", pgmajfault); ++ return res; ++} } // namespace base diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 3c21942cb31d..686f7e90afb3 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> 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 d7f1525e19ab..d383e54560b5 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,5 +1,5 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-06-13 09:11:51.000000000 +0200 -+++ base/sampling_heap_profiler/sampling_heap_profiler.cc 2019-06-14 21:28:04.089347000 +0200 +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-07-24 18:58:02 UTC ++++ base/sampling_heap_profiler/sampling_heap_profiler.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> #endif @@ -11,12 +11,12 @@ #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 @@ +@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { #elif defined(OS_MACOSX) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') + return strdup(name); -+#elif defined(OS_BSD) && defined(HAVE_PTHREAD_GET_NAME_NP) ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') return strdup(name); 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 84ab212f4877..80aa7d04fcf7 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info_posix.cc.orig 2019-04-30 22:22:28 UTC +--- base/system/sys_info_posix.cc.orig 2019-07-24 18:58:02 UTC +++ base/system/sys_info_posix.cc @@ -38,7 +38,7 @@ namespace { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !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. @@ -14,7 +14,7 @@ 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_BSD) && !defined(OS_FUCHSIA) ++#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) #if !defined(OS_FUCHSIA) int64_t AmountOfVirtualMemory() { @@ -23,7 +23,7 @@ namespace base { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc new file mode 100644 index 000000000000..92b120193ada --- /dev/null +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -14,7 +14,7 @@ namespace internal { + TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_NACL) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index f8a797d22050..ed3ac8500b58 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-06-04 18:55:15 UTC +--- build/config/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ build/config/BUILD.gn -@@ -163,7 +163,7 @@ config("debug") { +@@ -161,7 +161,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? -@@ -264,9 +264,7 @@ config("default_libs") { +@@ -259,9 +259,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -354,7 +352,7 @@ config("executable_config") { +@@ -349,7 +347,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_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index d6840799fa79..a2f56038a0c5 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/compiler/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ build/config/compiler/BUILD.gn @@ -54,7 +54,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -740,7 +740,7 @@ config("compiler_cpu_abi") { +@@ -741,7 +741,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,16 +45,16 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1174,7 +1174,7 @@ config("assembler_debug_dir") { - # TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move - # this behind the -fdebug-compilation-dir cflags in the "compiler" config. - if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) { +@@ -1102,7 +1102,7 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1490,7 +1490,7 @@ config("default_warnings") { +@@ -1492,7 +1492,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 += [ -@@ -1699,7 +1699,7 @@ config("thin_archive") { +@@ -1701,7 +1701,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" ] -@@ -2286,7 +2286,7 @@ config("symbols") { +@@ -2288,7 +2288,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) { -@@ -2307,7 +2307,7 @@ config("symbols") { +@@ -2309,7 +2309,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 c6cc835cc9b1..e2e1b41576e9 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-04-30 22:22:28 UTC +--- build/config/compiler/compiler.gni.orig 2019-07-24 18:58:02 UTC +++ build/config/compiler/compiler.gni -@@ -181,7 +181,7 @@ declare_args() { +@@ -179,7 +179,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_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index bac7de0165ef..8a2865a024c0 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,7 +1,7 @@ ---- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +++ build/config/linux/pkg-config.py -@@ -57,8 +57,12 @@ def SetConfigPath(options): - print "You must specify an architecture via -a if using a sysroot." +@@ -59,8 +59,12 @@ def SetConfigPath(options): + print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) - libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' @@ -15,12 +15,12 @@ os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ def main(): +@@ -109,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if "linux" not in sys.platform: + if "bsd" not in sys.platform: - print "[[],[],[],[],[]]" + print("[[],[],[],[],[]]") return 0 diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py index 92310f8e043a..588896662607 100644 --- a/www/chromium/files/patch-build_detect__host__arch.py +++ b/www/chromium/files/patch-build_detect__host__arch.py @@ -1,6 +1,6 @@ ---- build/detect_host_arch.py.orig 2019-04-30 22:22:28 UTC +--- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC +++ build/detect_host_arch.py -@@ -19,6 +19,8 @@ def HostArch(): +@@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: host_arch = 'x64' diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py index 2b7f4a526104..d9e733834b4a 100644 --- a/www/chromium/files/patch-build_gn__run__binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC +--- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +++ build/gn_run_binary.py -@@ -22,7 +22,7 @@ if not os.path.isabs(path): +@@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 757c9fc0091c..1997ef8dff45 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-06-04 18:55:15 UTC +--- cc/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ cc/BUILD.gn -@@ -562,7 +562,7 @@ cc_test_static_library("test_support") { +@@ -566,7 +566,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers", ] -@@ -762,9 +762,6 @@ cc_test("cc_unittests") { +@@ -767,9 +767,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", diff --git a/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc b/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc deleted file mode 100644 index 83074373b430..000000000000 --- a/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/scheduler/compositor_frame_reporting_controller.cc.orig 2019-06-04 18:55:15 UTC -+++ cc/scheduler/compositor_frame_reporting_controller.cc -@@ -31,8 +31,6 @@ void CompositorFrameReportingController::WillBeginImpl - - void CompositorFrameReportingController::WillBeginMainFrame() { - DCHECK(reporters_[PipelineStage::kBeginImplFrame]); -- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame], -- reporters_[PipelineStage::kBeginImplFrame]); - reporters_[PipelineStage::kBeginImplFrame]->StartStage( - "SendBeginMainFrameToCommit"); - AdvanceReporterStage(PipelineStage::kBeginImplFrame, diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 4d7ff2e198ea..9d83c161e7f2 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-06-04 18:55:15 UTC +--- cc/trees/property_tree.cc.orig 2019-07-24 18:58:03 UTC +++ cc/trees/property_tree.cc -@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1348,13 +1348,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 new file mode 100644 index 000000000000..66e8f3488ba2 --- /dev/null +++ b/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc @@ -0,0 +1,20 @@ +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-07-29 18:39:15 UTC ++++ chrome/app/chrome_content_browser_overlay_manifest.cc +@@ -79,7 +79,7 @@ + #include "chrome/services/app_service/public/cpp/manifest.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck + #include "chrome/browser/ui/webui/discards/discards.mojom.h" +@@ -240,7 +240,7 @@ const service_manager::Manifest& GetChromeContentBrows + #else + app_management::mojom::PageHandlerFactory, + #endif +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + mojom::DiscardsDetailsProvider, + performance_manager::mojom::WebUIGraphDump, 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 c9dd9ec6af2c..09e9d2b6256a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chrome_main_delegate.cc @@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -240,7 +240,7 @@ bool UseHooks() { +@@ -241,7 +241,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -300,7 +300,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +36,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -345,7 +345,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -45,7 +45,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -355,7 +355,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +54,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -409,7 +409,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,7 +63,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -421,7 +421,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +72,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { +@@ -478,7 +478,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 +81,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -650,7 +650,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +90,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -674,7 +674,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +99,16 @@ nacl::RegisterPathProvider(); #endif -@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -868,7 +868,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_WIN) + child_process_logging::Init(); + #endif +-#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)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -108,7 +117,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -117,7 +126,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -990,7 +990,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1021,7 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index cd8c13d14780..4ddacbbdf526 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-06-04 18:55:16 UTC +--- chrome/app/chromium_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chromium_strings.grd -@@ -710,7 +710,7 @@ Signing in anyway will merge Chromium information like +@@ -690,7 +690,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> -@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like +@@ -815,7 +815,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> -@@ -1098,7 +1098,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -1074,7 +1074,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 </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 93359b5b8b36..5932184926e2 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-06-04 18:55:16 UTC +--- chrome/app/generated_resources.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/generated_resources.grd -@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t +@@ -4805,7 +4805,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> -@@ -6304,7 +6304,7 @@ the Bookmarks menu."> +@@ -6370,7 +6370,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> -@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7223,7 +7223,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 fc279b57b18c..401aa915e93b 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-06-04 18:55:16 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/google_chrome_strings.grd -@@ -722,7 +722,7 @@ Signing in anyway will merge Chrome information like b +@@ -702,7 +702,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> -@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b +@@ -827,7 +827,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> -@@ -1117,7 +1117,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -1093,7 +1093,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 </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 6187a7c8ff9a..4d47e4f9413f 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-06-04 18:55:16 UTC +--- chrome/app/settings_strings.grdp.orig 2019-07-24 18:58:07 UTC +++ chrome/app/settings_strings.grdp -@@ -634,7 +634,7 @@ +@@ -653,7 +653,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> -@@ -648,7 +648,7 @@ +@@ -667,7 +667,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 d8702ebfc748..b13926ff0562 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,5 +1,14 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-07-24 18:58:07 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" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <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 @@ <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" /> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index ad12e08163e9..bde5ef133453 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,42 @@ ---- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/about_flags.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/about_flags.cc -@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -621,7 +621,7 @@ const FeatureEntry::FeatureVariation + nullptr}}; + #endif // 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) + const FeatureEntry::FeatureParam + kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { + {autofill::features:: +@@ -668,7 +668,7 @@ const FeatureEntry::FeatureVariation + kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), + nullptr}, + }; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const FeatureEntry::Choice kMemlogModeChoices[] = { + {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, +@@ -776,7 +776,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), + nullptr}}; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { + {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; +@@ -792,7 +792,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[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -16,31 +52,33 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableDataSaverLiteModeRebrandName, - flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll, - FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)}, +@@ -1614,14 +1614,14 @@ const FeatureEntry kFeatureEntries[] = { + "OverrideTranslateTriggerInIndia")}, + #endif // OS_ANDROID + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, + flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUI, + kTranslateBubbleUIVariations, + "UseButtonTranslateBubbleUI")}, +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) + {"enable-native-notifications", +@@ -1762,7 +1762,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + previews::features::kHTTPSServerPreviewsUsingURLLoader)}, + #endif // OS_ANDROID -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = { - {"force-text-direction", flag_descriptions::kForceTextDirectionName, - flag_descriptions::kForceTextDirectionDescription, kOsAll, - MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, - flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-brotli", flag_descriptions::kEnableBrotliName, - flag_descriptions::kEnableBrotliDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, -@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2091,12 +2091,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID @@ -55,7 +93,7 @@ {"enable-experimental-accessibility-features", flag_descriptions::kExperimentalAccessibilityFeaturesName, flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2423,7 +2423,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, @@ -64,7 +102,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2470,7 +2470,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxDeduplicateDriveUrlsName, flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)}, @@ -73,7 +111,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2696,7 +2696,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -82,7 +120,7 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2707,7 +2707,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kShowManagedUiDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(features::kShowManagedUi)}, @@ -90,8 +128,8 @@ +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) - {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName, -@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = { + {"chrome-colors", flag_descriptions::kChromeColorsName, +@@ -3514,7 +3514,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) @@ -100,7 +138,7 @@ {"autofill-always-show-server-cards-in-sync-transport", flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, flag_descriptions:: -@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3522,7 +3522,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsLinux, FEATURE_VALUE_TYPE( autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, @@ -109,7 +147,7 @@ #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) {"enable-custom-mac-paper-sizes", -@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3562,13 +3562,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, #endif // OS_CHROMEOS @@ -125,3 +163,21 @@ #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 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")}, +-#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, diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index c59df4a0b8de..20f0448c3605 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -29,7 +29,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_contents_observer.h" +@@ -32,7 +32,7 @@ + #include "chrome/browser/ui/tabs/tab_strip_model.h" + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -126,7 +126,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { +@@ -135,7 +135,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index f2961c2c6c96..099e3d8e0ffe 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,15 +1,15 @@ ---- chrome/browser/browser_resources.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/browser_resources.grd.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/browser_resources.grd @@ -77,7 +77,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}\services\resource_coordinator\public\mojom\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> + <include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\performance_manager\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> </if> - <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> + <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> - <include name="IDR_BROWSER_SWITCHER_APP_HTML" file="resources\browser_switcher\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCHER_APP_JS" file="resources\browser_switcher\app.js" compress="gzip" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCHER_BROWSER_SWITCHER_PROXY_HTML" file="resources\browser_switcher\browser_switcher_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> -@@ -690,7 +690,7 @@ + <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" /> </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" /> 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 0e1d75e4a9f5..b7710c4836b2 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-06-04 18:55:16 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -218,9 +218,9 @@ +@@ -220,9 +220,9 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -12,16 +12,16 @@ #if defined(OS_LINUX) #include "components/crash/content/app/breakpad_linux.h" -@@ -258,7 +258,7 @@ +@@ -260,7 +260,7 @@ #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)) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif - -@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1079,7 +1079,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 . -@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1088,14 +1088,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -48,16 +48,16 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); + ProfileActivityMetricsRecorder::Initialize(); #endif - metrics::RendererUptimeTracker::Initialize(); -@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1291,6 +1291,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -65,7 +65,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); BrowserThread::PostAfterStartupTask( -@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1299,6 +1300,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 499684621100..7cf047cf157e 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,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -418,7 +418,7 @@ +@@ -429,7 +429,7 @@ + #include "chromeos/services/secure_channel/secure_channel_service.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" - #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -467,7 +467,7 @@ +@@ -484,7 +484,7 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,34 +18,34 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -493,7 +493,7 @@ +@@ -510,7 +510,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" - #endif - -@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #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( #elif defined(OS_CHROMEOS) - main_parts = - new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_); + main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( + parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_); + main_parts = + std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) - main_parts = new ChromeBrowserMainPartsAndroid(parameters, startup_data_); -@@ -1213,7 +1213,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1276,7 +1276,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -2034,7 +2034,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2093,7 +2093,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2318,7 +2318,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + 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 } } @@ -63,7 +72,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4362,7 +4362,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -72,7 +81,7 @@ std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: MaybeCreateThrottleFor(handle); -@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco +@@ -5205,7 +5205,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco std::unique_ptr<content::OverlayWindow> ChromeContentBrowserClient::CreateWindowForPictureInPicture( content::PictureInPictureWindowController* controller) { 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 e7c2a696aeb7..d5c03fb8c2ca 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-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -380,12 +380,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 40a80672911b..638aab69b6b6 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-06-04 18:55:17 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1228,7 +1228,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1237,7 +1237,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 -@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1267,7 +1267,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 4f4c08e05c87..1eaffe80ffc5 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,15 +1,24 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.cc -@@ -159,7 +159,7 @@ Browser* DownloadCommands::GetBrowser() const { - return browser_displayer.browser(); +@@ -30,7 +30,7 @@ + #include "net/base/url_util.h" + #include "ui/base/clipboard/scoped_clipboard_writer.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" +@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command) + model_->ExecuteCommand(this, command); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = model_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -176,7 +176,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons + + Browser* DownloadCommands::GetBrowser() const { + chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); +@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); @@ -18,3 +27,9 @@ return IsDownloadPdf(); #endif } + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + void DownloadCommands::CopyFileAsImageToClipboard() { + if (model_->GetState() != download::DownloadItem::COMPLETE || diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index ad92f02380b9..e0c3482b0ebc 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,7 @@ class DownloadCommands { +@@ -45,7 +45,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); @@ -8,4 +8,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - #endif + Browser* GetBrowser() const; 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 48d6fd2a1ade..b4cd9485a2c8 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-03-11 22:00:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_item_model.cc -@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -560,7 +560,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(); -@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -597,7 +597,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 0ae2b1b84f85..42d115e10c9c 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-06-04 18:55:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") { +@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 64894bbb4afd..bb8e332d5c7b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:53 UTC +--- 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 @@ -54,7 +54,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -92,7 +92,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 b5596df7d97d..0f8d49f35598 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-04-30 22:22:33 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -753,7 +753,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -755,7 +755,7 @@ void ExternalProviderImpl::CreateExternalProviders( chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -780,7 +780,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -782,7 +782,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h new file mode 100644 index 000000000000..c079a7eac3e3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -0,0 +1,11 @@ +--- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC ++++ chrome/browser/first_run/first_run_dialog.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + // Hide this function on platforms where the dialog does not exist. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + class Profile; + diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h new file mode 100644 index 000000000000..5b60fc717be9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -0,0 +1,18 @@ +--- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC ++++ chrome/browser/first_run/first_run_internal.h +@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); + +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For testing, forces the first run dialog to either be shown or not. If not + // called, the decision to show the dialog or not will be made by Chrome based + // on a number of factors (such as install type, whether it's a Chrome-branded + // build, etc). + void ForceFirstRunDialogShownForTesting(bool shown); +-#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace internal + } // namespace first_run diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index ded61fdbd3ca..46fcefffd808 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,19 +1,9 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] = +@@ -3256,21 +3256,21 @@ const char kInstallableInkDropDescription[] = // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - const char kEnableInputImeApiName[] = "Enable Input IME API"; - const char kEnableInputImeApiDescription[] = - "Enable the use of chrome.input.ime API."; - --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 9089bc1a0c0b..6a9b4fcdd4c6 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,18 +1,9 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.h -@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[]; +@@ -1963,19 +1963,19 @@ extern const char kInstallableInkDropDescription[]; // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - extern const char kEnableInputImeApiName[]; - extern const char kEnableInputImeApiDescription[]; - --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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__handler__host.cc index d9c27f8b834b..4bef24642cc2 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__handler__host.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-04-30 22:22:34 UTC +--- 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" @@ -22,9 +22,9 @@ void WebRtcLoggingHandlerHost::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces +@@ -328,7 +328,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, filesystem_id, registered_name)); + 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 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 d8e26a9e4bc6..691445b63a1e 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -902,7 +902,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 42006a6f5f96..00bcd9672288 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-06-04 18:55:17 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -360,7 +360,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -382,7 +382,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -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); 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 0a796e195432..80a31ea106e6 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -72,12 +72,12 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -15,7 +15,7 @@ namespace { -@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -191,10 +191,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -28,7 +28,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -433,10 +433,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -434,10 +434,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -41,7 +41,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -481,10 +481,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -486,10 +486,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -54,7 +54,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -532,7 +532,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -586,7 +586,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea content::GetNetworkService()->ConfigureStubHostResolver( stub_resolver_enabled, std::move(dns_over_https_servers)); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index f2c97de5a93c..45506f2dcd70 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-06-04 18:55:17 UTC +--- 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 -@@ -81,7 +81,11 @@ +@@ -82,7 +82,11 @@ #include "net/cert/cert_status_flags.h" #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 5d17a1dd0f59..70c7fdb4a42c 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,20 +1,34 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-06-04 18:55:17 UTC +--- 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 @@ -109,7 +109,7 @@ - #include "chrome/browser/policy/browser_signin_policy_handler.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kAllowPopupsDuringPageUnload, + +@@ -321,11 +321,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kSafeSitesFilterBehavior, + policy_prefs::kSafeSitesFilterBehavior, + 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, + prefs::kAuthNegotiateDelegateByKdcPolicy, + base::Value::Type::BOOLEAN }, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_POSIX) + { key::kNtlmV2Enabled, + prefs::kNtlmV2Enabled, +@@ -1021,7 +1021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, 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 f21a30fc7cbc..3c36b6b42e3a 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -332,7 +332,7 @@ - #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" +@@ -338,7 +338,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); + +@@ -872,7 +872,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif + diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index a8549e03e6b0..175c7a801253 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,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-06-04 18:55:17 UTC +--- 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 -@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !defined(OS_ANDROID) +@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsProfiles:: MediaGalleriesPreferencesFactory::GetInstance(); #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif + ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index b41d40af3973..d90c3b69e971 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -83,7 +83,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index a9c1d5294f6d..35ec1b1dad33 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-06-04 18:55:17 UTC +--- 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 -@@ -1531,7 +1531,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1672,7 +1672,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, -@@ -1573,7 +1573,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1714,7 +1714,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 -@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -1994,7 +1994,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 45105fa21cce..b797d07880be 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -129,7 +129,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -130,7 +130,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -148,7 +148,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif 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 9a48cb455280..ad20f24a351f 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-03-11 22:00:54 UTC +--- 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 -@@ -120,7 +120,7 @@ Polymer({ +@@ -125,7 +125,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', @@ -9,7 +9,7 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -223,7 +223,7 @@ Polymer({ +@@ -228,7 +228,7 @@ Polymer({ this.browserProxy_.useDefaultTheme(); }, @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -292,10 +292,10 @@ Polymer({ +@@ -304,10 +304,10 @@ Polymer({ } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc new file mode 100644 index 000000000000..d20b30112256 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC ++++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc +@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa + void SendTabToSelfClientService::EntriesAddedRemotely( + const std::vector<const SendTabToSelfEntry*>& new_entries) { + for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Only respond to notifications corresponding to this service's profile + // for these OSes; mobile does not have a Profile. + // Cast note: on desktop, handlers are guaranteed to be the derived class 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 1bd2e0affda7..fdf032282034 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,15 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/signin/signin_util.cc -@@ -42,7 +42,7 @@ namespace { +@@ -33,7 +33,7 @@ + #include "services/identity/public/cpp/primary_account_mutator.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #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 { 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 6c2f97d66cc7..6171474e7606 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-06-04 18:55:18 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-07-24 18:58:11 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; -@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -218,7 +218,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 79a597d1c3cf..ca8d85c2b52b 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,17 +1,17 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - } +@@ -372,7 +372,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + dump_stack)); #endif // BUILDFLAG(ENABLE_APP_LIST) -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { - if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) { -@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI}))); - } + controllers.push_back( +@@ -382,7 +382,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + base::Unretained(this), 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_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index 965ad2bc13ea..a692188d2a5f 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-04-30 22:22:36 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -163,6 +163,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -162,6 +162,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 b583e1f17ba3..727ed8d20eaa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -251,7 +251,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -461,7 +461,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -863,7 +863,7 @@ void BrowserCommandController::InitCommandState() { +@@ -911,7 +911,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 index 92fc3893e97a..5bff1e115a48 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__window.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_window.h.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_window.h -@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow { +@@ -448,7 +448,7 @@ class BrowserWindow : public ui::BaseWindow { bool is_source_keyboard) = 0; #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ 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 dfd2913831b6..ca3d2dea58e3 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,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -82,7 +82,7 @@ #include "chrome/browser/ui/user_manager.h" @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -663,8 +663,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 d6566aa6c949..67f7eab232ce 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-06-04 18:55:18 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) 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 de23a230f774..79d1f1fb8d50 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,6 +1,6 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } 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 a7bcfe28ecfd..4b980d95c7a5 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-06-04 18:55:18 UTC +--- 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 -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -43,7 +43,7 @@ +@@ -42,7 +42,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -18,7 +18,7 @@ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} -@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -87,7 +87,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( g_browser_process->system_network_context_manager()->GetContext()); } @@ -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. -@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -118,7 +118,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 9e9039a5fdbd..81ebcce24d95 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-03-11 22:00:54 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -37,8 +37,10 @@ namespace { @@ -16,9 +16,9 @@ GetWidget()->Hide(); +#if !defined(OS_BSD) - ChangeMetricsReportingStateWithReply(report_crashes_->checked(), + ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(), base::Bind(&InitCrashReporterIfEnabled)); +#endif - if (make_default_->checked()) + if (make_default_->GetChecked()) shell_integration::SetAsDefaultBrowser(); 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 c286e0eac942..159ec7f62f8e 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,8 +1,8 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT - // light to dark mode. +@@ -1557,7 +1557,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); + bool must_regenerate_frame; -#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_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 432407bf13cc..61d4bb6d6cfe 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-06-04 18:55:18 UTC +--- 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 @@ -47,7 +47,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -17,7 +17,7 @@ +#if defined(OS_LINUX) || defined(OS_BSD) views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); - menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_, + menu_runner.RunMenuAt( @@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle 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 f9af94718fda..90627603db72 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-03-11 22:00:54 UTC +--- 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 -@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -79,7 +79,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); -@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -91,7 +91,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); -@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -127,7 +127,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 1ab795897fe8..b21dd7a39c6c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-06-04 18:55:18 UTC +--- 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 -@@ -65,7 +65,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -69,7 +69,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) : views::ImageButton(listener), tab_strip_(tab_strip) { set_animate_on_state_change(true); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc new file mode 100644 index 000000000000..c806dd473555 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-07-29 18:58:58 UTC ++++ chrome/browser/ui/views/tabs/tab.cc +@@ -525,7 +525,7 @@ void Tab::OnMouseCaptureLost() { + void Tab::OnMouseMoved(const ui::MouseEvent& event) { + tab_style_->SetHoverLocation(event.location()); + controller_->OnMouseEventInTab(this, event); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + MaybeUpdateHoverStatus(event); + #endif + } +@@ -535,7 +535,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) + } + + void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& event) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Move the hit test area for hovering up so that it is not overlapped by tab + // hover cards when they are shown. + // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove 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 1a9200d9205b..c9ae2025df96 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-06-04 18:55:18 UTC +--- 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 -@@ -436,7 +436,7 @@ void TabDragController::Init(TabStrip* source_tabstrip +@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,16 +9,16 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* +@@ -872,7 +872,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else - target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); + SetCapture(target_context); -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) // 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. -@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2023,7 +2023,7 @@ TabDragController::Liveness TabDragController::GetLoca exclude.insert(dragged_window); } } 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 2aea9636e194..e2c08a27ae5c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-06-04 18:55:18 UTC +--- 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 -@@ -202,11 +202,11 @@ +@@ -205,11 +205,11 @@ #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox_internals_ui.h" #endif -@@ -322,7 +322,7 @@ bool IsAboutUI(const GURL& url) { +@@ -325,7 +325,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) -@@ -619,7 +619,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -627,7 +627,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 -@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -672,17 +672,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 1aad9db11c3b..194ed11744de 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-06-04 18:55:18 UTC +--- 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 -@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,9 +9,9 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, - {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, +@@ -605,7 +605,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP}, + {"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER}, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index a13cf3b20a80..601d96b5fc62 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-06-04 18:55:18 UTC +--- chrome/common/BUILD.gn.orig 2019-07-24 18:58:13 UTC +++ chrome/common/BUILD.gn -@@ -306,6 +306,10 @@ static_library("common") { +@@ -298,6 +298,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 55ea8b7fe5b2..129c37bd3e94 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-06-04 18:55:18 UTC +--- chrome/common/chrome_features.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.cc -@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc +@@ -98,13 +98,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. -@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{ +@@ -150,7 +150,7 @@ const base::Feature kThirdPartyModulesBlocking{ "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -25,12 +25,3 @@ // Enables the dual certificate verification trial feature. // https://crbug.com/649026 const base::Feature kCertDualVerificationTrialFeature{ -@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi - // Enables or disables windowing related features for desktop PWAs. - const base::Feature kDesktopPWAWindowing { - "DesktopPWAWindowing", --#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_MACOSX) - base::FEATURE_ENABLED_BY_DEFAULT - #else diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index cb0d9a68581c..c6957e6df02e 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-06-04 18:55:18 UTC +--- chrome/common/chrome_features.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.h -@@ -60,10 +60,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -65,10 +65,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutoFetchOnNetErrorPage; #endif @@ -13,7 +13,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -79,7 +79,7 @@ extern const base::Feature kBrowserHangFixesExperiment +@@ -84,7 +84,7 @@ extern const base::Feature kBrowserHangFixesExperiment COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBundledConnectionHelpFeature; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index 3283c4a35e38..9bf429302cd3 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_paths_internal.h -@@ -47,7 +47,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 8b28f290fb44..a29c37867348 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,15 +1,9 @@ ---- chrome/common/chrome_switches.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.cc -@@ -878,12 +878,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -853,7 +853,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - const char kDisableInputImeAPI[] = "disable-input-ime-api"; - const char kEnableInputImeAPI[] = "enable-input-ime-api"; - #endif - -#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"; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 854ec871e183..9a7d74efaef0 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,15 +1,9 @@ ---- chrome/common/chrome_switches.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -265,7 +265,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kDisableInputImeAPI[]; - extern const char kEnableInputImeAPI[]; - #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[]; 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 f04b49402457..cc8ae9e5c9f3 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-06-04 18:55:18 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-07-24 18:58:13 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -108,7 +108,7 @@ if (is_chromeos) { +@@ -106,7 +106,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 d6696dfe5af4..277fce476cef 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,4 +1,4 @@ ---- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/features.gni.orig 2019-07-24 18:58:14 UTC +++ chrome/common/features.gni @@ -41,9 +41,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos @@ -7,8 +7,8 @@ - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) -- enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac -+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac || is_bsd +- enable_service_discovery = (enable_mdns && !is_android) || is_mac ++ enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd # Enables use of the session service, which is enabled by default. # Android stores them separately on the Java side. diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index bbcd4ed5bd9a..eecf4c8204ce 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-06-04 18:55:19 UTC +--- chrome/common/pref_names.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.cc -@@ -953,7 +953,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -982,7 +982,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 -@@ -1047,7 +1047,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1076,7 +1076,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"; -@@ -1434,7 +1434,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1468,7 +1468,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 -@@ -1716,12 +1716,12 @@ const char kAuthAndroidNegotiateAccountType[] = +@@ -1730,12 +1730,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 5be274fc6212..67623a3c23fe 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-06-04 18:55:19 UTC +--- chrome/common/pref_names.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.h -@@ -302,7 +302,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -309,7 +309,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[]; -@@ -332,7 +332,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -339,7 +339,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) -@@ -488,7 +488,7 @@ extern const char kAppWindowPlacement[]; +@@ -496,7 +496,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) -@@ -692,9 +692,9 @@ extern const char kGSSAPILibraryName[]; +@@ -696,9 +696,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 a349d6d2512c..33b27e9f08b9 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-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.cc -@@ -251,7 +251,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -299,7 +299,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me const char kChromeUICastHost[] = "cast"; #endif @@ -9,7 +9,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -262,17 +262,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -310,17 +310,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 -@@ -463,13 +463,13 @@ const char* const kChromeHostURLs[] = { +@@ -525,13 +525,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 009fc83dd3df..2355e0a4e503 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-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.h -@@ -246,7 +246,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -262,7 +262,7 @@ extern const char kChromeUIMetroFlowURL[]; extern const char kChromeUICastHost[]; #endif @@ -9,7 +9,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -258,17 +258,17 @@ extern const char kChromeUIHatsURL[]; +@@ -274,17 +274,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 9e5a27985621..58a2217abe7e 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -986,7 +986,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1011,7 +1011,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 1b6bc6ce6e8a..8b33510aee79 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2019-06-04 18:55:19 UTC +--- chrome/test/BUILD.gn.orig 2019-07-24 18:58:15 UTC +++ chrome/test/BUILD.gn -@@ -5399,7 +5399,7 @@ test("chrome_app_unittests") { +@@ -5475,7 +5475,7 @@ test("chrome_app_unittests") { "//components/crash/core/common", "//components/flags_ui:switches", ] 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 90b47cba6dc7..0f98cebed8e2 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-06-04 18:55:19 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -74,6 +74,10 @@ +@@ -75,6 +75,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" -@@ -106,7 +110,7 @@ +@@ -101,7 +105,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 c60b12af1029..f88d7c1bd355 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,8 +1,8 @@ ---- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/testing_browser_process.h -@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { - DownloadStatusUpdater* download_status_updater() override; +@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; + StartupData* startup_data() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - void StartAutoupdateTimer() override {} diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index b6da2ed23b8a..c54ba38f7eba 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-06-04 18:55:20 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,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> -@@ -263,7 +263,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -280,7 +280,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. -@@ -273,7 +273,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -290,7 +290,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -27,10 +27,10 @@ // 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. -@@ -412,7 +412,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() - } +@@ -435,7 +435,7 @@ void CastBrowserMainParts::ToolkitInitialized() { + views_delegate_ = std::make_unique<CastViewsDelegate>(); + #endif // defined(USE_AURA) - void CastBrowserMainParts::ToolkitInitialized() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Without this call, the FontConfig library gets implicitly initialized 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 de12823db6fa..1f934b98cfb3 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-06-04 18:55:20 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -575,7 +575,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -576,7 +576,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn index e90005f6196c..e3c84406e9bf 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/metrics/BUILD.gn -@@ -31,7 +31,7 @@ cast_source_set("metrics") { +@@ -32,7 +32,7 @@ cast_source_set("metrics") { "//third_party/metrics_proto", ] diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc deleted file mode 100644 index 9b6852216fb1..000000000000 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc +++ /dev/null @@ -1,102 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.cc -@@ -38,9 +38,9 @@ - #include "content/public/common/content_switches.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chromecast/browser/metrics/external_metrics.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_ANDROID) - #include "chromecast/base/android/dumpstate_writer.h" -@@ -60,10 +60,10 @@ const char kMetricsOldClientID[] = "user_experience_me - const char kClientIdName[] = "Client ID"; - #else - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char kExternalUmaEventsRelativePath[] = "metrics/uma-events"; - const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events"; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - const struct ChannelMap { - const char* chromecast_channel; -@@ -280,19 +280,19 @@ CastMetricsServiceClient::CastMetricsServiceClient( - : delegate_(delegate), - pref_service_(pref_service), - client_info_loaded_(false), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - external_metrics_(nullptr), - platform_metrics_(nullptr), --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - task_runner_(base::ThreadTaskRunnerHandle::Get()), - url_loader_factory_(url_loader_factory) { - } - - CastMetricsServiceClient::~CastMetricsServiceClient() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK(!external_metrics_); - DCHECK(!platform_metrics_); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::OnApplicationNotIdle() { -@@ -300,13 +300,13 @@ void CastMetricsServiceClient::OnApplicationNotIdle() - } - - void CastMetricsServiceClient::ProcessExternalEvents(const base::Closure& cb) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - external_metrics_->ProcessExternalEvents( - base::Bind(&ExternalMetrics::ProcessExternalEvents, - base::Unretained(platform_metrics_), cb)); - #else - cb.Run(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::SetForceClientId( -@@ -371,7 +371,7 @@ void CastMetricsServiceClient::Initialize() { - if (IsReportingEnabled()) - metrics_service_->Start(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Start external metrics collection, which feeds data from external - // processes into the main external metrics. - external_metrics_ = new ExternalMetrics( -@@ -381,7 +381,7 @@ void CastMetricsServiceClient::Initialize() { - platform_metrics_ = - new ExternalMetrics(stability_provider, kPlatformUmaEventsPath); - platform_metrics_->Start(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void CastMetricsServiceClient::Finalize() { -@@ -390,14 +390,14 @@ void CastMetricsServiceClient::Finalize() { - metrics_service_->RecordCompletedSessionEnd(); - #endif // !defined(OS_ANDROID) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Stop metrics service cleanly before destructing CastMetricsServiceClient. - // The pointer will be deleted in StopAndDestroy(). - external_metrics_->StopAndDestroy(); - external_metrics_ = nullptr; - platform_metrics_->StopAndDestroy(); - platform_metrics_ = nullptr; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - metrics_service_->Stop(); - } - diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h deleted file mode 100644 index 8f4202cc7940..000000000000 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h +++ /dev/null @@ -1,15 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.h -@@ -111,10 +111,10 @@ class CastMetricsServiceClient : public ::metrics::Met - std::string force_client_id_; - bool client_info_loaded_; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - ExternalMetrics* external_metrics_; - ExternalMetrics* platform_metrics_; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - std::unique_ptr<::metrics::MetricsStateManager> metrics_state_manager_; - std::unique_ptr<::metrics::MetricsService> metrics_service_; 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 c35f7619cbf4..325527a66d53 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-06-04 18:55:21 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -227,7 +227,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -215,7 +215,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 1beaa01507fc..600810092a1d 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-06-04 18:55:21 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1949,10 +1949,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1940,10 +1940,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__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index 147fe2467b6f..4bb0156fb1e1 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-04-30 22:22:41 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -202,7 +202,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -203,7 +203,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 3cc3df11aab5..53de5d05b67e 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,28 +1,19 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/content/app/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/content/app/BUILD.gn -@@ -36,12 +36,12 @@ static_library("app") { +@@ -37,7 +37,7 @@ static_library("app") { sources += [ "crashpad.cc" ] } -- if (is_android || (is_linux && !is_chromeos)) { -+ if (is_android || (is_linux && !is_chromeos && !is_bsd)) { - set_sources_assignment_filter([]) - sources += [ "crashpad_linux.cc" ] - } - - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -82,7 +82,10 @@ static_library("app") { - "//third_party/crashpad/crashpad/snapshot", +@@ -78,7 +78,7 @@ static_library("app") { + "//sandbox", ] - if (is_linux) { -+ if (is_bsd) { -+ deps -= [ "//third_party/crashpad/crashpad/snapshot" ] -+ } + 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 b042dcf472a0..0ffc64ea8f92 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/core/common/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/core/common/BUILD.gn -@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") +@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn declare_args() { # If set to true, this will stub out and disable the entire crash key system. @@ -9,7 +9,7 @@ } group("common") { -@@ -92,7 +92,6 @@ target(crash_key_target_type, "crash_key") { +@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") { ] } @@ -17,7 +17,7 @@ } } -@@ -147,7 +146,7 @@ source_set("unit_tests") { +@@ -153,7 +152,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } 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 080a98e51b65..a4a10cdb5790 100644 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc @@ -1,6 +1,6 @@ ---- components/download/internal/common/base_file.cc.orig 2019-04-30 22:22:41 UTC +--- components/download/internal/common/base_file.cc.orig 2019-07-24 18:58:19 UTC +++ components/download/internal/common/base_file.cc -@@ -494,7 +494,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { +@@ -516,7 +516,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { } #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ namespace { -@@ -578,7 +578,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn +@@ -600,7 +600,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } 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 e8252eefd572..1b6be4c76a46 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,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con - const char kTabReopened[] = "tab_reopened"; +@@ -29,9 +29,9 @@ const char kFocusModeOpened[] = "focus_mode_opened"; + const char kFocusModeConditionsMet[] = "focus_mode_conditions_met"; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) 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 6fea1eadd62f..fca3b9dd3629 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,7 +1,7 @@ ---- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.h.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.h -@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[]; - extern const char kTabReopened[]; +@@ -57,7 +57,7 @@ extern const char kFocusModeOpened[]; + extern const char kFocusModeConditionsMet[]; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) @@ -9,7 +9,7 @@ // 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. -@@ -57,7 +57,7 @@ extern const char kTabReopened[]; +@@ -65,7 +65,7 @@ extern const char kFocusModeConditionsMet[]; // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; 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 b74cc52fc72f..21f35446e18e 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-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2019-07-24 18:58:19 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -150,6 +150,9 @@ void ToCheckinProtoVersion( +@@ -149,6 +149,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 e50efbe67667..05a61bd2fa4b 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-04-30 22:22:42 UTC +--- components/metrics/BUILD.gn.orig 2019-07-24 18:58:19 UTC +++ components/metrics/BUILD.gn -@@ -144,6 +144,11 @@ jumbo_static_library("metrics") { +@@ -146,6 +146,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 4c3918ed3c93..4e1e83b76db8 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-06-04 18:55:21 UTC +--- components/metrics/metrics_log.cc.orig 2019-07-24 18:58:19 UTC +++ components/metrics/metrics_log.cc -@@ -197,7 +197,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic +@@ -210,7 +210,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_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index b932f6d6a265..f75e956cab6e 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-04-30 22:22:42 UTC +--- 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 -@@ -697,7 +697,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -716,7 +716,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) 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 e45e15c95769..dcdc4f09f362 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2019-06-04 18:55:21 UTC +--- components/policy/resources/policy_templates.json.orig 2019-07-24 18:58:20 UTC +++ components/policy/resources/policy_templates.json -@@ -984,7 +984,7 @@ +@@ -1019,7 +1019,7 @@ 'name': 'HomepageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1013,7 +1013,7 @@ +@@ -1048,7 +1048,7 @@ 'name': 'HomepageIsNewTabPage', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1039,7 +1039,7 @@ +@@ -1074,7 +1074,7 @@ 'name': 'NewTabPageLocation', 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1732,7 +1732,7 @@ +@@ -1767,7 +1767,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3369,7 +3369,7 @@ +@@ -3399,7 +3399,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3421,7 +3421,7 @@ +@@ -3450,7 +3450,7 @@ 'name': 'NtlmV2Enabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -6537,7 +6537,7 @@ +@@ -6637,7 +6637,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7667,7 +7667,7 @@ +@@ -7761,7 +7761,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -8183,7 +8183,7 @@ +@@ -8277,7 +8277,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, 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 index c9bf5bdb81f6..15ae4e284e0b 100644 --- a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc +++ b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc @@ -1,6 +1,6 @@ ---- components/services/filesystem/file_system_app.cc.orig 2019-04-30 22:22:43 UTC +--- components/services/filesystem/file_system_app.cc.orig 2019-07-24 18:58:21 UTC +++ components/services/filesystem/file_system_app.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #elif defined(OS_ANDROID) #include "base/base_paths_android.h" #include "base/path_service.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) -@@ -74,7 +74,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { +@@ -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)); diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc new file mode 100644 index 000000000000..52dda1501cee --- /dev/null +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -0,0 +1,26 @@ +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-07-29 16:01:57 UTC ++++ components/sync_device_info/local_device_info_util_linux.cc +@@ -30,6 +30,23 @@ std::string GetSessionNameInternal() { + break; + } + return "Chromebook"; ++#elif defined(OS_BSD) ++ long len = sysconf(_SC_HOST_NAME_MAX); ++ ++ if (len == -1) ++ return "FreeBSD"; ++ ++ char *hostname = new (std::nothrow) char[len](); ++ ++ if ((hostname == nullptr) || (gethostname(hostname, len) == -1)) { ++ delete[](hostname); ++ return "FreeBSD"; ++ } ++ ++ std::string res{hostname}; ++ ++ delete[](hostname); ++ return res; + #else + char hostname[HOST_NAME_MAX]; + if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc deleted file mode 100644 index 6afc6529bc28..000000000000 --- a/www/chromium/files/patch-components_sync_base_get__session__name.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/sync/base/get_session_name.cc.orig 2019-04-30 22:22:44 UTC -+++ components/sync/base/get_session_name.cc -@@ -17,7 +17,7 @@ - - #if defined(OS_CHROMEOS) - #include "chromeos/constants/devicetype.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "components/sync/base/get_session_name_linux.h" - #elif defined(OS_IOS) - #include "components/sync/base/get_session_name_ios.h" -@@ -53,7 +53,7 @@ std::string GetSessionNameBlocking() { - session_name = "Chromebook"; - break; - } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - session_name = internal::GetHostname(); - #elif defined(OS_IOS) - session_name = internal::GetComputerName(); diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc deleted file mode 100644 index f82fe5e19719..000000000000 --- a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC -+++ components/sync/base/get_session_name_linux.cc -@@ -13,8 +13,9 @@ namespace syncer { - namespace internal { - - std::string GetHostname() { -- char hostname[HOST_NAME_MAX]; -- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, len) == 0) // Success. - return hostname; - return base::GetLinuxDistro(); - } 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 fc52368a6836..57cb14d98fb1 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-04-30 22:22:45 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-07-24 18:58:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -96,17 +96,17 @@ +@@ -99,17 +99,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" -@@ -127,7 +127,7 @@ +@@ -130,7 +130,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" -@@ -319,7 +319,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -322,7 +322,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,7 +39,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -416,7 +416,7 @@ void PreSandboxInit() { +@@ -419,7 +419,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -48,7 +48,7 @@ } // namespace -@@ -474,7 +474,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -477,7 +477,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -642,11 +642,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 8dcb31f8c439..d4c4492aef33 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,14 +1,11 @@ ---- content/browser/BUILD.gn.orig 2019-06-04 18:55:22 UTC +--- content/browser/BUILD.gn.orig 2019-07-24 18:58:23 UTC +++ content/browser/BUILD.gn -@@ -1982,11 +1982,6 @@ jumbo_source_set("browser") { - "tracing/cros_tracing_agent.h", +@@ -2058,7 +2058,7 @@ jumbo_source_set("browser") { + "//chromeos/resources", + "//components/chromeos_camera:mojo_mjpeg_decode_accelerator", ] - deps += [ "//chromeos/resources" ] - } else { -- sources += [ -- "memory/memory_monitor_linux.cc", -- "memory/memory_monitor_linux.h", -- ] - } - - if (is_chromeos || is_android || is_chromecast) { ++ } 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 0e034f5a2b61..b47373ffcc85 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC +--- content/browser/browser_main_loop.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/browser_main_loop.cc @@ -251,6 +251,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -593,6 +600,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -576,6 +583,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif #if defined(USE_X11) -@@ -636,7 +648,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -619,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) @@ -35,7 +35,7 @@ defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. -@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -629,7 +641,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 new file mode 100644 index 000000000000..aa515107168a --- /dev/null +++ b/www/chromium/files/patch-content_browser_builtin__service__manifests.cc @@ -0,0 +1,20 @@ +--- 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_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 8bbab3b5f149..7bcb296f41b8 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-06-04 18:55:23 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1082,7 +1082,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1062,7 +1062,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) 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 4c2671b2267c..c66eeab22457 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-05-04 09:03:05 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -343,7 +343,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) 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 c8ba9a364c0c..437db86a57d7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-06-04 18:55:23 UTC +--- 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 -@@ -231,7 +231,7 @@ +@@ -229,7 +229,7 @@ #include "content/browser/compositor/image_transport_factory.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> #endif -@@ -1211,7 +1211,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1231,7 +1231,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; -@@ -1222,7 +1222,7 @@ size_t GetPlatformProcessLimit() { +@@ -1242,7 +1242,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1636,7 +1636,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1654,7 +1654,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -35,4 +35,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 57078cc52adc..691d494cdd28 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-06-04 18:55:23 UTC +--- 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 -@@ -401,10 +401,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -400,10 +400,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__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 5405f6235346..2502fa83ea02 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-06-04 18:55:23 UTC +--- 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 -@@ -124,7 +124,7 @@ +@@ -117,7 +117,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 -@@ -2287,7 +2287,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2200,7 +2200,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2485,7 +2485,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2397,7 +2397,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; 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 index f59102abdd13..0d0ec1908d24 100644 --- 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 @@ -1,15 +1,15 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/service_manager/service_manager_context.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/service_manager/service_manager_context.cc -@@ -99,7 +99,7 @@ +@@ -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" + #include "components/services/font/public/interfaces/constants.mojom.h" // nogncheck #endif -@@ -378,12 +378,12 @@ void CreateInProcessAudioService( +@@ -342,12 +342,12 @@ void CreateInProcessAudioService( BrowserMainLoop::GetAudioManager(), std::move(request))); } @@ -24,12 +24,12 @@ std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService( service_manager::mojom::ServiceRequest request) { -@@ -605,7 +605,7 @@ ServiceManagerContext::ServiceManagerContext( +@@ -665,7 +665,7 @@ ServiceManagerContext::ServiceManagerContext( base::BindRepeating(&CreateVideoCaptureService)); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) RegisterInProcessService( - packaged_services_connection_.get(), font_service::mojom::kServiceName, + font_service::mojom::kServiceName, base::CreateSequencedTaskRunnerWithTraits( 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 d5e03434e915..767ca6f739f5 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,12 +1,15 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -101,9 +101,9 @@ const std::map<int, std::string> CreateMojoResourceIdT - {IDR_MOJO_BIG_BUFFER_MOJOM_LITE_JS, "js/big_buffer.mojom-lite.js"}, - {IDR_MOJO_FILE_MOJOM_LITE_JS, "js/file.mojom-lite.js"}, - {IDR_MOJO_STRING16_MOJOM_LITE_JS, "js/string16.mojom-lite.js"}, +@@ -119,12 +119,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"}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {IDR_MOJO_TIME_MOJOM_LITE_JS, "js/time.mojom-lite.js"}, + {IDR_MOJO_TIME_MOJOM_HTML, + "mojo/mojo/public/mojom/base/time.mojom.html"}, + {IDR_MOJO_TIME_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) }; diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 18c6260202f9..e149fe9db7b5 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-06-04 18:55:23 UTC +--- content/common/BUILD.gn.orig 2019-07-24 18:58:24 UTC +++ content/common/BUILD.gn -@@ -375,6 +375,12 @@ source_set("common") { +@@ -381,6 +381,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 2a3b751ec206..ee699a82ce2e 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2019-04-30 22:22:47 UTC +--- content/gpu/gpu_main.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_main.cc @@ -79,7 +79,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -363,7 +363,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -369,7 +369,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +36,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -398,7 +398,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -404,7 +404,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 108731c88ab0..b9266e56d4aa 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -277,8 +278,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -287,8 +288,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() { +@@ -303,6 +306,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu( +@@ -358,6 +362,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; -@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook( +@@ -378,13 +383,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc deleted file mode 100644 index de0f19f529d7..000000000000 --- a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/public/app/content_packaged_services_manifest.cc.orig 2019-06-04 18:55:23 UTC -+++ content/public/app/content_packaged_services_manifest.cc -@@ -23,7 +23,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 - -@@ -63,7 +63,7 @@ const service_manager::Manifest& GetContentPackagedSer - .PackageService(tracing::GetManifest()) - .PackageService(video_capture::GetManifest()) - .PackageService(viz::GetManifest()) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - .PackageService(font_service::GetManifest()) - #endif - #if defined(OS_CHROMEOS) 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 bd32ffbf6314..d7f2fe5c2985 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,4 +1,4 @@ ---- content/public/common/child_process_host.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/child_process_host.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/child_process_host.h @@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. @@ -9,12 +9,3 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -60,7 +60,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se - // gdb). In this case, you'd use GetChildPath to get the real executable - // file name, and then prepend the GDB command to the command line. - CHILD_ALLOW_SELF = 1 << 0, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - }; - - // Returns the pathname to be used for a child process. If a subprocess 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 97050b5cf57f..94548e336aa5 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-06-04 18:55:23 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/common_param_traits_macros.h -@@ -331,7 +331,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -329,7 +329,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 571c55458c84..0bf68d97af34 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_features.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_features.cc -@@ -559,7 +559,7 @@ const base::Feature kWebAssemblyThreads { +@@ -577,7 +577,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -9,7 +9,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -594,7 +594,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -612,7 +612,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 551441cfb891..08f41bb44f03 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_switches.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_switches.cc -@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -949,7 +949,7 @@ const char kEnableAutomation[] = "enable-automation"; const char kDisablePanelFitting[] = "disable-panel-fitting"; #endif diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 178d3bdc4cda..54b76f65a09e 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-04-30 22:22:47 UTC +--- content/public/test/browser_test_base.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/test/browser_test_base.cc -@@ -63,6 +63,10 @@ +@@ -75,6 +75,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index 3eb2dcd8f640..36742f1dfeda 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,11 +1,11 @@ ---- content/renderer/render_process_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/render_process_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_process_impl.cc -@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl( +@@ -157,7 +157,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); -#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - bool use_v8_signal_handler = false; base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch( 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 03a7cdfad5c5..85394137eeab 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-06-04 18:55:23 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_thread_impl.cc -@@ -191,12 +191,21 @@ +@@ -187,12 +187,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -917,7 +926,7 @@ void RenderThreadImpl::Init() { +@@ -907,7 +916,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,7 +31,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -958,7 +967,7 @@ void RenderThreadImpl::Init() { +@@ -939,7 +948,7 @@ void RenderThreadImpl::Init() { GetConnector()->BindInterface(mojom::kBrowserServiceName, mojo::MakeRequest(&storage_partition_service_)); @@ -40,7 +40,7 @@ render_message_filter()->SetThreadPriority( ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); #endif -@@ -1332,7 +1341,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1321,7 +1330,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 6d7ab6884b04..fe449c23578a 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-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -113,7 +113,7 @@ +@@ -108,7 +108,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -206,7 +206,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( ->Clone(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); @@ -18,7 +18,7 @@ font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get()); SkFontConfigInterface::SetGlobal(font_loader_); #endif -@@ -215,7 +215,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -208,7 +208,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( connector_ = service_manager::Connector::Create(&request); } @@ -27,7 +27,7 @@ if (g_sandbox_enabled && sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -243,7 +243,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( +@@ -236,7 +236,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() -@@ -324,7 +324,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -311,7 +311,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); -@@ -337,7 +337,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -324,7 +324,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 1a432146787a..57e23d4585ea 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-07-24 18:58:25 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr<service_manager::Connector> connector_; scoped_refptr<base::SingleThreadTaskRunner> io_runner_; @@ -18,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -311,7 +311,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -296,7 +296,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 4454beb5747c..833001dcb9b0 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- content/shell/BUILD.gn.orig 2019-07-24 18:58:25 UTC +++ content/shell/BUILD.gn -@@ -947,7 +947,7 @@ group("content_shell_crash_test") { +@@ -961,7 +961,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } -- if (is_posix && !is_android) { -+ if (is_posix && !is_android && !is_bsd) { +- if (is_posix) { ++ if (is_posix && !is_bsd) { data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + "//third_party/breakpad:dump_syms", + "//third_party/breakpad:minidump_stackwalk", 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 new file mode 100644 index 000000000000..a40dcd5bd1f2 --- /dev/null +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -0,0 +1,20 @@ +--- content/shell/app/shell_main_delegate.cc.orig 2019-07-29 19:14:59 UTC ++++ content/shell/app/shell_main_delegate.cc +@@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + + v8_crashpad_support::SetUp(); + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); + #endif + #if defined(OS_MACOSX) +@@ -314,7 +314,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + } + + void ShellMainDelegate::PreSandboxStartup() { +-#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)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; 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 1cb41f0e4fbc..f8fb589f6246 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -108,7 +108,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -115,7 +115,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_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 ad856fcc3d60..fce9b779f199 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-06-04 18:55:23 UTC +--- 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 -@@ -42,7 +42,7 @@ +@@ -37,7 +37,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc index 2441104b8d0d..808ff4655bd7 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,29 +1,29 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/test_runner/test_runner.cc @@ -66,7 +66,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1546,7 +1546,7 @@ void TestRunner::Reset() { +@@ -1538,7 +1538,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2075,7 +2075,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2065,7 +2065,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Since FontConfig doesn't provide a variable to control subpixel // positioning, we'll fall back to setting it globally for all fonts. blink::WebFontRenderStyle::SetSubpixelPositioning(value); diff --git a/www/chromium/files/patch-device_usb_BUILD.gn b/www/chromium/files/patch-device_usb_BUILD.gn deleted file mode 100644 index 2d5a3b0a8dcc..000000000000 --- a/www/chromium/files/patch-device_usb_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC -+++ device/usb/BUILD.gn -@@ -112,10 +112,17 @@ static_library("usb") { - ] - } - -- if (is_android || is_chromeos || is_linux) { -+ if (is_android || is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "usb_device_handle_usbfs.cc", - "usb_device_handle_usbfs.h", -+ ] -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "usb_device_linux.cc", -+ "usb_device_linux.h", - ] - } - diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc deleted file mode 100644 index dd97946fb79e..000000000000 --- a/www/chromium/files/patch-device_usb_usb__context.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_context.cc -@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() { - - void UsbContext::UsbEventHandler::Stop() { - base::subtle::Release_Store(&running_, 0); -+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version - libusb_interrupt_handle_event(context_); -+#endif - } - - UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc deleted file mode 100644 index a23797cfef2c..000000000000 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_error.cc -@@ -9,7 +9,7 @@ - namespace device { - - std::string ConvertPlatformUsbErrorToString(int errcode) { -- return libusb_strerror(static_cast<libusb_error>(errcode)); -+ return ""; - } - - } // namespace device diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc deleted file mode 100644 index 4f222e5fe7e0..000000000000 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- device/usb/usb_service_impl.cc.orig 2019-06-04 18:55:24 UTC -+++ device/usb/usb_service_impl.cc -@@ -234,8 +234,10 @@ UsbServiceImpl::UsbServiceImpl() - - UsbServiceImpl::~UsbServiceImpl() { - NotifyWillDestroyUsbService(); -+#if !defined(OS_FREEBSD) - if (hotplug_enabled_) - libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -+#endif // !defined(OS_FREEBSD) - } - - void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -290,6 +292,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon - - context_ = std::move(context); - -+#if !defined(OS_FREEBSD) - int rv = libusb_hotplug_register_callback( - context_->context(), - static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -302,6 +305,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon - - // This will call any enumeration callbacks queued while initializing. - RefreshDevices(); -+#endif // !defined(OS_FREEBSD) - - #if defined(OS_WIN) - DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -498,6 +502,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev - device->OnDisconnect(); - } - -+#if !defined(OS_FREEBSD) - // static - int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, - libusb_device* device_raw, -@@ -531,6 +536,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb - - return 0; - } -+#endif // !defined(OS_FREEBSD) - - void UsbServiceImpl::OnPlatformDeviceAdded( - ScopedLibusbDeviceRef platform_device) { diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h deleted file mode 100644 index b9bdde03159d..000000000000 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ /dev/null @@ -1,26 +0,0 @@ ---- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_service_impl.h -@@ -73,11 +73,13 @@ class UsbServiceImpl : - scoped_refptr<UsbDeviceImpl> device); - void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); - -+#if !defined(OS_FREEBSD) - // Handle hotplug events from libusb. - static int LIBUSB_CALL HotplugCallback(libusb_context* context, - libusb_device* device, - libusb_hotplug_event event, - void* user_data); -+#endif - // These functions release a reference to the provided platform device. - void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); - void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); -@@ -97,7 +99,9 @@ class UsbServiceImpl : - // connected instead of only when a full enumeration is requested. - // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_ = false; -+#if !defined(OS_FREEBSD) - libusb_hotplug_callback_handle hotplug_handle_; -+#endif - - // Enumeration callbacks are queued until an enumeration completes. - bool enumeration_ready_ = false; 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 3f13f43d7e15..732fe5e884f2 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-03-11 22:00:58 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -29,7 +29,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index f626f1c08048..0ce7f4e6ffa8 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-04-30 22:22:49 UTC +--- extensions/common/api/_permission_features.json.orig 2019-07-24 18:58:27 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -473,7 +473,7 @@ +@@ -469,7 +469,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 -@@ -504,7 +504,7 @@ +@@ -500,7 +500,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index a2cd4e35c041..e97794f406b1 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,11 +1,11 @@ ---- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/common/features/feature.cc -@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -20,7 +20,7 @@ namespace extensions { + Feature::Platform Feature::GetCurrentPlatform() { + #if defined(OS_CHROMEOS) + return CHROMEOS_PLATFORM; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return LINUX_PLATFORM; + #elif defined(OS_MACOSX) return MACOSX_PLATFORM; - #elif defined(OS_WIN) - return WIN_PLATFORM; -+#elif defined(OS_BSD) -+ return LINUX_PLATFORM; - #else - return UNSPECIFIED_PLATFORM; - #endif 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 5b78e4c1edba..d8cf13ba65e5 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-06-04 18:55:24 UTC +--- 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 -@@ -18,7 +18,7 @@ +@@ -26,7 +26,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -9,7 +9,7 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -140,7 +140,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -439,7 +439,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa #if defined(OS_FUCHSIA) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; @@ -18,7 +18,7 @@ if (!texture_) { VkMemoryGetFdInfoKHR get_fd_info; get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; -@@ -202,7 +202,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -502,7 +502,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa } return std::make_unique<ExternalVkImageGlRepresentation>( manager, this, tracker, texture_, texture_->service_id()); 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 579cba128615..5aab116e20b1 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,15 +1,15 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo +@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in + #endif } - #endif // defined(OS_WIN) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ } // namespace -@@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -150,7 +150,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; -@@ -201,7 +201,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -220,7 +220,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. -@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -229,7 +229,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -45,16 +45,16 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - InitializeDirectCompositionOverlaySupport(&gpu_info_); - #endif +@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + + InitializePlatformOverlaySettings(&gpu_info_); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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. -@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -63,16 +63,16 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c - InitializeDirectCompositionOverlaySupport(&gpu_info_); - #endif +@@ -516,7 +516,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + + InitializePlatformOverlaySettings(&gpu_info_); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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. -@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -536,7 +536,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index fc8d721f4aca..af39329a6e9d 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" @@ -9,12 +9,12 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { - return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); +@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( + return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif defined(OS_ANDROID) - return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); + return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); -#elif defined(OS_LINUX) || defined(OS_FUCHSIA) +#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap); + return std::make_unique<GpuMemoryBufferFactoryNativePixmap>( + vulkan_context_provider); #elif defined(OS_WIN) - return base::WrapUnique(new GpuMemoryBufferFactoryDXGI); 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 900372366661..8021272770eb 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-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -54,8 +54,10 @@ const int kGpuTimeout = 10000; +@@ -55,8 +55,10 @@ const int kGpuTimeout = 10000; #endif #if defined(USE_X11) @@ -11,7 +11,7 @@ const unsigned char text[20] = "check"; #endif -@@ -78,8 +80,10 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -79,8 +81,10 @@ GpuWatchdogThread::GpuWatchdogThread() display_(nullptr), window_(0), atom_(x11::None), @@ -22,7 +22,7 @@ weak_factory_(this) { base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); -@@ -94,7 +98,9 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -95,7 +99,9 @@ GpuWatchdogThread::GpuWatchdogThread() #endif #if defined(USE_X11) @@ -32,7 +32,7 @@ SetupXServer(); #endif base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -242,8 +248,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -231,8 +237,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { power_monitor->RemoveObserver(this); #if defined(USE_X11) @@ -43,7 +43,7 @@ if (display_) { DCHECK(window_); XDestroyWindow(display_, window_); -@@ -467,7 +475,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover +@@ -436,7 +444,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover return; #endif @@ -52,7 +52,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) { -@@ -554,7 +562,9 @@ void GpuWatchdogThread::SetupXServer() { +@@ -510,7 +518,9 @@ void GpuWatchdogThread::SetupXServer() { CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); atom_ = XInternAtom(display_, "CHECK", x11::False); } @@ -62,7 +62,7 @@ } void GpuWatchdogThread::SetupXChangeProp() { -@@ -657,7 +667,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT +@@ -611,7 +621,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index 782be406427b..1f736ba2f75f 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-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -195,8 +195,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi XDisplay* display_; gfx::AcceleratedWidget window_; XAtom atom_; 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 c10bfa481ca5..3093f01c5b61 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -305,7 +305,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -352,7 +352,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif @@ -9,7 +9,7 @@ vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( vkGetDeviceProcAddrFn(vk_device, "vkGetSemaphoreFdKHR")); -@@ -319,7 +319,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -366,7 +366,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif 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 bcf27d2ad1a8..70fcc795f218 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -131,13 +131,13 @@ struct VulkanFunctionPointers { +@@ -145,13 +145,13 @@ struct VulkanFunctionPointers { #endif // Device functions shared between Linux and Android. @@ -16,7 +16,7 @@ PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; #endif -@@ -286,14 +286,14 @@ struct VulkanFunctionPointers { +@@ -313,14 +313,14 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif 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 9c424a4c41d9..c35942a703cc 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-04-30 22:22:49 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -189,7 +189,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -178,7 +178,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, -@@ -200,7 +200,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -189,7 +189,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 36ed1838d3ff..b71066ee7708 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-06-04 18:55:24 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -35,7 +35,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -36,7 +36,7 @@ class HeadlessContentBrowserClient : public content::C ::storage::OptionalQuotaSettingsCallback callback) override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 6b3f197c066a..00d57043fb58 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.cc -@@ -356,7 +356,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -355,7 +355,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index b3744d4c0d96..b5d5bf84b128 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-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.h.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.h -@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> { +@@ -205,7 +205,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_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 0ceb731b9952..a40d2bc207fb 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.cc.orig 2019-07-24 18:58:30 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; @@ -34,8 +34,8 @@ -#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_); + 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_; } diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 02dbb8ddb239..1abbeab3f146 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.h.orig 2019-07-24 18:58:30 UTC +++ media/base/video_frame.h -@@ -72,7 +72,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -74,7 +74,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. @@ -9,7 +9,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -266,7 +266,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -268,7 +268,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,7 +18,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -458,7 +458,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -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; @@ -27,7 +27,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -652,7 +652,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // memory. size_t shared_memory_offset_; 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 bd9dfa2a89f3..40b161c1bf98 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-06-04 18:55:25 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-07-24 18:58:30 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -298,7 +298,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_libyuv__image__processor.cc b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc new file mode 100644 index 000000000000..083e80e8e001 --- /dev/null +++ b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc @@ -0,0 +1,38 @@ +--- media/gpu/libyuv_image_processor.cc.orig 2019-07-29 19:24:17 UTC ++++ media/gpu/libyuv_image_processor.cc +@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce + // LibYUVImageProcessor supports only memory-based video frame for input. + VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; + for (auto input_type : input_config.preferred_storage_types) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_type == VideoFrame::STORAGE_DMABUFS) { + video_frame_mapper = VideoFrameMapperFactory::CreateMapper( + input_config.layout.format(), true); +@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce + break; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (VideoFrame::IsStorageTypeMappable(input_type)) { + input_storage_type = input_type; +@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V + FrameReadyCB cb) { + DCHECK(process_thread_.task_runner()->BelongsToCurrentThread()); + DVLOGF(4); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { + DCHECK_NE(video_frame_mapper_.get(), nullptr); + input_frame = video_frame_mapper_->Map(std::move(input_frame)); +@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V + return; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + int res = DoConversion(input_frame.get(), output_frame.get()); + if (res != 0) { 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 26475695c709..ecff20ff5e8d 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-06-04 18:55:25 UTC +--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/linux/platform_video_frame_utils.cc -@@ -103,7 +103,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -107,7 +107,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 = -@@ -124,7 +124,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -126,7 +126,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 index b695531c0bf2..2109b75820e0 100644 --- 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 @@ -1,4 +1,4 @@ ---- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-06-04 18:55:25 UTC +--- 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" @@ -9,7 +9,7 @@ #include "media/gpu/linux/platform_video_frame_utils.h" #endif -@@ -124,7 +124,7 @@ scoped_refptr<VideoFrame> VaapiDmaBufVideoFrameMapper: +@@ -137,7 +137,7 @@ scoped_refptr<VideoFrame> VaapiDmaBufVideoFrameMapper: } gfx::GpuMemoryBufferHandle gmb_handle; 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 index 1b1de4489d36..8d5714c32cb2 100644 --- 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 @@ -1,4 +1,4 @@ ---- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-06-04 18:55:25 UTC +--- 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" @@ -9,7 +9,7 @@ #include "media/gpu/linux/platform_video_frame_utils.h" #endif -@@ -555,7 +555,7 @@ scoped_refptr<VaapiEncodeJob> VaapiVideoEncodeAccelera +@@ -558,7 +558,7 @@ scoped_refptr<VaapiEncodeJob> VaapiVideoEncodeAccelera vaapi_wrapper_, MakeGLContextCurrentCallback(), BindGLImageCallback(), PictureBuffer(kDummyPictureBufferId, frame->coded_size())); gfx::GpuMemoryBufferHandle gmb_handle; 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 index dee939e97028..f1dbba5e8200 100644 --- a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc +++ b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/video_frame_mapper_factory.cc.orig 2019-06-04 18:55:25 UTC +--- media/gpu/video_frame_mapper_factory.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/video_frame_mapper_factory.cc -@@ -7,36 +7,36 @@ +@@ -7,38 +7,38 @@ #include "build/build_config.h" #include "media/gpu/buildflags.h" @@ -19,29 +19,31 @@ namespace media { // static - std::unique_ptr<VideoFrameMapper> VideoFrameMapperFactory::CreateMapper() { + 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(false); + return CreateMapper(format, false); #else - return CreateMapper(true); + 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 std::make_unique<GenericDmaBufVideoFrameMapper>(); + 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(); + return VaapiDmaBufVideoFrameMapper::Create(format); -#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index dd172ea7c2b0..3b1ec33b29a8 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2019-06-04 18:55:25 UTC +--- media/media_options.gni.orig 2019-07-24 18:58:30 UTC +++ media/media_options.gni -@@ -111,6 +111,9 @@ declare_args() { +@@ -110,6 +110,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false 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 5f2c85e18843..a121fdc8958b 100644 --- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -1,4 +1,4 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-06-04 18:55:25 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-07-24 18:58:30 UTC +++ media/mojo/services/gpu_mojo_media_client.cc @@ -55,7 +55,7 @@ namespace media { namespace { @@ -10,8 +10,8 @@ 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))); + 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) 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 64330bb9d846..36519644232a 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-04-30 22:22:53 UTC +--- 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 -@@ -598,7 +598,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -597,7 +597,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 98490d51a42c..0d14b7fefa78 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-06-04 18:55:26 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-07-24 18:58:31 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -41,7 +41,7 @@ +@@ -60,7 +60,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> - <if expr="is_win or is_macosx or is_linux"> + <if expr="is_win or is_macosx or is_posix"> - <include name="IDR_MOJO_TIME_MOJOM_LITE_JS" - file="${root_gen_dir}/mojo/public/mojom/base/time.mojom-lite.js" + <include name="IDR_MOJO_TIME_MOJOM_HTML" + file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.html" use_base_dir="false" diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 5837974110a3..949727df7d09 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2019-06-04 18:55:26 UTC +--- net/BUILD.gn.orig 2019-07-24 18:58:32 UTC +++ net/BUILD.gn @@ -98,7 +98,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1901,7 +1901,7 @@ component("net") { +@@ -1919,7 +1919,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -18,7 +18,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -1994,6 +1994,16 @@ component("net") { +@@ -2012,6 +2012,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 f3cca9e28862..eb5cb5a0171a 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2019-06-04 18:55:26 UTC +--- net/base/network_change_notifier.cc.orig 2019-07-24 18:58:32 UTC +++ net/base/network_change_notifier.cc -@@ -215,7 +215,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +@@ -225,7 +225,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() #elif defined(OS_FUCHSIA) return new NetworkChangeNotifierFuchsia(0 /* required_features */); #else diff --git a/www/chromium/files/patch-net_features.gni b/www/chromium/files/patch-net_features.gni index 949a31c49681..f72e2c847ddb 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-03-11 22:01:01 UTC +--- net/features.gni.orig 2019-07-24 18:58:32 UTC +++ net/features.gni -@@ -27,7 +27,7 @@ declare_args() { +@@ -26,7 +26,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 77ae79d7aad5..668ecfa1c65f 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-04-30 22:22:54 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2019-07-24 18:58:32 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -444,8 +444,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -443,8 +443,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_proxy__resolution_proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc index 4c5413ef8781..29126685627d 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-06-04 18:55:27 UTC +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-07-24 18:58:32 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 { -@@ -1588,7 +1588,7 @@ ProxyResolutionService::CreateSystemProxyConfigService +@@ -1571,7 +1571,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_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 152648e41c6b..34788bd112d1 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-04-30 22:22:55 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-07-24 18:58:33 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -28,7 +28,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,8 +9,8 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -47,7 +47,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ - base::WaitableEvent* initialization_complete_event) { +@@ -49,7 +49,7 @@ void SetUpOnNetworkThread( + base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); -#if defined(OS_LINUX) 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 cfcf0ebc27a1..e79a01ca6cf3 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-04-30 22:22:55 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-07-24 18:58:33 UTC +++ net/tools/quic/quic_http_proxy_backend.cc -@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext +@@ -160,7 +160,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_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index afe3f5437937..7bdf42aa98d1 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-06-04 18:55:27 UTC +--- net/url_request/url_request_context_builder.cc.orig 2019-07-24 18:58:33 UTC +++ net/url_request/url_request_context_builder.cc -@@ -533,7 +533,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -534,7 +534,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. -@@ -542,7 +542,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -543,7 +543,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } 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 a32ad8c4f6e6..d60b26126c50 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-04-30 22:22:56 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2019-07-24 18:58:34 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -117,13 +117,13 @@ +@@ -126,13 +126,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting"; +@@ -167,11 +167,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 -@@ -354,7 +354,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -369,7 +369,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 -@@ -563,10 +563,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -589,10 +589,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; -@@ -760,7 +760,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -788,7 +788,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), -@@ -846,7 +846,7 @@ void HostProcess::StartOnUiThread() { +@@ -874,7 +874,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()-> -@@ -855,7 +855,7 @@ void HostProcess::StartOnUiThread() { +@@ -883,7 +883,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 = -@@ -912,7 +912,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -940,7 +940,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. -@@ -1564,7 +1564,7 @@ void HostProcess::StartHost() { +@@ -1634,7 +1634,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 -@@ -1736,7 +1736,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1819,7 +1819,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-services_content_simple__browser_simple__browser__service.cc b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc index 3b0676568632..5fbe86cba0ff 100644 --- 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 @@ -1,4 +1,4 @@ ---- services/content/simple_browser/simple_browser_service.cc.orig 2019-04-30 22:22:56 UTC +--- 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" @@ -9,7 +9,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" // nogncheck #endif -@@ -27,7 +27,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul +@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul void SimpleBrowserService::OnStart() { if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) { 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 index 899614558c19..e117349b35f1 100644 --- 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 @@ -1,6 +1,6 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC +--- services/content/simple_browser/simple_browser_service.h.orig 2019-07-24 18:58:34 UTC +++ services/content/simple_browser/simple_browser_service.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "services/service_manager/public/cpp/service_binding.h" #include "services/service_manager/public/mojom/service.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #endif -@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe +@@ -45,7 +45,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe // service_manager::Service: void OnStart() override; diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn new file mode 100644 index 000000000000..fa698bc64997 --- /dev/null +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/usb/BUILD.gn.orig 2019-07-29 14:20:42 UTC ++++ services/device/usb/BUILD.gn +@@ -111,7 +111,7 @@ static_library("usb") { + ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if ((is_android || is_chromeos || is_linux) && !is_bsd) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 518017fc4d67..8c70cc7e0a3b 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-06-04 18:55:28 UTC +--- services/network/BUILD.gn.orig 2019-07-24 18:58:34 UTC +++ services/network/BUILD.gn -@@ -247,7 +247,6 @@ jumbo_component("network_service") { +@@ -253,7 +253,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 435d35e5dabf..fe056ef0561f 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,24 +1,6 @@ ---- services/network/network_context.cc.orig 2019-06-04 18:55:28 UTC +--- services/network/network_context.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_context.cc -@@ -132,7 +132,7 @@ - #endif // defined(USE_NSS_CERTS) - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - #include "net/cert/cert_net_fetcher.h" - #include "net/cert_net/cert_net_fetcher_impl.h" - #endif -@@ -618,7 +618,7 @@ NetworkContext::~NetworkContext() { - #endif - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::ShutdownGlobalCertNetFetcher(); - #endif - } -@@ -1764,7 +1764,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -1711,7 +1711,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { @@ -27,12 +9,3 @@ DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -@@ -2090,7 +2090,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar - net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get()); - #endif - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::SetGlobalCertNetFetcher( - net::CreateCertNetFetcher(result.url_request_context.get())); - #endif diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 5363ecc28428..a864991884c2 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-06-04 18:55:28 UTC +--- services/network/network_service.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.cc -@@ -62,7 +62,7 @@ +@@ -60,7 +60,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 -@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() { +@@ -625,7 +625,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 452d04bb3c6c..d4dd082d0540 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,7 +1,7 @@ ---- services/network/network_service.h.orig 2019-06-04 18:55:28 UTC +--- services/network/network_service.h.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.h -@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - #endif // !BUILDFLAG(IS_CT_SUPPORTED) +@@ -176,7 +176,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; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-services_network_public_cpp_features.cc b/www/chromium/files/patch-services_network_public_cpp_features.cc deleted file mode 100644 index eed488de5453..000000000000 --- a/www/chromium/files/patch-services_network_public_cpp_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/network/public/cpp/features.cc.orig 2019-04-30 22:22:56 UTC -+++ services/network/public/cpp/features.cc -@@ -20,7 +20,7 @@ const base::Feature kNetworkErrorLogging{"NetworkError - const base::Feature kNetworkService { - "NetworkService", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - }; - #else 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 new file mode 100644 index 000000000000..f7f75e7ebc91 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -42,7 +42,7 @@ namespace { + uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, + uint32_t shared_resident_kb) { + DCHECK(os_dump.platform_private_footprint); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + 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 + 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); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + os_dump->private_footprint_swap_kb = + internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; + #endif diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index df4eb423e0ea..f8b2542dae6e 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -28,9 +28,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); @@ -21,10 +21,10 @@ // Provides information on the dump state of resident pages. enum class MappedAndResidentPagesDumpState { // Access to /proc/<pid>/pagemap can be denied for android devices running -@@ -65,7 +65,7 @@ class COMPONENT_EXPORT( - const size_t end_address, - std::vector<uint8_t>* accessed_pages_bitmap); - +@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( + // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after + // making sure that peak RSS is useful. + static size_t GetPeakResidentSetSize(base::ProcessId pid); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) }; diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index c3400cbc3097..b38e937afd6f 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -19,8 +19,10 @@ +@@ -22,8 +22,10 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" @@ -11,7 +11,7 @@ namespace memory_instrumentation { -@@ -69,6 +71,7 @@ struct ModuleData { +@@ -86,6 +88,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; @@ -19,7 +19,7 @@ Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { base::debug::ElfBuildIdBuffer build_id; -@@ -79,6 +82,7 @@ ModuleData GetMainModuleData() { +@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { module_data.build_id = std::string(build_id, build_id_length); } } @@ -27,7 +27,7 @@ return module_data; } -@@ -126,14 +130,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. @@ -44,23 +44,26 @@ return res; } -@@ -220,6 +224,10 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) { - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ NOTIMPLEMENTED(); -+ return false; -+#else - base::ScopedFD autoclose = OpenStatm(pid); + // TODO(chiniforooshan): There is no need to read both /statm and /status + // files. Refactor to get everything from /status using ProcessMetric. ++#if !defined(OS_BSD) + auto statm_file = GetProcPidDir(pid).Append("statm"); + auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); +@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, -@@ -267,10 +275,15 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - #endif // defined(OS_ANDROID) - - return true; + if (!success) + return false; ++#else ++ uint64_t resident_pages = 0; ++ uint64_t shared_pages = 0; +#endif - } + + auto process_metrics = CreateProcessMetrics(pid); + +@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { @@ -71,7 +74,7 @@ std::vector<VmRegionPtr> maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -288,6 +301,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa +@@ -310,6 +323,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa return std::vector<VmRegionPtr>(); return maps; @@ -79,7 +82,7 @@ } // static -@@ -295,6 +309,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector<uint8_t>* accessed_pages_bitmap) { @@ -90,11 +93,11 @@ const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -336,6 +354,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; +#endif } - } // namespace memory_instrumentation + // static 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 a234385b060d..3b5397b33b37 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-06-04 18:55:28 UTC +--- services/service_manager/embedder/main.cc.orig 2019-07-24 18:58:35 UTC +++ services/service_manager/embedder/main.cc -@@ -264,7 +264,7 @@ int Main(const MainParams& params) { +@@ -271,7 +271,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 5d77ccaf4b44..b3e7a475e7f0 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-06-04 18:57:56 UTC +--- third_party/angle/BUILD.gn.orig 2019-07-24 19:03:24 UTC +++ third_party/angle/BUILD.gn -@@ -319,6 +319,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -322,6 +322,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,7 +8,7 @@ ] } } -@@ -916,10 +917,6 @@ foreach(is_shared_library, +@@ -929,10 +930,6 @@ foreach(is_shared_library, libs = [] if (is_linux) { sources += util_linux_sources diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp deleted file mode 100644 index 84c27f2ec781..000000000000 --- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2019-04-30 22:25:51 UTC -+++ third_party/angle/src/common/system_utils_posix.cpp -@@ -17,7 +17,7 @@ - - // On mac, environ is not declared anywhere: - // https://stackoverflow.com/a/31347357/912144 --#if defined(ANGLE_PLATFORM_APPLE) -+#if defined(ANGLE_PLATFORM_APPLE) || defined(__FreeBSD__) - extern char **environ; - #endif - diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn new file mode 100644 index 000000000000..aa5fb90a1b0d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/blink/renderer/BUILD.gn.orig 2019-07-29 20:47:32 UTC ++++ third_party/blink/renderer/BUILD.gn +@@ -45,8 +45,8 @@ config("inside_blink") { + "-Wconversion", + "-Wno-float-conversion", + "-Wno-sign-conversion", +- "-Wno-implicit-float-conversion", +- "-Wno-implicit-int-conversion", ++# "-Wno-implicit-float-conversion", ++# "-Wno-implicit-int-conversion", + ] + } + } 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 52d3aa574519..d722560d65a6 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,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC +--- 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 -@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = +@@ -40,7 +40,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ 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 c960ddc9f0d3..3afbacd652da 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,8 +1,8 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC +--- 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 @@ -58,7 +58,7 @@ + #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" - #include "third_party/blink/renderer/platform/transforms/transform_state.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index c90a2e990cf4..1418dc2178fa 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-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -137,6 +137,7 @@ executable("character_data_generator") { +@@ -111,6 +111,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 898a95ad5227..1be1325ae7dc 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-04-30 22:23:02 UTC +--- 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 -@@ -67,7 +67,7 @@ namespace blink { +@@ -72,7 +72,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 -@@ -90,7 +90,7 @@ FontCache::FontCache() +@@ -95,7 +95,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 f3e41fe258ce..aa278a6fdc03 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-04-30 22:23:02 UTC +--- 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 @@ -155,7 +155,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } @@ -27,22 +27,22 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -292,12 +292,12 @@ class PLATFORM_EXPORT FontCache { +@@ -301,12 +301,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority); --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&, - UChar32); -@@ -328,7 +328,7 @@ class PLATFORM_EXPORT FontCache { + scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( + const FontDescription&, +@@ -338,7 +338,7 @@ class PLATFORM_EXPORT FontCache { bool is_test_font_mgr_ = false; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index f2ef075940b9..4445ec96128b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; @@ -18,7 +18,7 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; 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 new file mode 100644 index 000000000000..abf58788f9d5 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h @@ -0,0 +1,78 @@ +--- 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 60496185f038..e42775c2ec2a 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,24 +1,24 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC +--- 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 @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Android special locale for retrieving the color emoji font - // based on the proposed changes in UTR #51 for introducing - // an Emoji script code: -@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // 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( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) void FontCache::PlatformInit() {} -@@ -249,7 +249,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -228,7 +228,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,7 +27,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -276,7 +276,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -255,7 +255,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon CString name; sk_sp<SkTypeface> typeface; diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp new file mode 100644 index 000000000000..0e9aa30717ed --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp @@ -0,0 +1,11 @@ +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC ++++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "core/fxcrt/fx_system.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_ASMJS) || defined(__wasm__) + #include <sys/time.h> + #include <time.h> diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 29e2991ce2c1..05d6c3e28de0 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h -@@ -36,7 +36,7 @@ +@@ -26,7 +26,7 @@ + #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ #elif defined(_WIN64) - #define _FX_OS_ _FX_OS_WIN64_ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - #define _FX_OS_ _FX_OS_LINUX_ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ #elif defined(__APPLE__) + #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp index 5092acc1342f..e0a802df2fbb 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-04-30 22:25:55 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -147,9 +147,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa +@@ -151,9 +151,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa const char** pUserPaths) { auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(pUserPaths)) { diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index ba05a132a557..425ec0a4bc9a 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -34,6 +34,11 @@ double GetLocalTZA() { +@@ -35,6 +35,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -10,11 +10,11 @@ + return (double)(-(lt.tm_gmtoff * 1000)); +#else FXSYS_localtime(&t); - #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -42,6 +47,7 @@ double GetLocalTZA() { +@@ -43,6 +48,7 @@ double GetLocalTZA() { _get_timezone(&timezone); - #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #endif return (double)(-(timezone * 1000)); +#endif // __FreeBSD__ } diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp index 89745ae6447c..af4bafcfee40 100644 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp @@ -1,14 +1,14 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC +++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp -@@ -16,8 +16,9 @@ constexpr char kFolderSeparator = '/'; +@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/'; - constexpr const char* g_FontFolders[] = { + constexpr const char* kFontFolders[] = { #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ -- "/usr/share/fonts", "/usr/share/X11/fonts/Type1", -- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts", +- "/usr/share/fonts", +- "/usr/share/X11/fonts/Type1", +- "/usr/share/X11/fonts/TTF", + "/usr/local/share/fonts/Type1", + "/usr/local/share/fonts/TTF", -+ "/usr/local/share/fonts", - #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", - #elif defined(OS_ANDROID) + "/usr/local/share/fonts", + #elif defined(OS_MACOSX) + "~/Library/Fonts", 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 new file mode 100644 index 000000000000..0fad19aace3f --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp @@ -0,0 +1,19 @@ +--- 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_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index a24c5dbfbc22..2c44e0006792 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-04-30 22:25:55 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -524,7 +524,8 @@ void UnixSocket::DoConnect(const std::string& socket_n +@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n void UnixSocket::ReadPeerCredentials() { #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ 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 ddb94e384164..81284573e619 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-06-04 18:58:01 UTC +--- 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 -@@ -1953,7 +1953,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin +@@ -2053,7 +2053,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin void TracingServiceImpl::UpdateMemoryGuardrail() { #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ @@ -10,7 +10,7 @@ uint64_t total_buffer_bytes = 0; // Sum up all the shared memory buffers. -@@ -2005,7 +2006,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr +@@ -2106,7 +2107,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot(); #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ diff --git a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp index d03c8d261459..4d7db67f8556 100644 --- a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp +++ b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/core/SkCpu.cpp.orig 2019-03-11 22:08:22 UTC +--- third_party/skia/src/core/SkCpu.cpp.orig 2019-07-24 19:03:35 UTC +++ third_party/skia/src/core/SkCpu.cpp -@@ -74,6 +74,8 @@ +@@ -76,6 +76,8 @@ #include <sys/auxv.h> static uint32_t read_cpu_features() { @@ -9,9 +9,9 @@ const uint32_t kHWCAP_CRC32 = (1<< 7), kHWCAP_ASIMDHP = (1<<10); -@@ -82,6 +84,7 @@ - if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; } - if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; } +@@ -112,6 +114,7 @@ + } + } return features; +#endif } diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp deleted file mode 100644 index fbc2c2455aca..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp +++ /dev/null @@ -1,77 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-06-04 18:58:12 UTC -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp -@@ -128,8 +128,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -- , fLCDExtra(0) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; -@@ -189,12 +187,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - #endif - -- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. -- // The default has changed over time, so this doesn't mean the same thing to all users. -- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { -- fIsLCDSupported = true; -- fLCDExtra = 2; //Using a filter adds one full pixel to each side. -- } -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); - } - ~FreeTypeLibrary() { - if (fLibrary) { -@@ -203,8 +196,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - - FT_Library library() { return fLibrary; } -- bool isLCDSupported() { return fIsLCDSupported; } -- int lcdExtra() { return fLCDExtra; } - - // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. - // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -221,8 +212,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - - private: - FT_Library fLibrary; -- bool fIsLCDSupported; -- int fLCDExtra; - - // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. - // The following platforms provide FreeType of at least 2.4.0. -@@ -718,17 +707,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR - rec->fTextSize = SkIntToScalar(1 << 14); - } - -- if (isLCD(*rec)) { -- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. -- SkAutoMutexAcquire ama(gFTMutex); -- ref_ft_library(); -- if (!gFTLibrary->isLCDSupported()) { -- // If the runtime Freetype library doesn't support LCD, disable it here. -- rec->fMaskFormat = SkMask::kA8_Format; -- } -- unref_ft_library(); -- } -- - SkFontHinting h = rec->getHinting(); - if (kFull_SkFontHinting == h && !isLCD(*rec)) { - // collapse full->normal hinting if we're not doing LCD -@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l - void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { - if (glyph->fMaskFormat == SkMask::kLCD16_Format) { - if (fLCDIsVert) { -- glyph->fHeight += gFTLibrary->lcdExtra(); -- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fHeight += 2; -+ glyph->fTop -= 1; - } else { -- glyph->fWidth += gFTLibrary->lcdExtra(); -- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fWidth += 2; -+ glyph->fLeft -= 1; - } - } - } 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 5cf7d9de5ca3..7bb8d3f1aeb9 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,7 +1,7 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-07-24 19:03:37 UTC +++ third_party/skia/src/sksl/SkSLString.h @@ -22,6 +22,8 @@ - #include "SkString.h" + #include "include/core/SkString.h" #endif +#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 747f4d473bb6..0a780974a862 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-03-11 22:01:16 UTC +--- third_party/sqlite/BUILD.gn.orig 2019-07-24 18:59:14 UTC +++ third_party/sqlite/BUILD.gn -@@ -251,7 +251,7 @@ config("sqlite_warnings") { +@@ -258,7 +258,7 @@ config("sqlite_warnings") { ] } } 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 index 3fbc434f09db..ddafc6ba9fdd 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-06-04 18:58:09 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -947,8 +947,6 @@ rtc_static_library("rtc_base") { +@@ -952,8 +952,6 @@ rtc_static_library("rtc_base") { if (rtc_use_x11) { libs += [ @@ -9,7 +9,7 @@ "Xext", "X11", "Xcomposite", -@@ -956,7 +954,7 @@ rtc_static_library("rtc_base") { +@@ -961,7 +959,7 @@ rtc_static_library("rtc_base") { ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index d72e2a3f05fc..126a1b8f615e 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,15 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -66,7 +66,7 @@ typedef void* SockOptArg; +@@ -51,7 +51,7 @@ + #include "rtc_base/null_socket_server.h" + #include "rtc_base/time_utils.h" + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include <linux/sockios.h> + #endif + +@@ -70,7 +70,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -9,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -18,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -313,7 +313,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -36,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -342,7 +342,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -45,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h deleted file mode 100644 index b01596a3dfe6..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC -+++ third_party/webrtc/rtc_base/string_utils.h -@@ -25,11 +25,11 @@ - #endif // WEBRTC_WIN - - #if defined(WEBRTC_POSIX) --#ifdef BSD -+#if defined(WEBRTC_BSD) || defined(BSD) - #include <stdlib.h> --#else // BSD -+#else // WEBRTC_BSD - #include <alloca.h> --#endif // !BSD -+#endif // !WEBRTC_BSD - #include <strings.h> - #endif // WEBRTC_POSIX - diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index d052840249e9..34b612046ca9 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,15 +1,15 @@ ---- tools/gn/build/gen.py.orig 2019-06-04 19:02:25 UTC +--- tools/gn/build/gen.py.orig 2019-07-24 19:05:33 UTC +++ tools/gn/build/gen.py -@@ -44,7 +44,7 @@ class Platform(object): +@@ -46,7 +46,7 @@ class Platform(object): @staticmethod def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd'] +- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd'] ++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd'] def platform(self): return self._platform -@@ -67,6 +67,9 @@ class Platform(object): +@@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): return self._platform == 'aix' @@ -17,9 +17,9 @@ + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -335,6 +338,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 a2799a571432..9096172bd0e5 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-06-04 18:55:48 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-07-24 18:59:16 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -212,6 +212,7 @@ FEATURE_GRAMMAR = ( +@@ -213,6 +213,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index d9ad340d66d8..feeb6cb934a0 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,6 +1,6 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2019-07-24 18:59:17 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -24,6 +24,7 @@ finally: +@@ -33,6 +33,7 @@ finally: _platforms = [ 'android', 'android_webview', diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index a40bc4c2c4bd..40534eb32dbb 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ @@ -9,8 +9,8 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { - +@@ -23,7 +23,7 @@ std::unique_ptr<OSExchangeData::Provider> + OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) return std::make_unique<OSExchangeDataProviderAuraX11>(); -#elif defined(OS_LINUX) 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 c7c978f465e1..d9f731193455 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-03-11 22:01:19 UTC +--- ui/base/resource/resource_bundle.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/resource/resource_bundle.cc -@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() { +@@ -701,7 +701,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -754,7 +754,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_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index d60216d5b592..45f0ca83a151 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/webui/web_ui_util.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/webui/web_ui_util.cc -@@ -217,7 +217,7 @@ std::string GetFontFamily() { +@@ -215,7 +215,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 72991ef3942e..b583fe1ae17a 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-06-04 18:55:50 UTC +--- ui/gfx/BUILD.gn.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/BUILD.gn -@@ -546,7 +546,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -550,7 +550,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index de06f9dd7cc9..5f0bb35c60b5 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/font_render_params.h @@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, @@ -11,8 +11,8 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); - 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 df5d51999fc1..4fdc86dbf2c2 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-06-04 18:55:50 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -18,7 +18,7 @@ IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_MACOSX) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -66,13 +66,13 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) +@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() @@ -28,7 +28,6 @@ IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(size) - IPC_STRUCT_TRAITS_MEMBER(modifier) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(fd) diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index cec7290a738d..049249cc0c7b 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-04-30 22:23:42 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,9 +10,9 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -22,11 +24,7 @@ - #include "base/trace_event/trace_event.h" +@@ -24,11 +26,7 @@ #include "build/build_config.h" + #include "ui/gfx/switches.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -#include <linux/dma-buf.h> diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc index a93da4df5688..a4d70a061747 100644 --- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.cc @@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format); @@ -19,7 +19,7 @@ } bool StructTraits< -@@ -46,7 +46,7 @@ bool StructTraits< +@@ -45,7 +45,7 @@ bool StructTraits< mojo::PlatformHandle handle = mojo::UnwrapPlatformHandle(data.TakeBufferHandle()); @@ -28,8 +28,8 @@ if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -54,7 +54,7 @@ bool StructTraits< - if (!handle.is_valid_handle()) +@@ -53,7 +53,7 @@ bool StructTraits< + if (!handle.is_handle()) return false; out->vmo = zx::vmo(handle.TakeHandle()); -#endif // defined(OS_LINUX) @@ -37,8 +37,8 @@ return true; } -@@ -65,7 +65,7 @@ bool StructTraits< - gfx::NativePixmapHandle* out) { +@@ -71,7 +71,7 @@ bool StructTraits< + out->modifier = data.modifier(); return data.ReadPlanes(&out->planes); } -#endif // defined(OS_LINUX) || defined(USE_OZONE) @@ -46,7 +46,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -78,7 +78,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra +@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: @@ -55,7 +55,7 @@ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -154,7 +154,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat +@@ -160,7 +160,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h index bccdb4cfab6b..3ab3814e827a 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.h -@@ -186,7 +186,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV +@@ -188,7 +188,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV } }; @@ -9,7 +9,7 @@ template <> struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane> { -@@ -218,7 +218,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData +@@ -232,7 +232,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; 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 6784281d8213..23560ca8052f 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-06-04 18:55:50 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -8,7 +8,7 @@ @@ -15,22 +15,22 @@ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, - "gfx::NativePixmapPlane::kNoModifier should be an alias for" + static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -32,7 +32,7 @@ NativePixmapPlane::NativePixmapPlane() +@@ -31,7 +31,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, - uint64_t size, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::ScopedFD fd, + , + base::ScopedFD fd #elif defined(OS_FUCHSIA) - zx::vmo vmo, @@ -42,7 +42,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, + : stride(stride), offset(offset), - size(size), - modifier(modifier) + size(size) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) , 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 ba90f869d574..8cbb59807966 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/native_pixmap_handle.h -@@ -13,7 +13,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "ui/gfx/gfx_export.h" @@ -9,18 +9,18 @@ #include "base/files/scoped_file.h" #endif -@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane { NativePixmapPlane(int stride, int offset, - uint64_t size, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::ScopedFD fd, + , + base::ScopedFD fd #elif defined(OS_FUCHSIA) - zx::vmo vmo, -@@ -58,7 +58,7 @@ struct GFX_EXPORT NativePixmapPlane { - // Chromium code. Also one per plane per entry. - uint64_t modifier; +@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { + // This is necessary to map the buffers. + uint64_t size; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index a805803da0a8..24f52d4575ea 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-03-11 22:01:19 UTC +--- ui/gfx/render_text.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/render_text.cc -@@ -934,32 +934,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -976,32 +976,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 1f6823d1e8eb..4c5e25f11508 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2019-06-04 18:55:50 UTC +--- ui/gl/BUILD.gn.orig 2019-07-24 18:59:22 UTC +++ ui/gl/BUILD.gn @@ -215,7 +215,7 @@ jumbo_component("gl") { ] @@ -9,15 +9,3 @@ # Windows has USE_EGL but doesn't support base::FileDescriptor. # libsync isn't supported or needed on MacOSX. # Fuchsia is excluded due to a libsync dependency and because it's -@@ -274,7 +274,10 @@ jumbo_component("gl") { - "//build/config/linux:xext", - ] - -- deps += [ "//ui/gfx/x" ] -+ deps += [ -+ "//ui/base/x", -+ "//ui/gfx/x", -+ ] - } - if (is_win) { - sources += [ diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index 149d86ea4f43..de633c85c730 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-06-04 18:55:50 UTC +--- ui/gl/generate_bindings.py.orig 2019-07-24 18:59:22 UTC +++ ui/gl/generate_bindings.py -@@ -2683,6 +2683,9 @@ GLX_FUNCTIONS = [ +@@ -2684,6 +2684,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 2c1e9db777e0..d1209044abe8 100644 --- a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc +++ b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc @@ -1,64 +1,14 @@ ---- ui/gl/gl_surface_glx.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gl/gl_surface_glx.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gl/gl_surface_glx.cc -@@ -21,6 +21,7 @@ - #include "base/time/time.h" - #include "base/trace_event/trace_event.h" - #include "build/build_config.h" -+#include "ui/base/x/x11_util.h" - #include "ui/events/platform/platform_event_source.h" - #include "ui/gfx/x/x11.h" - #include "ui/gfx/x/x11_connection.h" -@@ -431,7 +432,9 @@ bool GLSurfaceGLX::InitializeOneOff() { +@@ -431,7 +431,10 @@ bool GLSurfaceGLX::InitializeOneOff() { + return false; } - const XVisualInfo& visual_info = -- gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); -+ ui::IsCompositingManagerPresent() -+ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() -+ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); +- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); ++ const auto& visual_info = ++ ui::IsCompositingManagerPresent() ++ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() ++ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); g_visual = visual_info.visual; g_depth = visual_info.depth; g_colormap = -@@ -581,18 +584,30 @@ bool NativeViewGLSurfaceGLX::Initialize(GLSurfaceForma - } - size_ = gfx::Size(attributes.width, attributes.height); - -- XSetWindowAttributes swa; -- memset(&swa, 0, sizeof(swa)); -- swa.background_pixmap = 0; -- swa.bit_gravity = NorthWestGravity; -- swa.colormap = g_colormap; -- swa.background_pixel = 0; -- swa.border_pixel = 0; -- window_ = XCreateWindow( -- gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, size_.width(), -- size_.height(), 0 /* border_width */, g_depth, InputOutput, g_visual, -- CWBackPixmap | CWBitGravity | CWColormap | CWBackPixel | CWBorderPixel, -- &swa); -+ XSetWindowAttributes swa = { -+ .background_pixmap = 0, -+ .bit_gravity = NorthWestGravity, -+ .colormap = g_colormap, -+ .background_pixel = 0, // ARGB(0,0,0,0) for compositing WM -+ .border_pixel = 0, -+ }; -+ auto value_mask = CWBackPixmap | CWBitGravity | CWColormap | CWBorderPixel; -+ if (ui::IsCompositingManagerPresent() && -+ XVisualIDFromVisual(attributes.visual) == XVisualIDFromVisual(g_visual)) { -+ // When parent and child are using the same visual, the back buffer will be -+ // shared between parent and child. If WM compositing is enabled, we set -+ // child's background pixel to ARGB(0,0,0,0), so ARGB(0,0,0,0) will be -+ // filled to the shared buffer, when the child window is mapped. It can -+ // avoid an annoying flash when the child window is mapped below. -+ // If WM compositing is disabled, we don't set the background pixel, so -+ // nothing will be draw when the child window is mapped. -+ value_mask |= CWBackPixel; -+ } -+ -+ window_ = -+ XCreateWindow(gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, -+ size_.width(), size_.height(), 0 /* border_width */, -+ g_depth, InputOutput, g_visual, value_mask, &swa); - if (!window_) { - LOG(ERROR) << "XCreateWindow failed"; - 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 e850dc111d74..976ae17d1ef9 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-07-24 18:59:22 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() { +@@ -103,7 +103,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.keep_on_top = true; diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index eb6ecd0609e7..ca844a3bcdb8 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-06-04 18:55:50 UTC +--- ui/views/controls/label.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/label.cc -@@ -544,7 +544,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -548,7 +548,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() { +@@ -733,7 +733,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 26815cc6ed89..bc17a9e94d20 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-06-04 18:55:50 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -63,7 +63,7 @@ +@@ -62,7 +62,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" -@@ -166,14 +166,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -165,14 +165,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; -@@ -232,7 +232,7 @@ bool IsControlKeyModifier(int flags) { +@@ -240,7 +240,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; -@@ -667,7 +667,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -675,7 +675,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 -@@ -713,7 +713,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -721,7 +721,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; -@@ -882,7 +882,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -890,7 +890,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2081,7 +2081,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2109,7 +2109,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index b17fad9ff775..bb142c235433 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-06-04 18:55:50 UTC +--- ui/views/examples/widget_example.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/examples/widget_example.cc -@@ -78,7 +78,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -80,7 +80,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_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 2c76de33fe03..20e3d072eec2 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/style/platform_style.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/style/platform_style.cc -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_CHROMEOS) #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 673dc5f85167..96b31d1cba7f 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2019-06-04 18:55:50 UTC +--- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC +++ ui/views/views_delegate.h -@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; 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 index f12471a6e4a1..689d8e6d8f89 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-06-04 18:55:50 UTC +--- 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 -@@ -1423,24 +1423,15 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1463,24 +1463,15 @@ void DesktopWindowTreeHostX11::InitX11Window( if (override_redirect_) attribute_mask |= CWOverrideRedirect; 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 6ff1ea0d53d0..0cd3458e5585 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-06-04 18:55:50 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/window/custom_frame_view.cc -@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -291,7 +291,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index 9f4e8730e896..c9f8d9db27d3 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-03-11 22:01:19 UTC +--- ui/webui/resources/js/cr.js.orig 2019-07-24 18:59:23 UTC +++ ui/webui/resources/js/cr.js -@@ -463,6 +463,11 @@ var cr = cr || function(global) { +@@ -425,6 +425,11 @@ var cr = cr || function(global) { get doc() { return document; }, diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 4aeb39971d63..64c843a118be 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-06-04 18:58:07 UTC +--- v8/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ v8/BUILD.gn -@@ -3474,7 +3474,7 @@ v8_component("v8_libbase") { +@@ -3541,7 +3541,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3494,6 +3494,12 @@ v8_component("v8_libbase") { +@@ -3561,6 +3561,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,8 +22,8 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3721,6 +3727,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho - "src/snapshot/embedded-file-writer.h", +@@ -3818,6 +3824,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho + "src/snapshot/embedded/platform-embedded-file-writer-win.h", "src/snapshot/mksnapshot.cc", ] + libs = ["execinfo"] diff --git a/www/chromium/files/patch-v8_src_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 742d62ae9cb0..cb9ebbb0233d 100644 --- a/www/chromium/files/patch-v8_src_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api.cc.orig 2019-06-04 18:58:07 UTC -+++ v8/src/api.cc -@@ -109,7 +109,7 @@ +--- v8/src/api/api.cc.orig 2019-07-24 19:03:36 UTC ++++ v8/src/api/api.cc +@@ -110,7 +110,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" -@@ -5762,7 +5762,7 @@ bool v8::V8::Initialize() { +@@ -5505,7 +5505,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/chromium/files/patch-v8_src_external-reference-table.cc b/www/chromium/files/patch-v8_src_external-reference-table.cc deleted file mode 100644 index 9ca737217419..000000000000 --- a/www/chromium/files/patch-v8_src_external-reference-table.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC -+++ v8/src/external-reference-table.cc -@@ -9,7 +9,7 @@ - #include "src/external-reference.h" - #include "src/ic/stub-cache.h" - --#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) -+#if defined(DEBUG) && (defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID) - #define SYMBOLIZE_FUNCTION - #include <execinfo.h> - #include <vector> diff --git a/www/chromium/files/patch-v8_src_log-utils.h b/www/chromium/files/patch-v8_src_log-utils.h deleted file mode 100644 index 67b92cd174d1..000000000000 --- a/www/chromium/files/patch-v8_src_log-utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC -+++ v8/src/log-utils.h -@@ -16,6 +16,8 @@ - #include "src/flags.h" - #include "src/ostreams.h" - -+#include <stdarg.h> -+ - namespace v8 { - namespace internal { - diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 3fcaebb1a169..686431396b49 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -7,6 +7,12 @@ bin/chrome %%DATADIR%%/icudtl.dat %%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 @@ -307,6 +313,7 @@ bin/chrome %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js +%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js @@ -314,14 +321,8 @@ bin/chrome %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin -%%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator -%%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so -%%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 %%DRIVER%%bin/chromedriver |