Page MenuHomeFreeBSD
Files F167492390

D23984.id69308.diff
No OneTemporary
Actions

D23984.id69308.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
Index: head/www/chromium/Makefile
===================================================================
--- head/www/chromium/Makefile
+++ head/www/chromium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 79.0.3945.130
+PORTVERSION= 80.0.3987.132
CATEGORIES?= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/cpm/chromium/:fonts
@@ -119,7 +119,6 @@
use_bundled_fontconfig=false \
use_custom_libcxx=false \
use_gnome_keyring=false \
- use_jumbo_build=true \
use_lld=true \
use_sysroot=false \
use_system_freetype=true \
@@ -160,10 +159,10 @@
CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
GN_ARGS+=proprietary_codecs=true \
- GN_ARGS+=enable_hevc_demuxing=true
+ GN_ARGS+=enable_platform_hevc=true
CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
GN_ARGS+=proprietary_codecs=false \
- GN_ARGS+=enable_hevc_demuxing=false
+ GN_ARGS+=enable_platform_hevc=false
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
@@ -259,7 +258,7 @@
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
- ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
+ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
.endif
do-configure:
@@ -301,7 +300,10 @@
.endfor
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
-.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin
+.for d in protoc mksnapshot
+ ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
+.endfor
+.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
Index: head/www/chromium/distinfo
===================================================================
--- head/www/chromium/distinfo
+++ head/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1579261549
-SHA256 (chromium-79.0.3945.130.tar.xz) = 56193431ab9d1193773b133d86b419bfae8d8b9196eea253660895e0e8f87ba0
-SIZE (chromium-79.0.3945.130.tar.xz) = 778319112
-SHA256 (chromium-79.0.3945.130-testdata.tar.xz) = da0b544e2f9a3022c5120a0dc21b945e4565e7e4b64f086eefd720e2c1e516d8
-SIZE (chromium-79.0.3945.130-testdata.tar.xz) = 252386344
+TIMESTAMP = 1583291717
+SHA256 (chromium-80.0.3987.132.tar.xz) = 2c0012059046a5a7e2bf6e9502f1898f1953226d63b724b82fc18226e285c201
+SIZE (chromium-80.0.3987.132.tar.xz) = 796975056
+SHA256 (chromium-80.0.3987.132-testdata.tar.xz) = 6cbe559778ab75386c90b2de29416bc63b5b6d5b1232876b6a7626359362a91b
+SIZE (chromium-80.0.3987.132-testdata.tar.xz) = 251267384
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
Index: head/www/chromium/files/patch-BUILD.gn
===================================================================
--- head/www/chromium/files/patch-BUILD.gn
+++ head/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2019-12-16 21:51:21 UTC
+--- BUILD.gn.orig 2020-03-03 18:53:46 UTC
+++ BUILD.gn
@@ -411,7 +411,7 @@ group("gn_all") {
]
@@ -57,7 +57,7 @@
]
if (is_desktop_linux && use_ozone) {
deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -905,7 +894,6 @@ if (is_chromeos) {
+@@ -918,7 +907,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",
-@@ -1076,7 +1064,7 @@ if (!is_ios) {
+@@ -1069,7 +1057,7 @@ if (!is_ios) {
]
}
@@ -74,7 +74,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1085,7 +1073,7 @@ if (!is_ios) {
+@@ -1078,7 +1066,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)" ]
}
-@@ -1227,9 +1215,6 @@ group("chromium_builder_perf") {
+@@ -1220,9 +1208,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
Index: head/www/chromium/files/patch-ash_display_mirror__window__controller.cc
===================================================================
--- head/www/chromium/files/patch-ash_display_mirror__window__controller.cc
+++ head/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC
+--- ash/display/mirror_window_controller.cc.orig 2020-03-03 18:53:46 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -298,7 +298,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
CloseAndDeleteHost(iter->second, true);
Index: head/www/chromium/files/patch-base_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-base_BUILD.gn
+++ head/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2019-12-16 21:51:21 UTC
+--- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC
+++ base/BUILD.gn
-@@ -1274,7 +1274,7 @@ jumbo_component("base") {
+@@ -1302,7 +1302,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" ]
}
-@@ -1300,7 +1300,7 @@ jumbo_component("base") {
+@@ -1328,7 +1328,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 += [
-@@ -1903,6 +1903,33 @@ jumbo_component("base") {
+@@ -1919,6 +1919,33 @@ jumbo_component("base") {
}
}
@@ -51,10 +51,10 @@
+
# iOS
if (is_ios) {
- set_sources_assignment_filter([])
-@@ -3071,6 +3098,12 @@ test("base_unittests") {
- ]
- set_sources_assignment_filter(sources_assignment_filter)
+ sources -= [
+@@ -3069,6 +3096,12 @@ test("base_unittests") {
+
+ manifest = "//build/config/fuchsia/tests.cmx"
}
+
+ if (is_bsd) {
@@ -63,5 +63,5 @@
+ ]
+ }
- if (is_win) {
- deps += [ "//base:scoped_handle_test_dll" ]
+ if (!is_fuchsia && !is_ios) {
+ sources += [ "files/file_locking_unittest.cc" ]
Index: head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
===================================================================
--- head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
+++ head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
@@ -1,7 +1,7 @@
---- 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.orig 2020-03-03 18:52:59 UTC
+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
-@@ -5,18 +5,28 @@
- #include "base/allocator/allocator_shim.h"
+@@ -6,18 +6,28 @@
+ #include "base/compiler_specific.h"
#include <dlfcn.h>
-#include <malloc.h>
@@ -36,7 +36,7 @@
} // extern "C"
namespace {
-@@ -24,32 +34,32 @@ namespace {
+@@ -25,32 +35,32 @@ namespace {
using base::allocator::AllocatorDispatch;
void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) {
@@ -73,4 +73,4 @@
+ __free(address);
}
- size_t GlibcGetSizeEstimate(const AllocatorDispatch*,
+ NO_SANITIZE("cfi-icall")
Index: head/www/chromium/files/patch-base_debug_elf__reader.cc
===================================================================
--- head/www/chromium/files/patch-base_debug_elf__reader.cc
+++ head/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -1,18 +1,18 @@
---- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC
+--- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC
+++ base/debug/elf_reader.cc
-@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
- reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
+@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
bool found = false;
- while (current_note < section_end) {
+ while (current_section < section_end) {
+ current_note = reinterpret_cast<const Nhdr*>(current_section);
+#if !defined(OS_BSD)
if (current_note->n_type == NT_GNU_BUILD_ID) {
- const char* note_name =
- reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
-@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+ StringPiece note_name(current_section + sizeof(Nhdr),
+ current_note->n_namesz);
+@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
break;
}
}
+#endif
- current_note = reinterpret_cast<const Nhdr*>(
- reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
+ size_t section_size = bits::Align(current_note->n_namesz, 4) +
+ bits::Align(current_note->n_descsz, 4) +
Index: head/www/chromium/files/patch-base_files_file__util__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_files_file__util__posix.cc
+++ head/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig 2019-12-16 21:51:21 UTC
+--- base/files/file_util_posix.cc.orig 2020-03-03 18:52:59 UTC
+++ base/files/file_util_posix.cc
-@@ -435,7 +435,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
}
bool CreateLocalNonBlockingPipe(int fds[2]) {
Index: head/www/chromium/files/patch-base_i18n_icu__util.cc
===================================================================
--- head/www/chromium/files/patch-base_i18n_icu__util.cc
+++ head/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,20 +1,20 @@
--- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC
+++ base/i18n/icu_util.cc
-@@ -20,7 +20,7 @@
- #include "build/build_config.h"
- #include "third_party/icu/source/common/unicode/putil.h"
- #include "third_party/icu/source/common/unicode/udata.h"
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
-+#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
- #include "third_party/icu/source/i18n/unicode/timezone.h"
+@@ -43,7 +43,7 @@
#endif
-@@ -365,7 +365,7 @@ bool InitializeICU() {
- // TODO(jungshik): Some callers do not care about tz at all. If necessary,
- // add a boolean argument to this function to init'd the default tz only
- // when requested.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- if (result)
- std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
+ #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+- (defined(OS_LINUX) && !defined(IS_CHROMECAST))
++ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
+ #include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
+
+@@ -288,7 +288,7 @@ void InitializeIcuTimeZone() {
+ fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
+ icu::TimeZone::adoptDefault(
+ icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
+-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
++#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
+ // To respond to the timezone change properly, the default timezone
+ // cache in ICU has to be populated on starting up.
+ // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
Index: head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -0,0 +1,11 @@
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-03 18:53:47 UTC
++++ base/memory/madv_free_discardable_memory_posix.cc
+@@ -267,7 +267,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+
+ bool MadvFreeDiscardableMemoryPosix::IsResident() const {
+ DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
+-#ifdef OS_MACOSX
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ std::vector<char> vec(allocated_pages_);
+ #else
+ std::vector<unsigned char> vec(allocated_pages_);
Index: head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
===================================================================
--- head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
+++ head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
@@ -1,6 +1,6 @@
---- base/memory/platform_shared_memory_region.h.orig 2019-09-16 12:06:15 UTC
+--- base/memory/platform_shared_memory_region.h.orig 2020-03-03 18:52:59 UTC
+++ base/memory/platform_shared_memory_region.h
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
#include "base/files/scoped_file.h"
#endif
@@ -9,7 +9,7 @@
namespace content {
class SandboxIPCHandler;
}
-@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
@@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
-@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size
Index: head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
+++ head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
@@ -1,6 +1,6 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig 2019-09-16 12:05:39 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-03-03 18:52:59 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
-@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const {
+@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const {
return {fd.get(), readonly_fd.get()};
}
@@ -9,7 +9,7 @@
// static
ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
PlatformSharedMemoryRegion region =
-@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
+@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
return region.PassPlatformHandle().fd;
return ScopedFD();
}
@@ -18,7 +18,7 @@
// static
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
-@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
// static
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
size_t size
@@ -27,7 +27,7 @@
,
bool executable
#endif
-@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
// flag.
FilePath directory;
if (!GetShmemTempDir(
Index: head/www/chromium/files/patch-base_process_launch.h
===================================================================
--- head/www/chromium/files/patch-base_process_launch.h
+++ head/www/chromium/files/patch-base_process_launch.h
@@ -1,6 +1,6 @@
---- base/process/launch.h.orig 2019-06-04 18:55:15 UTC
+--- base/process/launch.h.orig 2020-03-03 18:52:59 UTC
+++ base/process/launch.h
-@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // OS_WIN || OS_POSIX || OS_FUCHSIA
@@ -9,7 +9,7 @@
// If non-zero, start the process using clone(), using flags as provided.
// Unlike in clone, clone_flags may not contain a custom termination signal
// that is sent to the parent when the child dies. The termination signal will
-@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions {
// Sets parent process death signal to SIGKILL.
bool kill_on_parent_death = false;
Index: head/www/chromium/files/patch-base_profiler_register__context.h
===================================================================
--- head/www/chromium/files/patch-base_profiler_register__context.h
+++ head/www/chromium/files/patch-base_profiler_register__context.h
@@ -0,0 +1,60 @@
+--- base/profiler/register_context.h.orig 2020-03-03 18:53:47 UTC
++++ base/profiler/register_context.h
+@@ -17,7 +17,7 @@
+ #include <windows.h>
+ #elif defined(OS_MACOSX)
+ #include <mach/machine/thread_status.h>
+-#elif defined(OS_ANDROID) || defined(OS_LINUX)
++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/ucontext.h>
+ #endif
+
+@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
+ }
+
+ #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
++
++#elif defined(OS_FREEBSD)
++
++using RegisterContext = mcontext_t;
++
++#if defined(ARCH_CPU_X86_64)
++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_rsp);
++}
++
++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_rbp);
++}
++
++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_rip);
++}
++#elif defined(ARCH_CPU_X86)
++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_esp);
++}
++
++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_ebp);
++}
++
++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_eip);
++}
++#elif defined(ARCH_CPU_ARM64)
++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_gpregs.gp_sp);
++}
++
++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_gpregs.gp_x[29]);
++}
++
++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
++ return AsUintPtr(&context->mc_gpregs.gp_elr);
++}
++#endif
+
+ #else // #if defined(OS_WIN)
+
Index: head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
===================================================================
--- head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
+++ head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
@@ -0,0 +1,20 @@
+--- base/profiler/sampling_profiler_thread_token.h.orig 2020-03-05 05:52:21 UTC
++++ base/profiler/sampling_profiler_thread_token.h
+@@ -9,7 +9,7 @@
+ #include "base/threading/platform_thread.h"
+ #include "build/build_config.h"
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ #include <pthread.h>
+ #endif
+
+@@ -21,7 +21,7 @@ namespace base {
+ // functions used to obtain the stack base address.
+ struct SamplingProfilerThreadToken {
+ PlatformThreadId id;
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ pthread_t pthread_id;
+ #endif
+ };
Index: head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
===================================================================
--- head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
+++ head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
@@ -0,0 +1,11 @@
+--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-03-03 18:52:59 UTC
++++ base/profiler/sampling_profiler_thread_token.cc
+@@ -7,7 +7,7 @@
+ namespace base {
+
+ SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ return {PlatformThread::CurrentId(), pthread_self()};
+ #else
+ return {PlatformThread::CurrentId()};
Index: head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
===================================================================
--- head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
+++ head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
@@ -0,0 +1,65 @@
+--- base/profiler/stack_copier_signal.cc.orig 2020-03-03 18:53:47 UTC
++++ base/profiler/stack_copier_signal.cc
+@@ -4,10 +4,16 @@
+
+ #include "base/profiler/stack_copier_signal.h"
+
++#if defined(OS_LINUX)
+ #include <linux/futex.h>
++#include <syscall.h>
++#elif defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <sys/thr.h>
++#include <sys/umtx.h>
++#endif
+ #include <signal.h>
+ #include <sys/ucontext.h>
+-#include <syscall.h>
+
+ #include <atomic>
+
+@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent {
+ // for a pthread mutex. So, also check the condition.
+ while (true) {
+ int res =
++#if defined(OS_LINUX)
+ syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
+ 0, nullptr, nullptr, 0);
++#elif defined(OS_FREEBSD)
++ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr,
++ nullptr);
++#endif
+ if (futex_.load(std::memory_order_acquire) != 0)
+ return true;
+ if (res != 0)
+@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent {
+
+ void Signal() {
+ futex_.store(1, std::memory_order_release);
++#if defined(OS_LINUX)
+ syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1,
+ nullptr, nullptr, 0);
++#elif defined(OS_FREEBSD)
++ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr);
++#endif
+ }
+
+ private:
+@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
+ if (!scoped_sigaction.succeeded())
+ return false;
+
++#if defined(OS_LINUX)
+ if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(),
+ SIGURG) != 0) {
+ NOTREACHED();
+ return false;
+ }
++#elif defined(OS_FREEBSD)
++ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) {
++ return false;
++ }
++#endif
+ bool finished_waiting = wait_event.Wait();
+ TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"),
+ "StackCopierSignal copy stack");
Index: head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
+++ head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
@@ -0,0 +1,63 @@
+--- base/profiler/thread_delegate_posix.cc.orig 2020-03-03 18:53:47 UTC
++++ base/profiler/thread_delegate_posix.cc
+@@ -3,6 +3,9 @@
+ // found in the LICENSE file.
+
+ #include <pthread.h>
++#if defined(__FreeBSD__)
++#include <pthread_np.h>
++#endif
+
+ #include "base/process/process_handle.h"
+ #include "base/profiler/thread_delegate_posix.h"
+@@ -17,12 +20,20 @@ namespace {
+ uintptr_t GetThreadStackBaseAddressImpl(
+ SamplingProfilerThreadToken thread_token) {
+ pthread_attr_t attr;
++#if defined(OS_FREEBSD)
++ pthread_attr_init(&attr);
++ pthread_attr_get_np(thread_token.pthread_id, &attr);
++#elif defined(OS_LINUX)
+ pthread_getattr_np(thread_token.pthread_id, &attr);
++#endif
+ // See crbug.com/617730 for limitations of this approach on Linux.
+ void* address;
+ size_t size;
+ pthread_attr_getstack(&attr, &address, &size);
+ const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
++#if defined(OS_FREEBSD)
++ pthread_attr_destroy(&attr);
++#endif
+ return base_address;
+ }
+
+@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
+ for (size_t i = 19; i <= 29; ++i)
+ registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
+ return registers;
+-#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) &&
+- // defined(ARCH_CPU_32_BITS)
++#elif defined(ARCH_CPU_X86_64)
+ return {
+ // Return the set of callee-save registers per the x86-64 System V ABI
+ // section 3.2.1, plus the stack pointer.
++#if defined(OS_FREEBSD)
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15),
++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp),
++#else
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
+@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
+ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
++#endif
+ };
+ #else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
+ // Unimplemented for other architectures.
Index: head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc
===================================================================
--- head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc
+++ head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc
@@ -1,6 +1,6 @@
--- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC
+++ base/test/fontconfig_util_linux.cc
-@@ -6,24 +6,397 @@
+@@ -6,22 +6,397 @@
#include <fontconfig/fontconfig.h>
@@ -386,8 +386,6 @@
+ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr);
- std::unique_ptr<Environment> env(Environment::Create());
-- // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf.
-- // Prevent fontconfig from doing this.
- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));
+ // Write the data to a different file and then atomically rename it to
+ // fonts.conf. This avoids the file being in a bad state when different
Index: head/www/chromium/files/patch-base_test_test__file__util__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_test_test__file__util__posix.cc
+++ head/www/chromium/files/patch-base_test_test__file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC
+--- base/test/test_file_util_posix.cc.orig 2020-03-03 18:52:59 UTC
+++ base/test/test_file_util_posix.cc
-@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() {
+@@ -84,7 +84,7 @@ void SyncPageCacheToDisk() {
sync();
}
Index: head/www/chromium/files/patch-base_threading_platform__thread.h
===================================================================
--- head/www/chromium/files/patch-base_threading_platform__thread.h
+++ head/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,6 +1,15 @@
---- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC
+--- base/threading/platform_thread.h.orig 2020-03-03 18:52:59 UTC
+++ base/threading/platform_thread.h
-@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread {
+@@ -36,6 +36,8 @@ typedef DWORD PlatformThreadId;
+ typedef zx_handle_t PlatformThreadId;
+ #elif defined(OS_MACOSX)
+ typedef mach_port_t PlatformThreadId;
++#elif defined(OS_FREEBSD)
++typedef long PlatformThreadId;
+ #elif defined(OS_POSIX)
+ typedef pid_t PlatformThreadId;
+ #endif
+@@ -221,7 +223,7 @@ class BASE_EXPORT PlatformThread {
static ThreadPriority GetCurrentThreadPriority();
Index: head/www/chromium/files/patch-base_threading_platform__thread__posix.cc
===================================================================
--- head/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ head/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,6 +1,17 @@
---- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC
+--- base/threading/platform_thread_posix.cc.orig 2020-03-03 18:53:47 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) {
+@@ -32,6 +32,10 @@
+ #include <sys/syscall.h>
+ #endif
+
++#if defined(OS_FREEBSD)
++#include <sys/thr.h>
++#endif
++
+ #if defined(OS_FUCHSIA)
+ #include <zircon/process.h>
+ #else
+@@ -66,7 +70,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::ThreadRestrictions::SetSingletonAllowed(false);
@@ -9,3 +20,14 @@
// Threads on linux/android may inherit their priority from the thread
// where they were created. This explicitly sets the priority of all new
// threads.
+@@ -188,6 +192,10 @@ PlatformThreadId PlatformThread::CurrentId() {
+ return g_thread_id;
+ #elif defined(OS_ANDROID)
+ return gettid();
++#elif defined(OS_FREEBSD)
++ long x;
++ thr_self(&x);
++ return x;
+ #elif defined(OS_FUCHSIA)
+ return zx_thread_self();
+ #elif defined(OS_SOLARIS) || defined(OS_QNX)
Index: head/www/chromium/files/patch-build_config_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-build_config_BUILD.gn
+++ head/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig 2019-10-21 19:06:18 UTC
+--- build/config/BUILD.gn.orig 2020-03-03 18:53:47 UTC
+++ build/config/BUILD.gn
-@@ -149,7 +149,7 @@ config("debug") {
+@@ -133,7 +133,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?
-@@ -247,9 +247,7 @@ config("default_libs") {
+@@ -231,9 +231,7 @@ config("default_libs") {
]
} else if (is_linux) {
libs = [
@@ -19,7 +19,7 @@
]
}
}
-@@ -337,7 +335,7 @@ config("executable_config") {
+@@ -321,7 +319,7 @@ config("executable_config") {
"//build/config/ios:ios_dynamic_flags",
"//build/config/ios:ios_executable_flags",
]
Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2019-12-16 21:51:21 UTC
+--- build/config/compiler/BUILD.gn.orig 2020-03-03 18:53:47 UTC
+++ build/config/compiler/BUILD.gn
@@ -57,7 +57,7 @@ declare_args() {
# only two architectures that are currently checked in). Turn this off when
@@ -9,7 +9,7 @@
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)
-@@ -303,7 +303,7 @@ config("compiler") {
+@@ -308,7 +308,7 @@ config("compiler") {
# Linker warnings.
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
@@ -18,7 +18,7 @@
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
ldflags += [ "-Wl,--fatal-warnings" ]
}
-@@ -398,7 +398,7 @@ config("compiler") {
+@@ -403,7 +403,7 @@ config("compiler") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
@@ -27,7 +27,7 @@
ldflags += [
"-Wl,-z,defs",
"-Wl,--as-needed",
-@@ -498,7 +498,7 @@ config("compiler") {
+@@ -503,7 +503,7 @@ config("compiler") {
}
}
@@ -36,7 +36,7 @@
cflags += [ "-fcrash-diagnostics-dir=" +
rebase_path("//tools/clang/crashreports", root_build_dir) ]
-@@ -768,7 +768,7 @@ config("compiler_cpu_abi") {
+@@ -773,7 +773,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -45,7 +45,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1119,7 +1119,7 @@ config("compiler_deterministic") {
+@@ -1124,7 +1124,7 @@ config("compiler_deterministic") {
"-Xclang",
".",
]
@@ -54,7 +54,7 @@
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
}
-@@ -1508,7 +1508,7 @@ config("default_warnings") {
+@@ -1513,7 +1513,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 += [
-@@ -1738,7 +1738,7 @@ config("thin_archive") {
+@@ -1761,7 +1761,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" ]
-@@ -2328,7 +2328,7 @@ config("symbols") {
+@@ -2351,7 +2351,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) {
-@@ -2349,7 +2349,7 @@ config("symbols") {
+@@ -2372,7 +2372,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" &&
Index: head/www/chromium/files/patch-build_config_compiler_compiler.gni
===================================================================
--- head/www/chromium/files/patch-build_config_compiler_compiler.gni
+++ head/www/chromium/files/patch-build_config_compiler_compiler.gni
@@ -1,6 +1,6 @@
---- build/config/compiler/compiler.gni.orig 2019-12-16 21:51:21 UTC
+--- build/config/compiler/compiler.gni.orig 2020-03-03 18:53:47 UTC
+++ build/config/compiler/compiler.gni
-@@ -192,7 +192,7 @@ declare_args() {
+@@ -187,7 +187,7 @@ declare_args() {
declare_args() {
# Whether to use the gold linker from binutils instead of lld or bfd.
use_gold =
Index: head/www/chromium/files/patch-build_linux_unbundle_libxml.gn
===================================================================
--- head/www/chromium/files/patch-build_linux_unbundle_libxml.gn
+++ head/www/chromium/files/patch-build_linux_unbundle_libxml.gn
@@ -0,0 +1,53 @@
+--- build/linux/unbundle/libxml.gn.orig 2020-03-03 18:53:47 UTC
++++ build/linux/unbundle/libxml.gn
+@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
+ packages = [ "libxml-2.0" ]
+ }
+
+-static_library("libxml") {
++source_set("libxml") {
++ public_configs = [ ":system_libxml" ]
++}
++
++static_library("libxml_utils") {
++ # Do not expand this visibility list without first consulting with the
++ # Security Team.
++ visibility = [
++ ":xml_reader",
++ ":xml_writer",
++ "//base/test:test_support",
++ "//services/data_decoder:xml_parser_fuzzer",
++ ]
+ sources = [
+ "chromium/libxml_utils.cc",
+ "chromium/libxml_utils.h",
+ ]
+-
+ public_configs = [ ":system_libxml" ]
++}
++
++static_library("xml_reader") {
++ # Do not expand this visibility list without first consulting with the
++ # Security Team.
++ visibility = [
++ "//base/test:test_support",
++ "//components/policy/core/common:unit_tests",
++ "//services/data_decoder:*",
++ "//tools/traffic_annotation/auditor:auditor_sources",
++ ]
++ sources = [
++ "chromium/xml_reader.cc",
++ "chromium/xml_reader.h",
++ ]
++ deps = [ ":libxml_utils" ]
++}
++
++static_library("xml_writer") {
++ # The XmlWriter is considered safe to use from any target.
++ visibility = [ "*" ]
++ sources = [
++ "chromium/xml_writer.cc",
++ "chromium/xml_writer.h",
++ ]
++ deps = [ ":libxml_utils" ]
+ }
Index: head/www/chromium/files/patch-cc_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-cc_BUILD.gn
+++ head/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2019-12-16 21:51:21 UTC
+--- cc/BUILD.gn.orig 2020-03-03 18:53:47 UTC
+++ cc/BUILD.gn
-@@ -576,7 +576,7 @@ cc_test_static_library("test_support") {
+@@ -578,7 +578,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [
"//third_party/mesa_headers",
]
-@@ -780,9 +780,6 @@ cc_test("cc_unittests") {
+@@ -783,9 +783,6 @@ cc_test("cc_unittests") {
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
Index: head/www/chromium/files/patch-cc_trees_property__tree.cc
===================================================================
--- head/www/chromium/files/patch-cc_trees_property__tree.cc
+++ head/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig 2019-12-16 21:51:22 UTC
+--- cc/trees/property_tree.cc.orig 2020-03-03 18:53:47 UTC
+++ cc/trees/property_tree.cc
-@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1234,13 +1234,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
Index: head/www/chromium/files/patch-chrome_app_chrome__command__ids.h
===================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__command__ids.h
+++ head/www/chromium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,6 +1,6 @@
---- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC
+--- chrome/app/chrome_command_ids.h.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/chrome_command_ids.h
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
Index: head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc
===================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc
+++ head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-12-16 21:51:22 UTC
+--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/chrome_content_browser_overlay_manifest.cc
-@@ -70,7 +70,7 @@
+@@ -60,7 +60,7 @@
#include "chrome/browser/ui/webui/app_management/app_management.mojom.h"
#endif
@@ -9,7 +9,7 @@
defined(OS_CHROMEOS)
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#endif
-@@ -189,7 +189,7 @@ const service_manager::Manifest& GetChromeContentBrows
+@@ -145,7 +145,7 @@ const service_manager::Manifest& GetChromeContentBrows
#else
app_management::mojom::PageHandlerFactory,
#endif
Index: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
===================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig 2019-12-16 21:51:22 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -100,7 +100,7 @@
#include "chrome/app/shutdown_signal_handlers_posix.h"
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -139,7 +139,7 @@
+@@ -142,7 +142,7 @@
#include "v8/include/v8.h"
#endif
@@ -18,7 +18,7 @@
#include "base/environment.h"
#endif
-@@ -243,7 +243,7 @@ bool UseHooks() {
+@@ -246,7 +246,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;
-@@ -302,13 +302,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
if (score > -1)
base::AdjustOOMScore(base::GetCurrentProcId(), score);
}
@@ -43,7 +43,7 @@
// The zygote process opens the resources for the renderers.
process_type == service_manager::switches::kZygoteProcess ||
#endif
-@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
return false;
}
@@ -52,7 +52,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
-@@ -357,7 +357,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
PLOG(FATAL) << "execlp failed";
}
}
@@ -61,7 +61,7 @@
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
void SIGTERMProfilingShutdown(int signal) {
-@@ -411,7 +411,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -70,7 +70,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -423,7 +423,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
}
}
@@ -79,7 +79,7 @@
#if defined(OS_MACOSX)
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
#endif // OS_MAC
-@@ -480,7 +480,7 @@ void InitLogging(const std::string& process_type) {
+@@ -483,7 +483,7 @@ void InitLogging(const std::string& process_type) {
void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
if (!exe_entry_point_ticks.is_null())
startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@@ -88,7 +88,7 @@
// Record the startup process creation time on supported platforms.
startup_metric_utils::RecordStartupProcessCreationTime(
base::Process::Current().CreationTime());
-@@ -665,7 +665,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -684,7 +684,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
*exit_code = 0;
return true; // Got a --version switch; exit with a success error code.
}
@@ -97,7 +97,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -689,7 +689,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -708,7 +708,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if defined(OS_CHROMEOS)
chromeos::RegisterPathProvider();
#endif
@@ -106,7 +106,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -883,7 +883,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -902,7 +902,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
#if defined(OS_WIN)
child_process_logging::Init();
#endif
@@ -115,7 +115,7 @@
// Create an instance of the CPU class to parse /proc/cpuinfo and cache
// cpu_brand info.
base::CPU cpu_info;
-@@ -1007,7 +1007,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1026,7 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitializePDF();
#endif
@@ -124,7 +124,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
}
#endif // defined(OS_ANDROID)
}
@@ -133,7 +133,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -1038,7 +1038,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1057,7 +1057,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.
Index: head/www/chromium/files/patch-chrome_app_chromium__strings.grd
===================================================================
--- head/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig 2019-12-16 21:51:22 UTC
+--- chrome/app/chromium_strings.grd.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/chromium_strings.grd
-@@ -602,7 +602,7 @@ Chromium is unable to recover your settings.
+@@ -623,7 +623,7 @@ Chromium is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
@@ -9,7 +9,7 @@
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
-@@ -713,7 +713,7 @@ Chromium is unable to recover your settings.
+@@ -727,7 +727,7 @@ Chromium is unable to recover your settings.
</message>
<!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
</message>
-@@ -946,7 +946,7 @@ Chromium is unable to recover your settings.
+@@ -960,7 +960,7 @@ Chromium is unable to recover your settings.
</message>
<!-- Plugin Placeholders -->
Index: head/www/chromium/files/patch-chrome_app_generated__resources.grd
===================================================================
--- head/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ head/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig 2019-12-16 21:51:22 UTC
+--- chrome/app/generated_resources.grd.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/generated_resources.grd
-@@ -4922,7 +4922,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5008,7 +5008,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>
-@@ -6571,7 +6571,7 @@ the Bookmarks menu.">
+@@ -6712,7 +6712,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>
-@@ -7521,7 +7521,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7669,7 +7669,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
Index: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
===================================================================
--- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig 2019-12-16 21:51:22 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2020-03-03 18:53:48 UTC
+++ chrome/app/google_chrome_strings.grd
-@@ -614,7 +614,7 @@ Google Chrome is unable to recover your settings.
+@@ -635,7 +635,7 @@ Google Chrome is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
@@ -9,7 +9,7 @@
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
-@@ -725,7 +725,7 @@ Google Chrome is unable to recover your settings.
+@@ -739,7 +739,7 @@ Google Chrome is unable to recover your settings.
</message>
<!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
</message>
-@@ -965,7 +965,7 @@ Google Chrome is unable to recover your settings.
+@@ -979,7 +979,7 @@ Google Chrome is unable to recover your settings.
</message>
<!-- Plugin Placeholders -->
Index: head/www/chromium/files/patch-chrome_app_settings__strings.grdp
===================================================================
--- head/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2019-12-16 21:51:23 UTC
+--- chrome/app/settings_strings.grdp.orig 2020-03-03 18:53:51 UTC
+++ chrome/app/settings_strings.grdp
-@@ -760,7 +760,7 @@
+@@ -784,7 +784,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>
-@@ -774,7 +774,7 @@
+@@ -798,7 +798,7 @@
Use Classic
</message>
</if>
Index: head/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
===================================================================
--- head/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
+++ head/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
@@ -9,12 +9,3 @@
<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>
-@@ -109,7 +109,7 @@
- <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
- <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
- </if>
-- <if expr="is_linux and enable_app_list">
-+ <if expr="is_posix and enable_app_list">
- <!-- App Launcher icons for desktop icon. -->
- <if expr="_google_chrome">
- <then>
Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/about_flags.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/about_flags.cc
-@@ -164,7 +164,7 @@
+@@ -166,7 +166,7 @@
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
@@ -9,25 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -715,7 +715,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::
-@@ -762,7 +762,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, "", ""},
-@@ -815,7 +815,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -804,7 +804,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
heap_profiling::kMemlogSamplingRate5MB},
};
@@ -36,34 +18,16 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -853,7 +853,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
- base::size(kOmniboxDocumentProviderClientScoring), nullptr},
- {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
- base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- #ifdef OS_ANDROID
- const FeatureEntry::FeatureParam kOmniboxNTPZPSLocal[] = {
-@@ -967,7 +967,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+@@ -956,7 +956,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}};
-@@ -983,7 +983,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 kMarkHttpAsDangerous[] = {
- {security_state::features::kMarkHttpAsFeatureParameterName,
-@@ -1913,13 +1913,13 @@ const FeatureEntry kFeatureEntries[] = {
+ const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = {
+ {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}};
+@@ -1981,13 +1981,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCloudPrintXpsDescription, kOsWin,
SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
#endif // OS_WIN
@@ -79,7 +43,7 @@
{"enable-webgl-draft-extensions",
flag_descriptions::kWebglDraftExtensionsName,
flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -1971,14 +1971,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2031,14 +2031,14 @@ const FeatureEntry kFeatureEntries[] = {
"OverrideTranslateTriggerInIndia")},
#endif // OS_ANDROID
@@ -96,16 +60,7 @@
#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
{"enable-native-notifications",
-@@ -2044,7 +2044,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
- #endif // OS_CHROMEOS
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- {"terminal-system-app", flag_descriptions::kTerminalSystemAppName,
- flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kTerminalSystemApp)},
-@@ -2053,7 +2053,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2119,7 +2119,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
#endif // BUILDFLAG(USE_TCMALLOC)
@@ -114,7 +69,7 @@
#if defined(OS_ANDROID)
{"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
-@@ -2131,7 +2131,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2197,7 +2197,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
#endif // OS_ANDROID
@@ -123,16 +78,16 @@
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
SINGLE_VALUE_TYPE(
-@@ -2810,7 +2810,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
+@@ -2858,7 +2858,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kOmniboxExperimentalSuggestScoringDescription, kOsAll,
+ FEATURE_VALUE_TYPE(omnibox::kOmniboxExperimentalSuggestScoring)},
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2850,7 +2850,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2903,7 +2903,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOmniboxAutocompleteTitlesName,
flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},
@@ -141,7 +96,7 @@
{"enable-speculative-service-worker-start-on-query-input",
flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3084,13 +3084,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3136,13 +3136,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kClickToOpenPDFDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
@@ -157,7 +112,7 @@
#if !defined(OS_ANDROID)
{"chrome-colors", flag_descriptions::kChromeColorsName,
-@@ -3889,13 +3889,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3965,13 +3965,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
#endif
@@ -173,25 +128,7 @@
// defined(OS_CHROMEOS)
{"enable-audio-focus-enforcement",
-@@ -4269,7 +4269,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::
-@@ -4279,7 +4279,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)
- {"release-notes", flag_descriptions::kReleaseNotesName,
-@@ -4367,12 +4367,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4425,12 +4425,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
@@ -206,7 +143,7 @@
#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
{"win-use-native-spellchecker",
-@@ -4385,12 +4385,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4450,12 +4450,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSafetyTipDescription, kOsAll,
FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)},
@@ -221,7 +158,7 @@
#if defined(OS_CHROMEOS)
{"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
-@@ -4526,12 +4526,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4587,12 +4587,12 @@ const FeatureEntry kFeatureEntries[] = {
chrome::android::kDarkenWebsitesCheckboxInThemesSetting)},
#endif // defined(OS_ANDROID)
@@ -236,17 +173,3 @@
{"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,
flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,
-@@ -4605,11 +4605,11 @@ const FeatureEntry kFeatureEntries[] = {
- content_settings::kImprovedCookieControlsForThirdPartyCookieBlocking)},
- #endif // !defined(OS_ANDROID)
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- {"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName,
- flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)},
--#endif // OS_WIN || OS_MACOSX || OS_LINUX
-+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
-
- #if !defined(OS_ANDROID)
- {"accessibility-internals-page-improvements",
Index: head/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
+++ head/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/background_mode_manager.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/background/background_mode_manager.cc
-@@ -770,7 +770,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -797,7 +797,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();
Index: head/www/chromium/files/patch-chrome_browser_browser__resources.grd
===================================================================
--- head/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,7 +1,7 @@
---- chrome/browser/browser_resources.grd.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/browser_resources.grd.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/browser_resources.grd
-@@ -108,7 +108,7 @@
- <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_HTML" file="resources\discards\sorted_table_behavior.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
+@@ -54,7 +54,7 @@
+ <include name="IDR_DISCARDS_MOJO_PUBLIC_BASE_PROCESS_ID_MOJOM_LITE_JS" file="${root_gen_dir}\mojo\public\mojom\base\process_id.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
</if>
- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
@@ -9,7 +9,7 @@
<include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" />
<include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" />
<include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
-@@ -550,7 +550,7 @@
+@@ -457,7 +457,7 @@
<include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />
</if>
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" compress="gzip" />
Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -220,9 +220,9 @@
+@@ -223,9 +223,9 @@
#include "components/arc/metrics/stability_metrics_manager.h"
#endif // defined(OS_CHROMEOS)
@@ -12,7 +12,7 @@
#if defined(OS_LINUX)
#include "components/crash/content/app/breakpad_linux.h"
-@@ -260,7 +260,7 @@
+@@ -264,7 +264,7 @@
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -21,7 +21,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
#endif
-@@ -1071,7 +1071,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1073,7 +1073,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 .
-@@ -1080,7 +1080,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1082,7 +1082,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
&user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
@@ -39,7 +39,7 @@
}
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-@@ -1119,7 +1119,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
===================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -367,12 +367,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -371,12 +371,12 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -388,7 +388,7 @@
+@@ -382,7 +382,7 @@
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -442,7 +442,7 @@
+@@ -435,12 +435,12 @@
#endif // !defined(OS_ANDROID)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,7 +18,13 @@
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
#include "services/service_manager/sandbox/features.h"
#endif
-@@ -475,7 +475,7 @@
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "components/crash/content/app/crash_switches.h"
+ #include "components/crash/content/app/crashpad.h"
+ #endif
+@@ -468,7 +468,7 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
#endif
@@ -27,7 +33,7 @@
#if defined(USE_X11)
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h"
#else
-@@ -1193,7 +1193,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1222,7 +1222,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
#elif defined(OS_CHROMEOS)
main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
parameters, startup_data_);
@@ -36,7 +42,7 @@
main_parts =
std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
#elif defined(OS_ANDROID)
-@@ -1219,7 +1219,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1248,7 +1248,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_VIEWS)
@@ -45,7 +51,7 @@
#if defined(USE_X11)
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11());
#else
-@@ -1955,7 +1955,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -1987,7 +1987,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -54,7 +60,7 @@
#if defined(OS_ANDROID)
bool enable_crash_reporter = true;
#else
-@@ -2212,7 +2212,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2252,7 +2252,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
process_type, command_line);
@@ -63,7 +69,7 @@
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
command_line->HasSwitch(service_manager::switches::kNoSandbox)) {
-@@ -3526,7 +3526,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3553,7 +3553,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -72,7 +78,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -3666,7 +3666,7 @@ void ChromeContentBrowserClient::BindCredentialManager
+@@ -3683,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -81,7 +87,7 @@
bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) {
const base::Value* audio_sandbox_enabled_policy_value =
policies.GetValue(policy::key::kAudioSandboxEnabled);
-@@ -3684,7 +3684,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&
+@@ -3701,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&
void ChromeContentBrowserClient::WillStartServiceManager() {
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -90,7 +96,7 @@
if (startup_data_) {
auto* chrome_feature_list_creator =
startup_data_->chrome_feature_list_creator();
-@@ -3977,7 +3977,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -3988,7 +3988,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
+++ head/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-10-21 19:06:21 UTC
+--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/custom_handlers/protocol_handler_registry.cc
-@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler(
+@@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler(
// If true default protocol handlers will be removed if the OS level
// registration for a protocol is no longer Chrome.
bool ShouldRemoveHandlersNotInOS() {
Index: head/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
+++ head/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-09-09 21:55:09 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.
Index: head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -63,7 +63,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
@@ -27,7 +27,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if defined(OS_ANDROID)
-@@ -358,7 +358,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
+@@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
}
bool DownloadPrefs::IsAutoOpenUsed() const {
@@ -36,7 +36,7 @@
if (ShouldOpenPdfInSystemReader())
return true;
#endif
-@@ -372,7 +372,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
+@@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
return false;
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
@@ -45,7 +45,7 @@
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader())
-@@ -409,7 +409,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
+@@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
SaveAutoOpenState();
}
@@ -54,7 +54,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -430,7 +430,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
#endif
void DownloadPrefs::ResetAutoOpen() {
Index: head/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
+++ head/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/download/download_shelf_context_menu.cc
-@@ -135,7 +135,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
+@@ -137,7 +137,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
break;
}
Index: head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") {
+@@ -1154,6 +1154,12 @@ jumbo_static_library("extensions") {
deps += [ "//chrome/common:service_process_mojom" ]
}
Index: head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -159,7 +159,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -158,7 +158,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
@@ -9,7 +9,7 @@
(*s_whitelist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -168,7 +168,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
// Appearance settings.
(*s_whitelist)[::prefs::kCurrentThemeID] =
settings_api::PrefType::PREF_TYPE_STRING;
Index: head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,20 +1,20 @@
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -55,7 +55,7 @@
- #include "chrome/browser/chromeos/extensions/input_method_api.h"
- #include "chrome/browser/chromeos/extensions/media_player_api.h"
+@@ -52,7 +52,7 @@
+ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
+ #include "ppapi/buildflags/buildflags.h"
+
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
--#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
#endif
-@@ -94,7 +94,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
- #if defined(OS_CHROMEOS)
- extensions::InputImeAPI::GetFactoryInstance();
- extensions::InputMethodAPI::GetFactoryInstance();
--#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+ extensions::IdentityAPI::GetFactoryInstance();
+ extensions::InstallTrackerFactory::GetInstance();
+ extensions::InstallVerifierFactory::GetInstance();
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
extensions::InputImeAPI::GetFactoryInstance();
#endif
extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();
Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.h
===================================================================
--- head/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,4 +1,4 @@
---- chrome/browser/flag_descriptions.h.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/flag_descriptions.h.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/flag_descriptions.h
@@ -20,9 +20,9 @@
#include "ui/android/buildflags.h"
@@ -12,16 +12,7 @@
// This file declares strings used in chrome://flags. These messages are not
// translated, because instead of end-users they target Chromium developers and
-@@ -2233,7 +2233,7 @@ extern const char kZeroStateFilesDescription[];
-
- #endif // #if defined(OS_CHROMEOS)
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- extern const char kTerminalSystemAppName[];
- extern const char kTerminalSystemAppDescription[];
-
-@@ -2242,7 +2242,7 @@ extern const char kDynamicTcmallocName[];
+@@ -2299,7 +2299,7 @@ extern const char kDynamicTcmallocName[];
extern const char kDynamicTcmallocDescription[];
#endif // BUILDFLAG(USE_TCMALLOC)
@@ -30,7 +21,7 @@
// All views-based platforms --------------------------------------------------
-@@ -2261,12 +2261,12 @@ extern const char kReopenTabInProductHelpDescription[]
+@@ -2318,12 +2318,12 @@ extern const char kReopenTabInProductHelpDescription[]
// Random platform combinations -----------------------------------------------
@@ -45,21 +36,12 @@
#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
-@@ -2278,7 +2278,7 @@ extern const char kClickToCallUIDescription[];
+@@ -2344,7 +2344,7 @@ extern const char kRemoteCopyReceiverDescription[];
+ #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+ // defined(OS_CHROMEOS)
- #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kDirectManipulationStylusName[];
extern const char kDirectManipulationStylusDescription[];
-@@ -2292,7 +2292,7 @@ extern const char kProfileMenuRevampDescription[];
- extern const char kSyncClipboardServiceName[];
- extern const char kSyncClipboardServiceDescription[];
-
--#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
-
Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,15 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -3744,7 +3744,7 @@ const char kZeroStateFilesDescription[] =
-
- #endif // defined(OS_CHROMEOS)
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- const char kTerminalSystemAppName[] = "Terminal System App";
- const char kTerminalSystemAppDescription[] =
- "Enables the Terminal System App at chrome://terminal which is used for "
-@@ -3757,7 +3757,7 @@ const char kDynamicTcmallocDescription[] =
+@@ -3861,7 +3861,7 @@ const char kDynamicTcmallocDescription[] =
"utilization.";
#endif // BUILDFLAG(USE_TCMALLOC)
@@ -18,7 +9,7 @@
// All views-based platforms --------------------------------------------------
-@@ -3782,13 +3782,13 @@ const char kReopenTabInProductHelpDescription[] =
+@@ -3886,13 +3886,13 @@ const char kReopenTabInProductHelpDescription[] =
// Random platform combinations -----------------------------------------------
@@ -34,21 +25,12 @@
#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
-@@ -3806,7 +3806,7 @@ const char kClickToCallUIDescription[] =
+@@ -3921,7 +3921,7 @@ const char kRemoteCopyReceiverDescription[] =
+ #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+ // defined(OS_CHROMEOS)
- #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus";
const char kDirectManipulationStylusDescription[] =
-@@ -3825,7 +3825,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa
- const char kSyncClipboardServiceDescription[] =
- "Enables clipboard syncing via Chrome Sync.";
-
--#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
-
Index: head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
+++ head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -37,7 +37,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; /
+@@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; /
const char kProduct[] = "Chrome";
#elif defined(OS_MACOSX)
const char kProduct[] = "Chrome_Mac";
Index: head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -7,7 +7,7 @@
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "content/public/browser/child_process_security_policy.h"
- #include "storage/browser/fileapi/isolated_context.h"
+ #include "storage/browser/file_system/isolated_context.h"
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
Index: head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ head/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-12-16 21:51:23 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -704,11 +704,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -708,11 +708,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -14,7 +14,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
-@@ -947,7 +947,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
}
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
+++ head/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-12-16 21:51:23 UTC
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/metrics/process_memory_metrics_emitter.cc
-@@ -375,7 +375,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -425,7 +425,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
-@@ -398,7 +398,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -448,7 +448,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
process_name + ".SharedMemoryFootprint",
pmd.os_dump().shared_footprint_kb / 1024);
Index: head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/net/system_network_context_manager.cc
-@@ -81,11 +81,11 @@
+@@ -79,11 +79,11 @@
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#endif // defined(OS_CHROMEOS)
@@ -12,9 +12,9 @@
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_EXTENSIONS)
- #include "extensions/common/constants.h"
-@@ -209,10 +209,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+ #if defined(OS_WIN) || defined(OS_MACOSX)
+ #include "content/public/common/network_service_util.h"
+@@ -211,10 +211,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->enable_negotiate_port =
local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
@@ -27,7 +27,7 @@
#if defined(OS_POSIX)
auth_dynamic_params->ntlm_v2_enabled =
-@@ -476,10 +476,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -480,10 +480,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
auth_pref_callback);
@@ -40,7 +40,7 @@
#if defined(OS_POSIX)
pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
-@@ -531,10 +531,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -535,10 +535,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
std::string());
@@ -53,7 +53,7 @@
#if defined(OS_POSIX)
registry->RegisterBooleanPref(
-@@ -645,7 +645,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -643,7 +643,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
insecure_stub_resolver_enabled, secure_dns_mode,
std::move(dns_over_https_servers));
Index: head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-10-21 19:06:22 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
#include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
#endif
-@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+@@ -123,7 +123,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
std::make_unique<PersistentNotificationHandler>());
Index: head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ head/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-12-16 21:51:23 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -85,7 +85,11 @@
+@@ -87,7 +87,11 @@
#include "net/base/url_util.h"
#include "net/cert/cert_status_flags.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
Index: head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
+++ head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-10-21 19:06:22 UTC
+--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/plugins/plugin_info_host_impl.cc
-@@ -383,7 +383,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
+@@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
if (cus_plugin_info) {
output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
Index: head/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
+++ head/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/plugins/plugins_resource_service.cc
-@@ -63,7 +63,7 @@ GURL GetPluginsServerURL() {
+@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
filename = "plugins_win.json";
#elif defined(OS_CHROMEOS)
filename = "plugins_chromeos.json";
Index: head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -113,7 +113,7 @@
+@@ -117,7 +117,7 @@
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -9,10 +9,10 @@
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -352,11 +352,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- prefs::kSafeBrowsingSendFilesForMalwareCheck,
- base::Value::Type::INTEGER
- },
+@@ -357,11 +357,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ { key::kWebComponentsV0Enabled,
+ prefs::kWebComponentsV0Enabled,
+ base::Value::Type::BOOLEAN },
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy,
@@ -23,16 +23,16 @@
#if defined(OS_POSIX)
{ key::kNtlmV2Enabled,
prefs::kNtlmV2Enabled,
-@@ -1141,7 +1141,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1147,7 +1147,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox,
base::Value::Type::BOOLEAN },
-
#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 },
-@@ -1205,7 +1205,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1208,7 +1208,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
browser_switcher::prefs::kChromeParameters,
base::Value::Type::LIST },
#endif
Index: head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
+++ head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-10-21 19:06:22 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-03-03 18:53:01 UTC
+++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -184,6 +184,8 @@ class PolicyTestCase {
+@@ -250,6 +250,8 @@ class PolicyTestCase {
const std::string os("chromeos");
#elif defined(OS_LINUX)
const std::string os("linux");
Index: head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -346,7 +346,7 @@
+@@ -352,7 +352,7 @@
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -978,7 +978,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1005,7 +1005,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,29 +1,11 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -186,7 +186,7 @@
- #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
- #endif
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/sync/sync_clipboard_service_factory.h"
- #endif
-
-@@ -352,7 +352,7 @@ void ChromeBrowserMainExtraPartsProfiles::
- MediaGalleriesPreferencesFactory::GetInstance();
- #endif
+@@ -292,7 +292,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore))
+ media_history::MediaHistoryKeyedServiceFactory::GetInstance();
#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();
-@@ -415,7 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles::
- StorageNotificationServiceFactory::GetInstance();
- #endif
- suggestions::SuggestionsServiceFactory::GetInstance();
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- SyncClipboardServiceFactory::GetInstance();
- #endif
- TabRestoreServiceFactory::GetInstance();
Index: head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
+++ head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-12-16 21:51:23 UTC
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/profiles/profile_attributes_entry.cc
-@@ -102,7 +102,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
+@@ -115,7 +115,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
if (is_force_signin_enabled_) {
if (!IsAuthenticated())
is_force_signin_profile_locked_ = true;
Index: head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
+++ head/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-12-16 21:51:23 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1710,7 +1710,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1701,7 +1701,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,
-@@ -1752,7 +1752,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1743,7 +1743,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
-@@ -2057,7 +2057,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -2082,7 +2082,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
case IDC_CHECK_SPELLING_WHILE_TYPING:
return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
Index: head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
===================================================================
--- head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-10-21 19:06:23 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_" external></cr-link-row>
@@ -9,7 +9,7 @@
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultTap_">
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
</cr-button>
</template>
</if>
@@ -18,7 +18,7 @@
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -138,7 +138,7 @@
+@@ -137,7 +137,7 @@
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
label="$i18n{showBookmarksBar}">
</settings-toggle-button>
Index: head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
===================================================================
--- head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
+++ head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
@@ -0,0 +1,11 @@
+--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-03-03 18:53:52 UTC
++++ chrome/browser/sharing/shared_clipboard/feature_flags.h
+@@ -18,7 +18,7 @@ extern const base::Feature kSharedClipboardReceiver;
+ extern const base::Feature kSharedClipboardUI;
+
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)
++ defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Feature to enable handling remote copy messages.
+ extern const base::Feature kRemoteCopyReceiver;
+
Index: head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
+++ head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-03-03 18:53:52 UTC
++++ chrome/browser/sharing/shared_clipboard/feature_flags.cc
+@@ -11,7 +11,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboar
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)
++ defined(OS_CHROMEOS) || defined(OS_BSD)
+ const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
Index: head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
+++ head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2019-06-04 18:55:18 UTC
+--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ssl/captive_portal_blocking_page.cc
-@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
+@@ -135,7 +135,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
wifi_service->GetConnectedNetworkSSID(&ssid, &error);
if (!error.empty())
return std::string();
Index: head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,16 +1,16 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-10-21 19:06:23 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -389,7 +389,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
- GetSyncableServiceForType(syncer::APP_LIST), dump_stack));
- #endif // BUILDFLAG(ENABLE_APP_LIST)
+@@ -408,7 +408,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+ }
+ #endif // defined(OS_CHROMEOS)
-#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)) {
controllers.push_back(
-@@ -397,7 +397,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
- syncer::DICTIONARY, GetModelTypeStoreService()->GetStoreFactory(),
+@@ -416,7 +416,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+ syncer::DICTIONARY, model_type_store_factory,
GetSyncableServiceForType(syncer::DICTIONARY), dump_stack));
}
-#endif // defined(OS_LINUX) || defined(OS_WIN)
Index: head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -81,7 +81,7 @@
#include "chrome/browser/ui/browser_commands_chromeos.h"
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -945,7 +945,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -951,7 +951,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
Index: head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/input_method/input_method_engine_base.cc
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
#include "ui/base/ime/chromeos/ime_keymap.h"
#elif defined(OS_WIN)
#include "ui/events/keycodes/keyboard_codes_win.h"
Index: head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-10-21 19:06:24 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -89,7 +89,7 @@ static const char* kBadFlags[] = {
+@@ -87,7 +87,7 @@ static const char* kBadFlags[] = {
extensions::switches::kExtensionsOnChromeURLs,
#endif
Index: head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-10-21 19:06:24 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -85,7 +85,7 @@
+@@ -82,7 +82,7 @@
#include "chrome/browser/ui/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
-@@ -295,7 +295,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co
+@@ -291,7 +291,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co
// true, send a warning if guest mode is requested but not allowed by policy.
bool IsGuestModeEnforced(const base::CommandLine& command_line,
bool show_warning) {
@@ -18,7 +18,7 @@
PrefService* service = g_browser_process->local_state();
DCHECK(service);
-@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -662,8 +662,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
}
#endif // OS_CHROMEOS
Index: head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
#include "components/zoom/zoom_controller.h"
#endif // defined(OS_ANDROID)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/hats/hats_helper.h"
#endif
-@@ -314,11 +314,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -329,11 +329,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
+++ head/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-10-21 19:06:24 UTC
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -685,7 +685,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
+@@ -687,7 +687,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
return app_menu_icon_controller_->GetTypeAndSeverity().type ==
AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
}
Index: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ head/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-10-21 19:06:24 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-03-03 18:53:02 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -36,7 +36,7 @@
+@@ -33,7 +33,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>
-@@ -46,7 +46,7 @@
+@@ -43,7 +43,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/common/content_switches.h"
#include "ui/base/l10n/l10n_util.h"
@@ -18,7 +18,7 @@
// This connector is used in ui_devtools's TracingAgent to hook up with the
// tracing service.
-@@ -109,7 +109,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -105,7 +105,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
devtools_server_->tracing_agent());
}
@@ -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.
-@@ -140,7 +140,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
base::RunLoop().RunUntilIdle();
exit(EXIT_FAILURE);
Index: head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -115,8 +115,10 @@ std::unique_ptr<views::View> FirstRunDialog::CreateExt
+@@ -119,8 +119,10 @@ void FirstRunDialog::Done() {
bool FirstRunDialog::Accept() {
GetWidget()->Hide();
Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1519,7 +1519,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
+@@ -1560,7 +1560,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
bool must_regenerate_frame;
Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ head/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-12-16 21:51:24 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -48,7 +48,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
@@ -9,16 +9,16 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -354,7 +354,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
- void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source,
- const gfx::Point& point,
- const ui::Event* event) {
+@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+ } else if (sender == close_button_) {
+ frame()->CloseWithReason(views::Widget::ClosedReason::kCloseButtonClicked);
+ } else if (sender == window_icon_) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
- views::MenuRunner::HAS_MNEMONICS);
- menu_runner.RunMenuAt(
-@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
+ // TODO(pbos): Figure out / document why this is Linux only. This needs a
+ // comment.
+ views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
+@@ -481,7 +481,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ head/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-10-21 19:06:24 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -80,7 +80,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
+@@ -62,7 +62,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);
-@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
+@@ -75,7 +75,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);
-@@ -131,7 +131,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
+@@ -113,7 +113,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
}
Index: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,18 +1,9 @@
--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-12-16 21:51:24 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -550,7 +550,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
- }
-@@ -560,7 +560,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event)
- }
+@@ -582,7 +582,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event)
+ if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
+ return;
- 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
Index: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ head/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-12-16 21:51:24 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -446,7 +446,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -450,7 +450,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.
@@ -8,8 +8,8 @@
+#if defined(OS_LINUX) || defined(OS_BSD)
can_release_capture_ = false;
#endif
- start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -883,7 +883,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+ start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
+@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
else
SetCapture(target_context);
@@ -18,7 +18,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -2016,7 +2016,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2060,7 +2060,7 @@ TabDragController::Liveness TabDragController::GetLoca
if (dragged_window)
exclude.insert(dragged_window);
}
Index: head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/webui/about_ui.cc
-@@ -562,7 +562,7 @@ std::string ChromeURLs() {
+@@ -561,7 +561,7 @@ std::string ChromeURLs() {
return html;
}
@@ -9,9 +9,9 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
- ui::ResourceBundle::GetSharedInstance().DecompressDataResource(idr);
+ ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
Index: head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ head/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-12-16 21:51:24 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -206,11 +206,11 @@
+@@ -215,11 +215,11 @@
#include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
#endif
@@ -14,7 +14,7 @@
#include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
#endif
-@@ -308,7 +308,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -328,7 +328,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)
-@@ -621,7 +621,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -658,7 +658,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
-@@ -669,17 +669,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -706,17 +706,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<CastUI>;
}
#endif
Index: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ head/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-12-16 21:51:24 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -698,7 +698,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -752,7 +752,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
{"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
{"themes", IDS_SETTINGS_THEMES},
@@ -9,7 +9,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -718,7 +718,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -772,7 +772,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP},
{"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER},
#endif
Index: head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
===================================================================
--- head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
+++ head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig 2020-03-03 18:53:53 UTC
++++ chrome/browser/web_applications/components/web_app_file_handler_registration.cc
+@@ -15,7 +15,7 @@ namespace web_app {
+ //
+ // Note: Because OS_LINUX includes OS_CHROMEOS be sure to use the stub on
+ // OS_CHROMEOS.
+-#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) && !defined(OS_BSD)
+ bool ShouldRegisterFileHandlersWithOs() {
+ return false;
+ }
Index: head/www/chromium/files/patch-chrome_common_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-chrome_common_BUILD.gn
+++ head/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/BUILD.gn.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/BUILD.gn
-@@ -299,6 +299,10 @@ static_library("common") {
+@@ -278,6 +278,10 @@ static_library("common") {
public_deps += [ "//ppapi/shared_impl" ]
}
Index: head/www/chromium/files/patch-chrome_common_channel__info__posix.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_channel__info__posix.cc
+++ head/www/chromium/files/patch-chrome_common_channel__info__posix.cc
@@ -1,15 +1,15 @@
---- chrome/common/channel_info_posix.cc.orig 2019-12-17 19:21:14 UTC
+--- chrome/common/channel_info_posix.cc.orig 2020-03-03 18:53:03 UTC
+++ chrome/common/channel_info_posix.cc
-@@ -69,7 +69,7 @@ std::string GetChannelSuffixForDataDir() {
+@@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() {
+ }
}
- #endif // defined(GOOGLE_CHROME_BUILD)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
std::string GetDesktopName(base::Environment* env) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
version_info::Channel product_channel(GetChannel());
-@@ -91,7 +91,7 @@ std::string GetDesktopName(base::Environment* env) {
+@@ -89,7 +89,7 @@ std::string GetDesktopName(base::Environment* env) {
return "chromium-browser.desktop";
#endif
}
@@ -17,4 +17,4 @@
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
version_info::Channel GetChannel() {
- return GetChannelImpl(nullptr, nullptr);
+ return GetChannelImpl(nullptr);
Index: head/www/chromium/files/patch-chrome_common_chrome__features.h
===================================================================
--- head/www/chromium/files/patch-chrome_common_chrome__features.h
+++ head/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,9 +1,9 @@
---- chrome/common/chrome_features.h.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/chrome_features.h.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/chrome_features.h
-@@ -67,10 +67,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kAutoFetchOnNetErrorPage;
- #endif
+@@ -62,10 +62,10 @@ extern const base::Feature kAppServiceShelf;
+ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
+
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES)
@@ -13,7 +13,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBlockPromptsIfDismissedOften;
-@@ -89,7 +89,7 @@ extern const base::Feature kBundledConnectionHelpFeatu
+@@ -84,7 +84,7 @@ extern const base::Feature kBundledConnectionHelpFeatu
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kCaptionSettings;
Index: head/www/chromium/files/patch-chrome_common_chrome__features.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ head/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/chrome_features.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/chrome_features.cc
-@@ -86,13 +86,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc
- base::FEATURE_DISABLED_BY_DEFAULT};
- #endif // defined(OS_ANDROID)
+@@ -81,13 +81,13 @@ const base::Feature kAsyncDns {
+ #endif
+ };
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -16,7 +16,7 @@
// Enables or disables whether permission prompts are automatically blocked
// after the user has explicitly dismissed them too many times.
-@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -147,7 +147,7 @@ const base::Feature kThirdPartyModulesBlocking{
const base::Feature kTLS13HardeningForLocalAnchors{
"TLS13HardeningForLocalAnchors", base::FEATURE_DISABLED_BY_DEFAULT};
Index: head/www/chromium/files/patch-chrome_common_chrome__paths.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ head/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig 2019-12-16 21:50:44 UTC
+--- chrome/common/chrome_paths.cc.orig 2020-03-03 18:53:03 UTC
+++ chrome/common/chrome_paths.cc
@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
@@ -35,7 +35,7 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -482,6 +482,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) {
case chrome::DIR_POLICY_FILES: {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
@@ -45,7 +45,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -502,7 +502,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
#endif
#if defined(OS_CHROMEOS) || \
@@ -54,7 +54,7 @@
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
-@@ -510,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@@ -63,7 +63,7 @@
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
-@@ -545,7 +545,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
#endif
break;
@@ -72,7 +72,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -559,6 +559,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@@ -82,7 +82,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
-@@ -571,7 +574,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
@@ -91,7 +91,7 @@
#if !defined(OS_ANDROID)
case chrome::DIR_GLOBAL_GCM_STORE:
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
-@@ -579,7 +582,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.Append(kGCMStoreDirname);
break;
#endif // !defined(OS_ANDROID)
@@ -100,7 +100,7 @@
case chrome::FILE_COMPONENT_FLASH_HINT:
if (!base::PathService::Get(
chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
-@@ -587,7 +590,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
cur = cur.Append(kComponentUpdatedFlashHint);
break;
Index: head/www/chromium/files/patch-chrome_common_chrome__switches.h
===================================================================
--- head/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ head/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/chrome_switches.h.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/chrome_switches.h
-@@ -263,7 +263,7 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -266,7 +266,7 @@ extern const char kAllowNaClFileHandleAPI[];
extern const char kAllowNaClSocketAPI[];
#endif
Index: head/www/chromium/files/patch-chrome_common_chrome__switches.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ head/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/chrome_switches.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/chrome_switches.cc
-@@ -852,7 +852,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
+@@ -868,7 +868,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
#endif
Index: head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
===================================================================
--- head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
+++ head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
@@ -1,9 +1,9 @@
--- chrome/common/extensions/api/api_sources.gni.orig 2019-12-16 21:51:24 UTC
+++ chrome/common/extensions/api/api_sources.gni
-@@ -110,7 +110,7 @@ if (is_chromeos) {
- "wallpaper.json",
- "wallpaper_private.json",
- ]
+@@ -113,7 +113,7 @@ if (is_chromeos) {
+ if (use_cups) {
+ schema_sources_ += [ "printing.idl" ]
+ }
-} else if (is_linux || is_win) {
+} else if (is_linux || is_bsd || is_win) {
schema_sources_ += [ "input_ime.json" ]
Index: head/www/chromium/files/patch-chrome_common_features.gni
===================================================================
--- head/www/chromium/files/patch-chrome_common_features.gni
+++ head/www/chromium/files/patch-chrome_common_features.gni
@@ -1,6 +1,6 @@
---- chrome/common/features.gni.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/features.gni.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/features.gni
-@@ -53,9 +53,9 @@ declare_args() {
+@@ -51,9 +51,9 @@ declare_args() {
(is_desktop_linux && use_dbus) || is_chromeos
enable_one_click_signin =
Index: head/www/chromium/files/patch-chrome_common_pref__names.h
===================================================================
--- head/www/chromium/files/patch-chrome_common_pref__names.h
+++ head/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/pref_names.h.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/pref_names.h
-@@ -330,7 +330,7 @@ extern const char kHistoryMenuPromoShown[];
+@@ -331,7 +331,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[];
-@@ -361,7 +361,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -362,7 +362,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)
-@@ -523,7 +523,7 @@ extern const char kAppWindowPlacement[];
+@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];
@@ -27,9 +27,9 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if defined(OS_ANDROID)
-@@ -729,9 +729,9 @@ extern const char kGSSAPILibraryName[];
- extern const char kAuthAndroidNegotiateAccountType[];
- extern const char kAllowCrossOriginAuthPrompt[];
+@@ -738,9 +738,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
+ extern const char kGloballyScopeHTTPAuthCacheEnabled[];
+ extern const char kAmbientAuthenticationInPrivateModesEnabled[];
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
Index: head/www/chromium/files/patch-chrome_common_pref__names.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_pref__names.cc
+++ head/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/pref_names.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/pref_names.cc
-@@ -1044,7 +1044,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
+@@ -1049,7 +1049,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
-@@ -1171,7 +1171,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1176,7 +1176,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";
-@@ -1572,7 +1572,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1593,7 +1593,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";
@@ -27,9 +27,9 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -1840,12 +1840,12 @@ const char kAuthAndroidNegotiateAccountType[] =
- // domain sub-content requests.
- const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";
+@@ -1889,12 +1889,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
+ const char kAmbientAuthenticationInPrivateModesEnabled[] =
+ "auth.ambient_auth_in_private_modes";
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
Index: head/www/chromium/files/patch-chrome_common_webui__url__constants.h
===================================================================
--- head/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ head/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/webui_url_constants.h.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/webui_url_constants.h
-@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
+@@ -274,7 +274,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
extern const char kChromeUICastHost[];
#endif
@@ -9,7 +9,7 @@
extern const char kChromeUIDiscardsHost[];
extern const char kChromeUIDiscardsURL[];
extern const char kChromeUIHatsHost[];
-@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];
+@@ -286,17 +286,17 @@ extern const char kChromeUIHatsURL[];
extern const char kChromeUILinuxProxyConfigHost[];
#endif
Index: head/www/chromium/files/patch-chrome_common_webui__url__constants.cc
===================================================================
--- head/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ head/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/common/webui_url_constants.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -310,7 +310,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -316,7 +316,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
const char kChromeUICastHost[] = "cast";
#endif
@@ -9,7 +9,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
const char kChromeUIHatsHost[] = "hats";
-@@ -321,17 +321,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
+@@ -327,17 +327,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
-@@ -591,13 +591,13 @@ const char* const kChromeHostURLs[] = {
+@@ -599,13 +599,13 @@ const char* const kChromeHostURLs[] = {
kChromeUIInternetDetailDialogHost,
kChromeUIAssistantOptInHost,
#endif
@@ -41,8 +41,8 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
kChromeUILinuxProxyConfigHost,
#endif
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
kChromeUISandboxHost,
#endif
#if defined(OS_WIN)
Index: head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
===================================================================
--- head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
+++ head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1056,7 +1056,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
}
case chrome::mojom::PluginStatus::kRestartRequired: {
Index: head/www/chromium/files/patch-chrome_test_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-chrome_test_BUILD.gn
+++ head/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2020-01-07 21:53:20 UTC
+--- chrome/test/BUILD.gn.orig 2020-03-03 18:53:53 UTC
+++ chrome/test/BUILD.gn
-@@ -5870,7 +5870,7 @@ test("chrome_app_unittests") {
+@@ -5920,7 +5920,7 @@ test("chrome_app_unittests") {
"//components/safe_browsing:buildflags",
"//components/tracing",
]
Index: head/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
===================================================================
--- head/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ head/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-12-16 21:51:24 UTC
+--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-03-03 18:53:53 UTC
+++ chrome/test/chromedriver/chrome_launcher.cc
-@@ -67,6 +67,10 @@
+@@ -68,6 +68,10 @@
#include "chrome/test/chromedriver/keycode_text_conversion.h"
#endif
Index: head/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
===================================================================
--- head/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ head/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-03-03 18:53:03 UTC
+++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -48,7 +48,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
+@@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
installation_locations[i].Append(L"Chromium\\Application"));
}
}
@@ -9,12 +9,12 @@
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
// TODO: Respect users' PATH variables.
// Until then, we use an approximation of the most common defaults.
-@@ -135,7 +135,7 @@ bool FindChrome(base::FilePath* browser_exe) {
- #elif defined(OS_MACOSX)
- base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
- base::FilePath("Chromium.app/Contents/MacOS/Chromium")
+@@ -136,7 +136,7 @@ bool FindChrome(base::FilePath* browser_exe) {
+ #if defined(OS_WIN) || defined(OS_MACOSX)
+ base::FilePath(chrome::kBrowserProcessExecutablePath),
+ base::FilePath(chrome::kBrowserProcessExecutablePathChromium)
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
- base::FilePath("google-chrome"),
- base::FilePath("chrome"),
- base::FilePath("chromium"),
+ base::FilePath("google-chrome"),
+ base::FilePath(chrome::kBrowserProcessExecutablePath),
+ base::FilePath(chrome::kBrowserProcessExecutablePathChromium),
Index: head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
===================================================================
--- head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-12-16 21:51:24 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-03-03 18:53:53 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,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>
-@@ -285,7 +285,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -305,7 +305,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.
-@@ -295,7 +295,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -315,7 +315,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{switches::kEnableHardwareOverlays, "cast"},
#endif
#endif
@@ -27,12 +27,12 @@
// It's better to start GPU process on demand. For example, for TV platforms
// cast starts in background and can't render until TV switches to cast
// input.
-@@ -436,7 +436,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -457,7 +457,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
views_delegate_ = std::make_unique<CastViewsDelegate>();
#endif // defined(USE_AURA)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- base::FilePath dir_module;
- base::PathService::Get(base::DIR_MODULE, &dir_module);
- base::FilePath dir_font = dir_module.Append("fonts");
+ base::FilePath dir_font = GetApplicationFontsDir();
+ const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
+ if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {
Index: head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
===================================================================
--- head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2019-10-21 19:06:28 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2020-03-03 18:53:53 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -534,7 +534,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -443,7 +443,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
Index: head/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
===================================================================
--- head/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
+++ head/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
@@ -1,4 +1,4 @@
---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2019-12-17 19:25:44 UTC
+--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-03-03 18:53:04 UTC
+++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc
@@ -7,7 +7,7 @@
#include <map>
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#endif
-@@ -398,7 +398,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri
+@@ -393,7 +393,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri
named_channel.TakeServerEndpoint();
DCHECK(server_endpoint.is_valid());
Index: head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
===================================================================
--- head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ head/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-12-16 21:51:25 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-03-03 18:53:53 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1819,10 +1819,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
+@@ -1816,10 +1816,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
// The feature is only for Linux, Windows and Mac.
Index: head/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
===================================================================
--- head/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ head/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2019-12-16 21:51:25 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-03-03 18:53:53 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -162,7 +162,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
+@@ -130,7 +130,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
bool ShouldShowImprovedUserConsentForCreditCardSave() {
#if defined(OS_WIN) || defined(OS_MACOSX) || \
Index: head/www/chromium/files/patch-components_crash_content_app_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-components_crash_content_app_BUILD.gn
+++ head/www/chromium/files/patch-components_crash_content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/content/app/BUILD.gn.orig 2019-12-16 21:51:25 UTC
+--- components/crash/content/app/BUILD.gn.orig 2020-03-03 18:53:53 UTC
+++ components/crash/content/app/BUILD.gn
-@@ -51,17 +51,20 @@ static_library("app") {
+@@ -53,17 +53,20 @@ static_library("app") {
"crashpad_win.cc",
]
@@ -23,7 +23,7 @@
defines = [ "CRASH_IMPLEMENTATION" ]
-@@ -73,7 +76,7 @@ static_library("app") {
+@@ -75,7 +78,7 @@ static_library("app") {
"//build:branding_buildflags",
]
@@ -32,7 +32,7 @@
deps += [
"//third_party/crashpad/crashpad/client",
"//third_party/crashpad/crashpad/util",
-@@ -99,7 +102,7 @@ static_library("app") {
+@@ -101,7 +104,7 @@ static_library("app") {
]
}
@@ -41,7 +41,7 @@
deps += [ "//third_party/breakpad:client" ]
}
-@@ -130,7 +133,7 @@ static_library("app") {
+@@ -132,7 +135,7 @@ static_library("app") {
libs = [ "log" ]
}
Index: head/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
===================================================================
--- head/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ head/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,4 +1,4 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-12-16 21:51:25 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-03-03 18:53:53 UTC
+++ components/discardable_memory/service/discardable_shared_memory_manager.cc
@@ -32,7 +32,7 @@
#include "components/discardable_memory/common/discardable_shared_memory_heap.h"
@@ -9,7 +9,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/metrics/histogram_macros.h"
-@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() {
+@@ -181,7 +181,7 @@ int64_t GetDefaultMemoryLimit() {
max_default_memory_limit /= 8;
#endif
Index: head/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
+++ head/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.h.orig 2019-10-21 19:06:29 UTC
+--- components/feature_engagement/public/event_constants.h.orig 2020-03-03 18:53:05 UTC
+++ components/feature_engagement/public/event_constants.h
@@ -14,15 +14,15 @@ namespace events {
@@ -19,7 +19,7 @@
defined(OS_CHROMEOS)
// All conditions for reopen closed tab IPH were met. Since this IPH needs to
// track user events (opening/closing tabs, focusing the omnibox, etc) on the
-@@ -75,7 +75,7 @@ extern const char kIncognitoWindowOpened[];
+@@ -80,7 +80,7 @@ extern const char kIncognitoWindowOpened[];
extern const char kIncognitoWindowSessionTimeMet[];
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
Index: head/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
+++ head/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.cc.orig 2019-10-21 19:06:29 UTC
+--- components/feature_engagement/public/event_constants.cc.orig 2020-03-03 18:53:05 UTC
+++ components/feature_engagement/public/event_constants.cc
@@ -12,12 +12,12 @@ namespace feature_engagement {
namespace events {
@@ -16,7 +16,7 @@
defined(OS_CHROMEOS)
const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met";
const char kTabReopened[] = "tab_reopened";
-@@ -39,7 +39,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo
+@@ -42,7 +42,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo
const char kIncognitoWindowSessionTimeMet[] =
"incognito_window_session_time_met";
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2019-10-21 19:06:29 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2020-03-03 18:53:53 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode;
// A feature to ensure all arrays can contain at least one feature.
@@ -9,7 +9,7 @@
defined(OS_CHROMEOS)
extern const base::Feature kIPHFocusModeFeature;
extern const base::Feature kIPHGlobalMediaControlsFeature;
-@@ -28,7 +28,7 @@ extern const base::Feature kIPHBookmarkFeature;
+@@ -29,7 +29,7 @@ extern const base::Feature kIPHBookmarkFeature;
extern const base::Feature kIPHIncognitoWindowFeature;
extern const base::Feature kIPHNewTabFeature;
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH)
Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2019-10-21 19:06:29 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2020-03-03 18:53:53 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode",
const base::Feature kIPHDummyFeature{"IPH_Dummy",
@@ -9,7 +9,7 @@
defined(OS_CHROMEOS)
const base::Feature kIPHFocusModeFeature{"IPH_FocusMode",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -31,7 +31,7 @@ const base::Feature kIPHIncognitoWindowFeature{
+@@ -33,7 +33,7 @@ const base::Feature kIPHIncognitoWindowFeature{
const base::Feature kIPHNewTabFeature{"IPH_NewTab",
base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2019-12-16 21:51:25 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2020-03-03 18:53:53 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -104,7 +104,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge
+@@ -110,7 +110,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge
"IPH_BadgedTranslateManualTrigger");
#endif // defined(OS_IOS)
@@ -9,7 +9,7 @@
defined(OS_CHROMEOS)
DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls");
-@@ -114,7 +114,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm
+@@ -121,7 +121,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm
DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow");
DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab");
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
@@ -18,7 +18,7 @@
// defined(OS_CHROMEOS)
} // namespace
-@@ -160,7 +160,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -170,7 +170,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature),
VARIATION_ENTRY(kIPHBadgedReadingListFeature),
VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature),
@@ -27,7 +27,7 @@
defined(OS_CHROMEOS)
VARIATION_ENTRY(kIPHFocusModeFeature),
VARIATION_ENTRY(kIPHGlobalMediaControls),
-@@ -170,7 +170,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -181,7 +181,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHIncognitoWindowFeature),
VARIATION_ENTRY(kIPHNewTabFeature),
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
Index: head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
===================================================================
--- head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.cc.orig 2019-12-16 21:51:25 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2020-03-03 18:53:53 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -54,7 +54,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = {
&kIPHBadgedReadingListFeature,
&kIPHBadgedTranslateManualTriggerFeature,
#endif // defined(OS_IOS)
@@ -9,7 +9,7 @@
defined(OS_CHROMEOS)
&kIPHFocusModeFeature,
&kIPHGlobalMediaControlsFeature,
-@@ -64,7 +64,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -68,7 +68,7 @@ const base::Feature* const kAllFeatures[] = {
&kIPHIncognitoWindowFeature,
&kIPHNewTabFeature,
#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
Index: head/www/chromium/files/patch-components_flags__ui_flags__state.cc
===================================================================
--- head/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ head/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig 2019-10-21 19:06:29 UTC
+--- components/flags_ui/flags_state.cc.orig 2020-03-03 18:53:53 UTC
+++ components/flags_ui/flags_state.cc
-@@ -690,7 +690,7 @@ int FlagsState::GetCurrentPlatform() {
+@@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() {
return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS;
Index: head/www/chromium/files/patch-components_gcm__driver_gcm__client.h
===================================================================
--- head/www/chromium/files/patch-components_gcm__driver_gcm__client.h
+++ head/www/chromium/files/patch-components_gcm__driver_gcm__client.h
@@ -1,6 +1,6 @@
---- components/gcm_driver/gcm_client.h.orig 2019-10-21 19:06:29 UTC
+--- components/gcm_driver/gcm_client.h.orig 2020-03-03 18:53:53 UTC
+++ components/gcm_driver/gcm_client.h
-@@ -86,6 +86,7 @@ class GCMClient {
+@@ -87,6 +87,7 @@ class GCMClient {
PLATFORM_CROS,
PLATFORM_IOS,
PLATFORM_ANDROID,
Index: head/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
===================================================================
--- head/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
+++ head/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
@@ -1,6 +1,6 @@
---- components/gcm_driver/gcm_client_impl.cc.orig 2019-09-09 21:55:14 UTC
+--- components/gcm_driver/gcm_client_impl.cc.orig 2020-03-03 18:53:53 UTC
+++ components/gcm_driver/gcm_client_impl.cc
-@@ -134,6 +134,9 @@ void ToCheckinProtoVersion(
+@@ -135,6 +135,9 @@ void ToCheckinProtoVersion(
case GCMClient::PLATFORM_CROS:
platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;
break;
Index: head/www/chromium/files/patch-components_metrics_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-components_metrics_BUILD.gn
+++ head/www/chromium/files/patch-components_metrics_BUILD.gn
@@ -1,6 +1,6 @@
---- components/metrics/BUILD.gn.orig 2019-12-16 21:51:25 UTC
+--- components/metrics/BUILD.gn.orig 2020-03-03 18:53:53 UTC
+++ components/metrics/BUILD.gn
-@@ -165,6 +165,11 @@ jumbo_static_library("metrics") {
+@@ -171,6 +171,11 @@ jumbo_static_library("metrics") {
if (is_fuchsia) {
sources += [ "drive_metrics_provider_fuchsia.cc" ]
}
@@ -11,4 +11,4 @@
+
}
- # The component metrics provider is a separate target because it depends upon
+ if (is_android) {
Index: head/www/chromium/files/patch-components_neterror_resources_neterror.js
===================================================================
--- head/www/chromium/files/patch-components_neterror_resources_neterror.js
+++ head/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -1,9 +1,9 @@
---- components/neterror/resources/neterror.js.orig 2019-04-30 22:22:42 UTC
+--- components/neterror/resources/neterror.js.orig 2020-03-03 18:53:53 UTC
+++ components/neterror/resources/neterror.js
-@@ -160,7 +160,7 @@ function setUpCachedButton(buttonStrings) {
+@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
}
- var primaryControlOnLeft = true;
+ let primaryControlOnLeft = true;
-// <if expr="is_macosx or is_ios or is_linux or is_android">
+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
primaryControlOnLeft = false;
Index: head/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
===================================================================
--- head/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ head/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-12-16 21:51:25 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-03-03 18:53:53 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -743,7 +743,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -749,7 +749,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
}
#endif // #if !defined(OS_ANDROID)
Index: head/www/chromium/files/patch-components_os__crypt_os__crypt.h
===================================================================
--- head/www/chromium/files/patch-components_os__crypt_os__crypt.h
+++ head/www/chromium/files/patch-components_os__crypt_os__crypt.h
@@ -1,4 +1,4 @@
---- components/os_crypt/os_crypt.h.orig 2019-03-11 22:00:56 UTC
+--- components/os_crypt/os_crypt.h.orig 2020-03-03 18:53:53 UTC
+++ components/os_crypt/os_crypt.h
@@ -15,9 +15,9 @@
#include "base/strings/string16.h"
@@ -10,7 +10,7 @@
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
class PrefRegistrySimple;
@@ -34,13 +34,13 @@ struct Config;
// true for Linux, if a password management tool is available.
@@ -29,7 +29,7 @@
// On Linux returns true iff the real secret key (not hardcoded one) is
// available. On MacOS returns true if Keychain is available (for mock
// Keychain it returns true if not using locked Keychain, false if using
-@@ -112,7 +112,7 @@ class OSCrypt {
+@@ -131,7 +131,7 @@ class OSCrypt {
DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
};
@@ -38,7 +38,7 @@
// For unit testing purposes, inject methods to be used.
// |get_key_storage_mock| provides the desired |KeyStorage| implementation.
// If the provider returns |nullptr|, a hardcoded password will be used.
-@@ -127,6 +127,6 @@ void UseMockKeyStorageForTesting(
+@@ -146,6 +146,6 @@ void UseMockKeyStorageForTesting(
// Clears any caching and most lazy initialisations performed by the production
// code. Should be used after any test which required a password.
COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting();
Index: head/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
===================================================================
--- head/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ head/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-12-16 21:51:25 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-03-03 18:53:06 UTC
+++ components/policy/core/common/cloud/cloud_policy_util.cc
@@ -16,7 +16,7 @@
#include <wincred.h>
@@ -9,8 +9,8 @@
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -28,7 +28,7 @@
- #include <sys/sysctl.h>
+@@ -31,7 +31,7 @@
+ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -18,7 +18,7 @@
#include <limits.h> // For HOST_NAME_MAX
#endif
-@@ -57,7 +57,7 @@
+@@ -60,7 +60,7 @@
#include "base/system/sys_info.h"
#endif
@@ -27,7 +27,7 @@
#include "base/system/sys_info.h"
#endif
-@@ -66,11 +66,24 @@ namespace policy {
+@@ -69,11 +69,24 @@ namespace policy {
namespace em = enterprise_management;
std::string GetMachineName() {
@@ -51,9 +51,9 @@
+ }
+ return std::string();
#elif defined(OS_MACOSX)
- // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570
- SCDynamicStoreContext context = {0, NULL, NULL, NULL};
-@@ -116,7 +129,7 @@ std::string GetMachineName() {
+ // TODO(crbug.com/1024115): Find a different replacement for -[NSHost
+ // currentHost] on iOS.
+@@ -123,7 +136,7 @@ std::string GetMachineName() {
}
std::string GetOSVersion() {
@@ -62,7 +62,7 @@
return base::SysInfo::OperatingSystemVersion();
#elif defined(OS_WIN)
base::win::OSInfo::VersionNumber version_number =
-@@ -139,7 +152,7 @@ std::string GetOSArchitecture() {
+@@ -146,7 +159,7 @@ std::string GetOSArchitecture() {
}
std::string GetOSUsername() {
Index: head/www/chromium/files/patch-components_policy_resources_policy__templates.json
===================================================================
--- head/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ head/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig 2019-12-16 21:51:25 UTC
+--- components/policy/resources/policy_templates.json.orig 2020-03-03 18:53:53 UTC
+++ components/policy/resources/policy_templates.json
-@@ -1062,7 +1062,7 @@
+@@ -1081,7 +1081,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -1092,7 +1092,7 @@
+@@ -1111,7 +1111,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -1119,7 +1119,7 @@
+@@ -1138,7 +1138,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -27,7 +27,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -1845,7 +1845,7 @@
+@@ -1937,7 +1937,7 @@
'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -36,7 +36,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -3667,7 +3667,7 @@
+@@ -3780,7 +3780,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -45,7 +45,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -3721,7 +3721,7 @@
+@@ -3834,7 +3834,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -54,7 +54,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -7159,7 +7159,7 @@
+@@ -7302,7 +7302,7 @@
'owners': ['file://src/net/cert/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -8383,7 +8383,7 @@
+@@ -8526,7 +8526,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -9032,7 +9032,7 @@
+@@ -9202,7 +9202,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
Index: head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
===================================================================
--- head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
+++ head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
@@ -1,6 +1,6 @@
---- components/policy/tools/generate_policy_source.py.orig 2019-12-16 21:51:25 UTC
+--- components/policy/tools/generate_policy_source.py.orig 2020-03-03 18:53:54 UTC
+++ components/policy/tools/generate_policy_source.py
-@@ -96,6 +96,7 @@ class PolicyDetails:
+@@ -97,6 +97,7 @@ class PolicyDetails:
'chrome.linux',
'chrome.mac',
'chrome.fuchsia',
@@ -8,7 +8,7 @@
'chrome.*',
'chrome.win7',
]:
-@@ -118,7 +119,7 @@ class PolicyDetails:
+@@ -119,7 +120,7 @@ class PolicyDetails:
if platform.startswith('chrome.'):
platform_sub = platform[7:]
if platform_sub == '*':
Index: head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
===================================================================
--- head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
+++ head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
@@ -1,6 +1,6 @@
---- components/sync_device_info/device_info_sync_bridge.cc.orig 2019-12-31 14:39:30 UTC
+--- components/sync_device_info/device_info_sync_bridge.cc.orig 2020-03-03 18:53:54 UTC
+++ components/sync_device_info/device_info_sync_bridge.cc
-@@ -432,11 +432,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(
+@@ -445,11 +445,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(
return;
}
Index: head/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
===================================================================
--- head/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ head/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
@@ -1,6 +1,14 @@
---- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-12-16 21:50:47 UTC
+--- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-03-03 18:53:06 UTC
+++ components/sync_device_info/local_device_info_util_linux.cc
-@@ -36,6 +36,23 @@ std::string GetChromeOSDeviceNameFromType() {
+@@ -8,6 +8,7 @@
+ #include <string>
+
+ #include "base/linux_util.h"
++#include "build/build_config.h"
+
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/constants/devicetype.h"
+@@ -36,6 +37,23 @@ std::string GetChromeOSDeviceNameFromType() {
std::string GetPersonalizableDeviceNameInternal() {
#if defined(OS_CHROMEOS)
return GetChromeOSDeviceNameFromType();
Index: head/www/chromium/files/patch-components_viz_host_host__display__client.h
===================================================================
--- head/www/chromium/files/patch-components_viz_host_host__display__client.h
+++ head/www/chromium/files/patch-components_viz_host_host__display__client.h
@@ -1,6 +1,6 @@
---- components/viz/host/host_display_client.h.orig 2019-12-17 19:29:39 UTC
+--- components/viz/host/host_display_client.h.orig 2020-03-03 18:53:07 UTC
+++ components/viz/host/host_display_client.h
-@@ -42,7 +42,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
+@@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
#endif
Index: head/www/chromium/files/patch-components_viz_host_host__display__client.cc
===================================================================
--- head/www/chromium/files/patch-components_viz_host_host__display__client.cc
+++ head/www/chromium/files/patch-components_viz_host_host__display__client.cc
@@ -1,6 +1,6 @@
---- components/viz/host/host_display_client.cc.orig 2019-12-17 19:29:17 UTC
+--- components/viz/host/host_display_client.cc.orig 2020-03-03 18:53:07 UTC
+++ components/viz/host/host_display_client.cc
-@@ -59,7 +59,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
+@@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
}
#endif
Index: head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
===================================================================
--- head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig 2019-12-17 19:30:11 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-03-03 18:53:54 UTC
+++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
+@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
base::TimeTicks now = base::TimeTicks::Now();
base::TimeDelta interval_to_next_refresh =
now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
@@ -9,7 +9,7 @@
if (needs_swap_size_notifications_)
client_->DidSwapWithSize(pixel_size);
#endif
-@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -147,7 +147,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
return gfx::OVERLAY_TRANSFORM_NONE;
}
Index: head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
===================================================================
--- head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2019-12-17 19:31:54 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-03-03 18:53:54 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -140,7 +140,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
+@@ -138,7 +138,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
// to the BFS.
std::unique_ptr<Display> display_;
Index: head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
===================================================================
--- head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,4 +1,4 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2019-12-17 19:31:16 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create(
output_surface->SetNeedsSwapSizeNotifications(
@@ -9,7 +9,7 @@
// For X11, we need notify client about swap completion after resizing, so the
// client can use it for synchronize with X11 WM.
output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -358,7 +358,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -353,7 +353,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
#if defined(OS_ANDROID)
if (display_client_)
display_client_->DidCompleteSwapWithSize(pixel_size);
Index: head/www/chromium/files/patch-content_app_content__main__runner__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ head/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig 2019-12-16 21:51:26 UTC
+--- content/app/content_main_runner_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ content/app/content_main_runner_impl.cc
@@ -101,17 +101,17 @@
#include "base/posix/global_descriptors.h"
@@ -30,7 +30,7 @@
#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
#include "content/child/field_trial.h"
-@@ -317,7 +317,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -298,7 +298,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
-@@ -414,7 +414,7 @@ void PreSandboxInit() {
+@@ -395,7 +395,7 @@ void PreSandboxInit() {
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -48,7 +48,7 @@
} // namespace
-@@ -472,7 +472,7 @@ int RunZygote(ContentMainDelegate* delegate) {
+@@ -453,7 +453,7 @@ int RunZygote(ContentMainDelegate* delegate) {
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -57,7 +57,7 @@
PreSandboxInit();
#endif
-@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
+@@ -618,11 +618,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
base::GlobalDescriptors::kBaseDescriptor);
#endif // !OS_ANDROID
Index: head/www/chromium/files/patch-content_browser_browser__main__loop.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ head/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/browser_main_loop.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/browser_main_loop.cc
-@@ -247,6 +247,13 @@
+@@ -248,6 +248,13 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -14,7 +14,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -582,6 +589,11 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -603,6 +610,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)
-@@ -627,7 +639,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -648,7 +660,7 @@ int BrowserMainLoop::EarlyInitialization() {
}
#endif // !defined(OS_MACOSX)
@@ -35,7 +35,7 @@
defined(OS_ANDROID)
// We use quite a few file descriptors for our IPC as well as disk the disk
// cache,and the default limit on the Mac is low (256), so bump it up.
-@@ -637,7 +649,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -658,7 +670,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);
Index: head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2019-03-11 22:00:57 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -17,7 +17,9 @@
#include "content/public/common/sandboxed_process_launcher_delegate.h"
@@ -10,7 +10,7 @@
#include "services/service_manager/zygote/host/zygote_communication_linux.h"
#include "services/service_manager/zygote/host/zygote_host_impl_linux.h"
-@@ -69,6 +71,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
@@ -18,7 +18,7 @@
service_manager::ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
? nullptr
-@@ -82,7 +85,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
GetProcessType());
*launch_result = LAUNCH_RESULT_SUCCESS;
@@ -26,7 +26,7 @@
if (handle) {
// This is just a starting score for a renderer or extension (the
// only types of processes that will be started this way). It will
-@@ -93,13 +95,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -92,13 +94,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
handle, kLowestRendererOomScore);
}
@@ -41,7 +41,7 @@
Process process;
process.process = base::LaunchProcess(*command_line(), options);
-@@ -117,10 +119,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -116,10 +118,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
const ChildProcessLauncherHelper::Process& process,
bool known_dead) {
ChildProcessTerminationInfo info;
@@ -56,7 +56,7 @@
info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
&info.exit_code);
} else {
-@@ -144,13 +150,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -143,13 +149,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
DCHECK(CurrentlyOnProcessLauncherTaskRunner());
process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
Index: head/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc
+++ head/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc
@@ -1,6 +1,6 @@
---- content/browser/compositor/gpu_process_transport_factory.cc.orig 2019-12-17 19:32:45 UTC
+--- content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/compositor/gpu_process_transport_factory.cc
-@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
+@@ -115,7 +115,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
}
Index: head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -1087,7 +1087,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
+@@ -1039,7 +1039,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
std::unique_ptr<base::CommandLine> cmd_line =
std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
#else
Index: head/www/chromium/files/patch-content_browser_media_media__internals.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_media_media__internals.cc
+++ head/www/chromium/files/patch-content_browser_media_media__internals.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_internals.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/media/media_internals.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/media/media_internals.cc
-@@ -513,7 +513,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+@@ -512,7 +512,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
device_dict->SetString("id", descriptor.device_id);
device_dict->SetString("name", descriptor.GetNameAndModel());
device_dict->Set("formats", std::move(format_list));
Index: head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
+++ head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/ppapi_plugin_process_host.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/ppapi_plugin_process_host.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/ppapi_plugin_process_host.cc
-@@ -366,7 +366,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
+@@ -365,7 +365,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
base::CommandLine::StringType plugin_launcher =
browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
Index: head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
===================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ head/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-12-16 21:51:26 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2020-03-03 18:53:54 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -439,10 +439,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -473,10 +473,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
is_for_guests_only_ = is_for_guests_only;
}
@@ -11,5 +11,5 @@
-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- RendererAudioOutputStreamFactoryContext*
- GetRendererAudioOutputStreamFactoryContext() override;
+ // Called when a video capture stream or an audio stream is added or removed
+ // and used to determine if the process should be backgrounded or not.
Index: head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ head/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-12-16 21:51:26 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -238,7 +238,7 @@
+@@ -243,7 +243,7 @@
#include "content/browser/gpu/gpu_data_manager_impl.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include <sys/time.h>
-@@ -1160,7 +1160,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1170,7 +1170,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;
-@@ -1171,7 +1171,7 @@ size_t GetPlatformProcessLimit() {
+@@ -1181,7 +1181,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)
-@@ -1219,7 +1219,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
+@@ -1229,7 +1229,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
return;
}
@@ -36,7 +36,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -1597,7 +1597,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -1628,7 +1628,7 @@ bool RenderProcessHostImpl::Init() {
renderer_prefix =
browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
Index: head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -208,7 +208,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -209,7 +209,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -116,7 +116,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -2212,7 +2212,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2180,7 +2180,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
return NeedsInputGrab();
#endif
return false;
-@@ -2385,7 +2385,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2349,7 +2349,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-10-21 19:06:32 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -620,7 +620,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -611,7 +611,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
if (event->type() == ui::ET_MOUSE_EXITED) {
if (mouse_locked || selection_popup)
return false;
Index: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
+++ head/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
@@ -1,6 +1,6 @@
---- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2019-10-21 19:06:32 UTC
+--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/scheduler/responsiveness/jank_monitor.cc
-@@ -293,7 +293,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
+@@ -321,7 +321,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
// in context menus, among others). Simply ignore the mismatches for now.
// See https://crbug.com/929813 for the details of why the mismatch
// happens.
Index: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
+++ head/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
@@ -1,6 +1,6 @@
---- content/browser/scheduler/responsiveness/watcher.cc.orig 2019-09-16 09:41:14 UTC
+--- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-03-03 18:53:07 UTC
+++ content/browser/scheduler/responsiveness/watcher.cc
-@@ -96,7 +96,7 @@ void Watcher::DidRunTask(const base::PendingTask* task
+@@ -101,7 +101,7 @@ void Watcher::DidRunTask(const base::PendingTask* task
// in context menus, among others). Simply ignore the mismatches for now.
// See https://crbug.com/929813 for the details of why the mismatch
// happens.
@@ -9,7 +9,7 @@
return currently_running_metadata_ui_.clear();
#endif
DCHECK_LE(*mismatched_task_identifiers, 1);
-@@ -156,7 +156,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque
+@@ -170,7 +170,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque
mismatched_event_identifiers_ui_ += 1;
// See comment in DidRunTask() for why |currently_running_metadata_ui_| may
// be reset.
Index: head/www/chromium/files/patch-content_browser_utility__process__host.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ head/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,16 +1,7 @@
---- content/browser/utility_process_host.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/utility_process_host.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/utility_process_host.cc
-@@ -56,7 +56,7 @@
- #include "services/network/network_sandbox_win.h"
- #endif
+@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
- #include "content/browser/font_service.h" // nogncheck
- #endif
-@@ -217,7 +217,7 @@ UtilityProcessHost::UtilityProcessHost()
-
UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
: sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
-#if defined(OS_LINUX)
@@ -18,12 +9,3 @@
child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
#else
child_flags_(ChildProcessHost::CHILD_NORMAL),
-@@ -523,7 +523,7 @@ base::Optional<std::string> UtilityProcessHost::GetSer
-
- void UtilityProcessHost::BindHostReceiver(
- mojo::GenericPendingReceiver receiver) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
- ConnectToFontService(std::move(font_receiver));
- return;
Index: head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
===================================================================
--- head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
+++ head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
@@ -1,6 +1,6 @@
---- content/browser/webui/shared_resources_data_source.cc.orig 2019-12-16 21:51:26 UTC
+--- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-03 18:53:54 UTC
+++ content/browser/webui/shared_resources_data_source.cc
-@@ -126,12 +126,12 @@ const std::map<int, std::string> CreateMojoResourceIdT
+@@ -127,12 +127,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"},
Index: head/www/chromium/files/patch-content_common_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-content_common_BUILD.gn
+++ head/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2019-12-16 21:51:26 UTC
+--- content/common/BUILD.gn.orig 2020-03-03 18:53:54 UTC
+++ content/common/BUILD.gn
-@@ -366,6 +366,12 @@ source_set("common") {
+@@ -363,6 +363,12 @@ source_set("common") {
libs += [ "android" ]
}
Index: head/www/chromium/files/patch-content_gpu_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-content_gpu_BUILD.gn
+++ head/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,6 +1,6 @@
---- content/gpu/BUILD.gn.orig 2019-12-16 21:51:26 UTC
+--- content/gpu/BUILD.gn.orig 2020-03-03 18:53:54 UTC
+++ content/gpu/BUILD.gn
-@@ -126,7 +126,7 @@ target(link_target_type, "gpu_sources") {
+@@ -132,7 +132,7 @@ target(link_target_type, "gpu_sources") {
# Use DRI on desktop Linux builds.
if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
Index: head/www/chromium/files/patch-content_gpu_gpu__main.cc
===================================================================
--- head/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ head/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig 2019-12-16 21:51:26 UTC
+--- content/gpu/gpu_main.cc.orig 2020-03-03 18:53:54 UTC
+++ content/gpu/gpu_main.cc
@@ -82,7 +82,7 @@
#include "ui/gfx/x/x11_switches.h" // nogncheck
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "content/public/common/sandbox_init.h"
#include "services/service_manager/sandbox/linux/sandbox_linux.h"
-@@ -103,7 +103,7 @@ namespace content {
+@@ -106,7 +106,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -164,7 +164,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif defined(OS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -268,7 +268,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -298,7 +298,7 @@ int GpuMain(const MainFunctionParams& parameters) {
main_thread_task_executor =
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif defined(OS_MACOSX)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -372,7 +372,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -409,7 +409,7 @@ int GpuMain(const MainFunctionParams& parameters) {
namespace {
@@ -45,7 +45,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) {
-@@ -407,7 +407,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -444,7 +444,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
return res;
}
Index: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-12-16 21:51:26 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-03-03 18:53:07 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -19,7 +19,7 @@
@@ -18,17 +18,8 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
ChildThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -50,7 +50,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
- }
-
- void PpapiBlinkPlatformImpl::Shutdown() {
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- // 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()
-@@ -60,7 +60,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
- }
+@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+ void PpapiBlinkPlatformImpl::Shutdown() {}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
Index: head/www/chromium/files/patch-content_public_common_child__process__host.h
===================================================================
--- head/www/chromium/files/patch-content_public_common_child__process__host.h
+++ head/www/chromium/files/patch-content_public_common_child__process__host.h
@@ -1,6 +1,6 @@
---- content/public/common/child_process_host.h.orig 2019-10-21 19:06:32 UTC
+--- content/public/common/child_process_host.h.orig 2020-03-03 18:53:07 UTC
+++ content/public/common/child_process_host.h
-@@ -52,7 +52,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
+@@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
// No special behavior requested.
CHILD_NORMAL = 0,
Index: head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
===================================================================
--- head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
+++ head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
@@ -1,9 +1,9 @@
---- content/public/common/common_param_traits_macros.h.orig 2019-12-16 21:51:26 UTC
+--- content/public/common/common_param_traits_macros.h.orig 2020-03-03 18:53:54 UTC
+++ content/public/common/common_param_traits_macros.h
-@@ -339,7 +339,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
+@@ -332,7 +332,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
+ IPC_STRUCT_TRAITS_MEMBER(accept_languages)
IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
- IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
Index: head/www/chromium/files/patch-content_public_common_content__features.cc
===================================================================
--- head/www/chromium/files/patch-content_public_common_content__features.cc
+++ head/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_features.cc.orig 2019-12-16 21:51:26 UTC
+--- content/public/common/content_features.cc.orig 2020-03-03 18:53:54 UTC
+++ content/public/common/content_features.cc
-@@ -53,7 +53,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
+@@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
const base::Feature kAudioServiceOutOfProcess{
"AudioServiceOutOfProcess",
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -628,7 +628,7 @@ const base::Feature kWebAssemblyThreads {
+@@ -622,7 +622,7 @@ const base::Feature kWebAssemblyThreads {
};
// Enable WebAssembly trap handler.
@@ -18,7 +18,7 @@
defined(ARCH_CPU_X86_64)
const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -663,7 +663,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
+@@ -657,7 +657,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
// https://w3c.github.io/webauthn
const base::Feature kWebAuthCable {
"WebAuthenticationCable",
Index: head/www/chromium/files/patch-content_public_common_content__switches.h
===================================================================
--- head/www/chromium/files/patch-content_public_common_content__switches.h
+++ head/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig 2019-12-16 21:51:26 UTC
+--- content/public/common/content_switches.h.orig 2020-03-03 18:53:54 UTC
+++ content/public/common/content_switches.h
-@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
+@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
#endif
Index: head/www/chromium/files/patch-content_public_common_content__switches.cc
===================================================================
--- head/www/chromium/files/patch-content_public_common_content__switches.cc
+++ head/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2019-12-16 21:51:26 UTC
+--- content/public/common/content_switches.cc.orig 2020-03-03 18:53:54 UTC
+++ content/public/common/content_switches.cc
-@@ -976,7 +976,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
+@@ -981,7 +981,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
// Enable indication that browser is controlled by automation.
const char kEnableAutomation[] = "enable-automation";
Index: head/www/chromium/files/patch-content_public_test_browser__test__base.cc
===================================================================
--- head/www/chromium/files/patch-content_public_test_browser__test__base.cc
+++ head/www/chromium/files/patch-content_public_test_browser__test__base.cc
@@ -1,6 +1,6 @@
---- content/public/test/browser_test_base.cc.orig 2019-12-16 21:51:26 UTC
+--- content/public/test/browser_test_base.cc.orig 2020-03-03 18:53:54 UTC
+++ content/public/test/browser_test_base.cc
-@@ -97,6 +97,10 @@
+@@ -96,6 +96,10 @@
#include "ui/views/test/event_generator_delegate_mac.h"
#endif
Index: head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig 2019-12-16 21:51:26 UTC
+--- content/renderer/render_thread_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -185,12 +185,21 @@
+@@ -173,12 +173,21 @@
#include "mojo/public/cpp/bindings/message_dumper.h"
#endif
@@ -22,7 +22,7 @@
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
-@@ -921,7 +930,7 @@ void RenderThreadImpl::Init() {
+@@ -735,7 +744,7 @@ void RenderThreadImpl::Init() {
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@@ -31,16 +31,16 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
-@@ -951,7 +960,7 @@ void RenderThreadImpl::Init() {
+@@ -758,7 +767,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
- discardable_shared_memory_manager_.get());
+ discardable_memory_allocator_.get());
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
if (base::FeatureList::IsEnabled(
blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
render_message_filter()->SetThreadPriority(
-@@ -1327,7 +1336,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1128,7 +1137,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
#else
cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
Index: head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
===================================================================
--- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2019-12-16 21:51:26 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2020-03-03 18:53:54 UTC
+++ content/renderer/renderer_blink_platform_impl.h
@@ -30,7 +30,7 @@
#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -230,7 +230,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -218,7 +218,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
@@ -18,7 +18,7 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -254,7 +254,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
Index: head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
===================================================================
--- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-12-16 21:51:26 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-03-03 18:53:54 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -104,7 +104,7 @@
+@@ -99,7 +99,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
-@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
if (RenderThreadImpl::current()) {
io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,17 +27,8 @@
if (sandboxEnabled()) {
#if defined(OS_MACOSX)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -217,7 +217,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
- }
+@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
- void RendererBlinkPlatformImpl::Shutdown() {
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- // 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()
-@@ -282,7 +282,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
-
void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
base::PlatformThreadId thread_id) {
-#if defined(OS_LINUX)
@@ -45,7 +36,7 @@
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
render_thread->render_message_filter()->SetThreadPriority(
thread_id, base::ThreadPriority::DISPLAY);
-@@ -295,7 +295,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
Index: head/www/chromium/files/patch-content_shell_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-content_shell_BUILD.gn
+++ head/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2019-12-16 21:51:26 UTC
+--- content/shell/BUILD.gn.orig 2020-03-03 18:53:54 UTC
+++ content/shell/BUILD.gn
-@@ -971,7 +971,7 @@ group("content_shell_crash_test") {
+@@ -995,7 +995,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
Index: head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
===================================================================
--- head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
+++ head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/web_test/web_test_browser_context.cc.orig 2019-10-21 19:06:33 UTC
+--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-03-03 18:53:08 UTC
+++ content/shell/browser/web_test/web_test_browser_context.cc
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
#if defined(OS_WIN)
#include "base/base_paths_win.h"
Index: head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
===================================================================
--- head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
+++ head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
@@ -1,4 +1,4 @@
---- content/shell/test_runner/test_runner.cc.orig 2019-12-16 21:51:26 UTC
+--- content/shell/test_runner/test_runner.cc.orig 2020-03-03 18:53:54 UTC
+++ content/shell/test_runner/test_runner.cc
@@ -64,7 +64,7 @@
#include "ui/gfx/geometry/size.h"
@@ -9,7 +9,7 @@
#include "third_party/blink/public/platform/web_font_render_style.h"
#endif
-@@ -1514,7 +1514,7 @@ void TestRunner::Reset() {
+@@ -1507,7 +1507,7 @@ void TestRunner::Reset() {
drag_image_.reset();
blink::WebSecurityPolicy::ClearOriginAccessList();
@@ -18,7 +18,7 @@
blink::WebFontRenderStyle::SetSubpixelPositioning(false);
#endif
-@@ -2088,7 +2088,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
+@@ -2081,7 +2081,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
}
void TestRunner::SetTextSubpixelPositioning(bool value) {
Index: head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
===================================================================
--- head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
+++ head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,6 +1,6 @@
---- device/gamepad/gamepad_provider.cc.orig 2019-10-21 19:06:34 UTC
+--- device/gamepad/gamepad_provider.cc.orig 2020-03-03 18:53:55 UTC
+++ device/gamepad/gamepad_provider.cc
-@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
+@@ -157,7 +157,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
if (!polling_thread_)
polling_thread_.reset(new base::Thread("Gamepad polling thread"));
Index: head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
===================================================================
--- head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2019-09-09 21:55:17 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2020-03-03 18:53:08 UTC
+++ extensions/browser/api/messaging/message_service.cc
@@ -61,7 +61,7 @@ namespace {
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -382,7 +382,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -391,7 +391,7 @@ void MessageService::OpenChannelToNativeApp(
if (!opener_port->IsValidPort())
return;
@@ -18,7 +18,7 @@
bool has_permission = extension->permissions_data()->HasAPIPermission(
APIPermission::kNativeMessaging);
if (!has_permission) {
-@@ -432,11 +432,11 @@ void MessageService::OpenChannelToNativeApp(
+@@ -441,11 +441,11 @@ void MessageService::OpenChannelToNativeApp(
channel->opener->IncrementLazyKeepaliveCount();
AddChannel(std::move(channel), receiver_port_id);
Index: head/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
===================================================================
--- head/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
+++ head/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
@@ -1,9 +1,9 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-04-30 22:22:49 UTC
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-03-03 18:53:08 UTC
+++ extensions/browser/browser_context_keyed_service_factories.cc
-@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
- #if defined(OS_CHROMEOS)
- NetworkingConfigServiceFactory::GetInstance();
- #endif
+@@ -71,7 +71,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+ HidDeviceManager::GetFactoryInstance();
+ IdleManagerFactory::GetInstance();
+ ManagementAPI::GetFactoryInstance();
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
NetworkingPrivateEventRouterFactory::GetInstance();
Index: head/www/chromium/files/patch-extensions_common_api___permission__features.json
===================================================================
--- head/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ head/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,4 +1,4 @@
---- extensions/common/api/_permission_features.json.orig 2019-10-21 19:06:34 UTC
+--- extensions/common/api/_permission_features.json.orig 2020-03-03 18:53:55 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
-@@ -461,7 +461,7 @@
+@@ -468,7 +468,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
-@@ -492,7 +492,7 @@
+@@ -499,7 +499,7 @@
"networkingPrivate": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
Index: head/www/chromium/files/patch-extensions_common_api_runtime.json
===================================================================
--- head/www/chromium/files/patch-extensions_common_api_runtime.json
+++ head/www/chromium/files/patch-extensions_common_api_runtime.json
@@ -1,6 +1,6 @@
---- extensions/common/api/runtime.json.orig 2019-04-30 22:22:49 UTC
+--- extensions/common/api/runtime.json.orig 2020-03-03 18:53:55 UTC
+++ extensions/common/api/runtime.json
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
"id": "PlatformOs",
"type": "string",
"description": "The operating system chrome is running on.",
Index: head/www/chromium/files/patch-extensions_common_image__util.cc
===================================================================
--- head/www/chromium/files/patch-extensions_common_image__util.cc
+++ head/www/chromium/files/patch-extensions_common_image__util.cc
@@ -1,6 +1,6 @@
---- extensions/common/image_util.cc.orig 2019-12-16 21:51:26 UTC
+--- extensions/common/image_util.cc.orig 2020-03-03 18:53:08 UTC
+++ extensions/common/image_util.cc
-@@ -19,7 +19,11 @@
+@@ -18,7 +18,11 @@
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "base/timer/elapsed_timer.h"
Index: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
===================================================================
--- head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
+++ head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
@@ -1,7 +1,7 @@
---- gpu/command_buffer/service/external_vk_image_backing.h.orig 2019-12-16 21:51:26 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-03 18:53:55 UTC
+++ gpu/command_buffer/service/external_vk_image_backing.h
-@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag
- base::Optional<DawnTextureFormat> dawn_format,
+@@ -135,7 +135,7 @@ class ExternalVkImageBacking final : public SharedImag
+ base::Optional<WGPUTextureFormat> wgpu_format,
base::Optional<uint32_t> memory_type_index);
-#ifdef OS_LINUX
Index: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
===================================================================
--- head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-12-16 21:51:26 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/command_buffer/service/external_vk_image_backing.cc
@@ -26,7 +26,7 @@
#include "ui/gl/buildflags.h"
@@ -18,43 +18,51 @@
#define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
#endif
-@@ -527,7 +527,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
+@@ -535,7 +535,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
MemoryTypeTracker* tracker,
- DawnDevice dawnDevice) {
+ WGPUDevice wgpuDevice) {
-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
- if (!dawn_format_) {
+ if (!wgpu_format_) {
DLOG(ERROR) << "Format not supported for Dawn";
return nullptr;
-@@ -550,7 +550,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+@@ -558,14 +558,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
return std::make_unique<ExternalVkImageDawnRepresentation>(
- manager, this, tracker, dawnDevice, dawn_format_.value(), memory_fd,
+ manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd,
image_info.fAlloc.fSize, memory_type_index_.value());
-#else // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN)
+#else // !defined(OS_LINUX) || !defined(OS_BSD) || !BUILDFLAG(USE_DAWN)
NOTIMPLEMENTED_LOG_ONCE();
return nullptr;
#endif
-@@ -567,7 +567,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
- #if defined(OS_FUCHSIA)
- NOTIMPLEMENTED_LOG_ONCE();
- return nullptr;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+ }
+
+ GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
GrVkImageInfo image_info;
bool result = backend_texture_.getVkImageInfo(&image_info);
DCHECK(result);
-@@ -635,7 +635,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
+@@ -629,7 +629,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
+ return nullptr;
}
- return std::make_unique<ExternalVkImageGlRepresentation>(
- manager, this, tracker, texture_, texture_->service_id());
--#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
-+#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
- #error Unsupported OS
- #endif
- }
-@@ -661,7 +661,7 @@ ExternalVkImageBacking::ProduceSkia(
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (!texture_) {
+ GLuint texture_service_id = ProduceGLTextureInternal();
+ if (!texture_service_id)
+@@ -675,7 +675,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
+ return nullptr;
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (!texture_passthrough_) {
+ GLuint texture_service_id = ProduceGLTextureInternal();
+ if (!texture_service_id)
+@@ -713,7 +713,7 @@ ExternalVkImageBacking::ProduceSkia(
tracker);
}
Index: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
===================================================================
--- head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
+++ head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-12-16 21:51:26 UTC
+--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/command_buffer/service/external_vk_image_gl_representation.cc
-@@ -189,7 +189,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
+@@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
#if defined(OS_FUCHSIA)
NOTIMPLEMENTED_LOG_ONCE();
return 0;
@@ -9,7 +9,7 @@
if (handle.vk_handle_type() !=
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
-@@ -204,7 +204,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
+@@ -194,7 +194,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
fd.release());
return gl_semaphore;
Index: head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
===================================================================
--- head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
+++ head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-10-21 19:06:35 UTC
+--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/command_buffer/tests/gl_test_utils.cc
@@ -23,7 +23,7 @@
#include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
#include "ui/gl/gl_image_native_pixmap.h"
#endif
-@@ -443,7 +443,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
+@@ -446,7 +446,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
}
Index: head/www/chromium/files/patch-gpu_config_gpu__control__list.cc
===================================================================
--- head/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ head/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_control_list.cc.orig 2019-10-21 19:06:35 UTC
+--- gpu/config/gpu_control_list.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/config/gpu_control_list.cc
@@ -16,7 +16,11 @@
#include "base/values.h"
@@ -21,7 +21,7 @@
return kGLTypeGL;
#elif defined(OS_MACOSX)
return kGLTypeGL;
-@@ -707,7 +711,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -713,7 +717,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
return kOsAndroid;
#elif defined(OS_FUCHSIA)
return kOsFuchsia;
Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
===================================================================
--- head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig 2019-12-16 21:51:26 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/ipc/service/gpu_init.cc
@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
#endif
@@ -18,17 +18,17 @@
class GpuWatchdogInit {
public:
-@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
- // crash during feature collection.
- gpu::SetKeysForCrashLogging(gpu_info_);
+@@ -170,7 +170,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ gpu_info_.subpixel_font_rendering = true;
+ #endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA
gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
return false;
-@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
- sandbox_helper_->PreSandboxStartup();
+@@ -254,7 +254,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ }
bool attempted_startsandbox = false;
-#if defined(OS_LINUX)
@@ -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.
-@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -263,7 +263,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
attempted_startsandbox = true;
}
@@ -45,7 +45,7 @@
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
-@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -288,14 +288,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
if (gl_initialized && use_swiftshader &&
gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
@@ -60,9 +60,9 @@
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_BSD
}
- if (!gl_initialized)
- gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
-@@ -314,7 +314,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+
+ if (!gl_initialized) {
+@@ -340,7 +340,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (use_swiftshader) {
@@ -71,7 +71,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
<< "failed";
return false;
}
@@ -80,7 +80,7 @@
}
} else { // use_swiftshader == true
switch (gpu_preferences_.use_vulkan) {
-@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -410,7 +410,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_);
@@ -89,7 +89,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -429,7 +429,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
return false;
}
}
@@ -98,7 +98,7 @@
if (use_swiftshader) {
AdjustInfoToSwiftShader();
-@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -608,7 +608,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_);
@@ -107,7 +107,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
}
}
Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
===================================================================
--- head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
+++ head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-12-16 21:51:26 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-03 18:53:55 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.h
-@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+@@ -181,7 +181,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
base::ThreadTicks GetWatchedThreadTime();
#endif
@@ -9,9 +9,9 @@
int GetActiveTTY() const;
#endif
-@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
- base::Time check_time_;
- base::TimeTicks check_timeticks_;
+@@ -232,7 +232,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+ // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded.
+ bool is_watchdog_start_histogram_recorded = false;
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
===================================================================
--- head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
+++ head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-12-16 21:51:26 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-03-03 18:53:55 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.cc
-@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000;
+@@ -41,7 +41,7 @@ const int kGpuTimeout = 15000;
const int kGpuTimeout = 10000;
#endif
@@ -9,7 +9,7 @@
const base::FilePath::CharType kTtyFilePath[] =
FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
#endif
-@@ -59,7 +59,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
+@@ -60,7 +60,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
arm_cpu_time_(),
#endif
suspension_counter_(this)
@@ -18,7 +18,7 @@
,
host_tty_(-1)
#endif
-@@ -76,7 +76,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
+@@ -77,7 +77,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
DCHECK(result);
#endif
@@ -27,7 +27,7 @@
tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
host_tty_ = GetActiveTTY();
#endif
-@@ -222,7 +222,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
+@@ -223,7 +223,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
base::PowerMonitor::RemoveObserver(this);
@@ -36,7 +36,7 @@
if (tty_file_)
fclose(tty_file_);
#endif
-@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
+@@ -380,7 +380,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
return;
#endif
@@ -45,7 +45,7 @@
// Don't crash if we're not on the TTY of our host X11 server.
int active_tty = GetActiveTTY();
if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
-@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
+@@ -538,7 +538,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
}
#endif
Index: head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
===================================================================
--- head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
+++ head/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-12-16 21:51:26 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-03-03 18:53:55 UTC
+++ headless/lib/browser/headless_content_browser_client.cc
-@@ -166,7 +166,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
+@@ -167,7 +167,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,
-@@ -177,7 +177,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
+@@ -178,7 +178,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
#endif // defined(HEADLESS_USE_BREAKPAD)
}
Index: head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
===================================================================
--- head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig 2019-10-21 19:06:35 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig 2020-03-03 18:53:55 UTC
+++ headless/lib/headless_content_main_delegate.cc
-@@ -328,7 +328,7 @@ int HeadlessContentMainDelegate::RunProcess(
+@@ -401,7 +401,7 @@ int HeadlessContentMainDelegate::RunProcess(
}
#endif // !defined(CHROME_MULTIPLE_DLL_CHILD)
@@ -9,7 +9,7 @@
void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop();
struct sigaction sigact;
-@@ -363,7 +363,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {
+@@ -436,7 +436,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {
breakpad::InitCrashReporter(process_type);
#endif
}
Index: head/www/chromium/files/patch-ipc_ipc__channel.h
===================================================================
--- head/www/chromium/files/patch-ipc_ipc__channel.h
+++ head/www/chromium/files/patch-ipc_ipc__channel.h
@@ -1,6 +1,6 @@
---- ipc/ipc_channel.h.orig 2019-12-16 21:51:27 UTC
+--- ipc/ipc_channel.h.orig 2020-03-03 18:53:55 UTC
+++ ipc/ipc_channel.h
-@@ -280,7 +280,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
+@@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
static std::string GenerateUniqueRandomChannelID();
#endif
Index: head/www/chromium/files/patch-ipc_ipc__channel__common.cc
===================================================================
--- head/www/chromium/files/patch-ipc_ipc__channel__common.cc
+++ head/www/chromium/files/patch-ipc_ipc__channel__common.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_channel_common.cc.orig 2019-06-04 18:55:25 UTC
+--- ipc/ipc_channel_common.cc.orig 2020-03-03 18:53:09 UTC
+++ ipc/ipc_channel_common.cc
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
namespace IPC {
@@ -9,7 +9,7 @@
namespace {
int g_global_pid = 0;
-@@ -25,7 +25,7 @@ int Channel::GetGlobalPid() {
+@@ -26,7 +26,7 @@ int Channel::GetGlobalPid() {
return g_global_pid;
}
Index: head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
===================================================================
--- head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
+++ head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_channel_mojo.cc.orig 2019-12-16 21:51:27 UTC
+--- ipc/ipc_channel_mojo.cc.orig 2020-03-03 18:53:09 UTC
+++ ipc/ipc_channel_mojo.cc
-@@ -65,10 +65,10 @@ class MojoChannelFactory : public ChannelFactory {
+@@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory {
};
base::ProcessId GetSelfPID() {
Index: head/www/chromium/files/patch-ipc_ipc__message__utils.h
===================================================================
--- head/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ head/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig 2019-10-21 19:06:36 UTC
+--- ipc/ipc_message_utils.h.orig 2020-03-03 18:53:55 UTC
+++ ipc/ipc_message_utils.h
-@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {
+@@ -209,7 +209,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.
Index: head/www/chromium/files/patch-media_audio_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-media_audio_BUILD.gn
+++ head/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig 2019-12-16 21:51:27 UTC
+--- media/audio/BUILD.gn.orig 2020-03-03 18:53:55 UTC
+++ media/audio/BUILD.gn
-@@ -250,8 +250,18 @@ source_set("audio") {
+@@ -238,8 +238,18 @@ source_set("audio") {
]
}
Index: head/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc
===================================================================
--- head/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc
+++ head/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc
@@ -0,0 +1,38 @@
+--- media/gpu/chromeos/libyuv_image_processor.cc.orig 2020-03-03 18:53:55 UTC
++++ media/gpu/chromeos/libyuv_image_processor.cc
+@@ -82,7 +82,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.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS,
+@@ -92,7 +92,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;
+@@ -191,7 +191,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));
+@@ -201,7 +201,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) {
Index: head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
===================================================================
--- head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
+++ head/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-12-16 21:51:27 UTC
+--- media/gpu/linux/platform_video_frame_utils.cc.orig 2020-03-03 18:53:55 UTC
+++ media/gpu/linux/platform_video_frame_utils.cc
-@@ -19,16 +19,16 @@
+@@ -20,16 +20,16 @@
#include "ui/gfx/linux/native_pixmap_dmabuf.h"
#include "ui/gfx/native_pixmap.h"
@@ -20,7 +20,7 @@
scoped_refptr<VideoFrame> CreateVideoFrameGpu(
gpu::GpuMemoryBufferFactory* factory,
-@@ -92,7 +92,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu(
+@@ -93,7 +93,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu(
gpu::kPlatformVideoFramePoolClientId));
return frame;
}
@@ -29,7 +29,7 @@
} // namespace
-@@ -104,11 +104,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame(
+@@ -105,11 +105,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame(
const gfx::Size& natural_size,
base::TimeDelta timestamp,
gfx::BufferUsage buffer_usage) {
Index: head/www/chromium/files/patch-media_media__options.gni
===================================================================
--- head/www/chromium/files/patch-media_media__options.gni
+++ head/www/chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2019-12-16 21:51:27 UTC
+--- media/media_options.gni.orig 2020-03-03 18:53:55 UTC
+++ media/media_options.gni
-@@ -117,6 +117,9 @@ declare_args() {
+@@ -114,6 +114,9 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
Index: head/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
===================================================================
--- head/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
+++ head/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
@@ -1,6 +1,6 @@
---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-12-16 21:51:27 UTC
+--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-03 18:53:55 UTC
+++ media/mojo/clients/mojo_video_encode_accelerator.cc
-@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
+@@ -125,7 +125,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
frame->layout().num_planes());
DCHECK(vea_.is_bound());
Index: head/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
===================================================================
--- head/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ head/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,6 +1,18 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-12-16 21:51:27 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-03-03 18:53:55 UTC
+++ media/mojo/mojom/video_frame_mojom_traits.cc
-@@ -56,7 +56,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+@@ -20,9 +20,9 @@
+ #include "ui/gfx/mojom/buffer_types_mojom_traits.h"
+ #include "ui/gfx/mojom/color_space_mojom_traits.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/posix/eintr_wrapper.h"
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ namespace mojo {
+
+@@ -60,7 +60,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
mojo_frame->PlaneOffset(media::VideoFrame::kVPlane)));
}
@@ -9,7 +21,7 @@
if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
std::vector<mojo::ScopedHandle> dmabuf_fds;
-@@ -157,7 +157,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
+@@ -161,7 +161,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
shared_buffer_data.u_offset(), shared_buffer_data.v_offset(),
shared_buffer_data.y_stride(), shared_buffer_data.u_stride(),
shared_buffer_data.v_stride(), timestamp);
Index: head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
===================================================================
--- head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
+++ head/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-12-16 21:51:27 UTC
+--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-03-03 18:53:55 UTC
+++ media/mojo/services/gpu_mojo_media_client.cc
@@ -65,7 +65,7 @@ namespace media {
namespace {
@@ -9,7 +9,7 @@
gpu::CommandBufferStub* GetCommandBufferStub(
scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
-@@ -265,7 +265,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+@@ -266,7 +266,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
command_buffer_id->route_id));
}
Index: head/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
===================================================================
--- head/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ head/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-12-16 21:51:27 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-03-03 18:53:55 UTC
+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -557,7 +557,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
}
bool is_software_backed_video_frame = !video_frame->HasTextures();
Index: head/www/chromium/files/patch-media_webrtc_webrtc__switches.cc
===================================================================
--- head/www/chromium/files/patch-media_webrtc_webrtc__switches.cc
+++ head/www/chromium/files/patch-media_webrtc_webrtc__switches.cc
@@ -1,6 +1,6 @@
---- media/webrtc/webrtc_switches.cc.orig 2019-12-17 19:45:42 UTC
+--- media/webrtc/webrtc_switches.cc.orig 2020-03-03 18:53:10 UTC
+++ media/webrtc/webrtc_switches.cc
-@@ -44,7 +44,7 @@ namespace media {
+@@ -50,7 +50,7 @@ namespace media {
bool IsWebRtcApmInAudioServiceEnabled() {
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -9,10 +9,3 @@
return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kForceDisableWebRtcApmInAudioService);
-@@ -53,4 +53,4 @@ bool IsWebRtcApmInAudioServiceEnabled() {
- #endif
- }
-
--} // namespace media
-\ No newline at end of file
-+} // namespace media
Index: head/www/chromium/files/patch-mojo_public_c_system_thunks.cc
===================================================================
--- head/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ head/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,6 +1,6 @@
---- mojo/public/c/system/thunks.cc.orig 2019-04-30 22:22:53 UTC
+--- mojo/public/c/system/thunks.cc.orig 2020-03-03 18:53:10 UTC
+++ mojo/public/c/system/thunks.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "mojo/public/c/system/core.h"
@@ -9,16 +9,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/optional.h"
-@@ -28,7 +28,7 @@ namespace {
-
- typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks);
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- PROTECTED_MEMORY_SECTION
- base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks;
- #endif
-@@ -65,7 +65,7 @@ namespace mojo {
+@@ -58,7 +58,7 @@ namespace mojo {
class CoreLibraryInitializer {
public:
CoreLibraryInitializer(const MojoInitializeOptions* options) {
@@ -27,7 +18,7 @@
bool application_provided_path = false;
base::Optional<base::FilePath> library_path;
if (options && options->struct_size >= sizeof(*options) &&
-@@ -84,7 +84,7 @@ class CoreLibraryInitializer {
+@@ -77,7 +77,7 @@ class CoreLibraryInitializer {
if (!library_path) {
// Default to looking for the library in the current working directory.
@@ -36,9 +27,9 @@
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
#elif defined(OS_WIN)
-@@ -138,16 +138,16 @@ class CoreLibraryInitializer {
+@@ -127,16 +127,16 @@ class CoreLibraryInitializer {
- CHECK_GT(g_thunks->size, 0u)
+ CHECK_GT(g_thunks.size, 0u)
<< "Invalid mojo_core library: " << library_path->value();
-#else // defined(OS_CHROMEOS) || defined(OS_LINUX)
+#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
Index: head/www/chromium/files/patch-net_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-net_BUILD.gn
+++ head/www/chromium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig 2019-12-16 21:51:27 UTC
+--- net/BUILD.gn.orig 2020-03-03 18:53:55 UTC
+++ net/BUILD.gn
-@@ -105,7 +105,7 @@ net_configs = [
+@@ -103,7 +103,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
]
@@ -9,7 +9,25 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1938,7 +1938,7 @@ component("net") {
+@@ -1834,6 +1834,17 @@ component("net") {
+ ]
+ }
+
++ if (is_bsd) {
++ sources -= [
++ "base/address_tracker_linux.cc",
++ "base/address_tracker_linux.h",
++ "base/network_change_notifier_linux.cc",
++ "base/network_change_notifier_linux.h",
++ "base/network_interfaces_linux.cc",
++ "base/network_interfaces_linux.h",
++ ]
++ }
++
+ if (is_mac) {
+ sources += [
+ "base/network_notification_thread_mac.cc",
+@@ -1960,7 +1971,7 @@ component("net") {
}
}
@@ -18,7 +36,7 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1971,7 +1971,7 @@ component("net") {
+@@ -1991,7 +2002,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux and Android.
@@ -27,20 +45,3 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -2065,6 +2065,16 @@ component("net") {
- ]
-
- sources -= [ "disk_cache/blockfile/file_posix.cc" ]
-+ }
-+
-+ if (is_bsd) {
-+ sources -= [
-+ "base/address_tracker_linux.cc",
-+ "base/address_tracker_linux.h",
-+ "base/network_change_notifier_linux.cc",
-+ "base/network_change_notifier_linux.h",
-+ "base/network_interfaces_linux.cc",
-+ ]
- }
-
- if (is_ios || is_mac) {
Index: head/www/chromium/files/patch-net_base_address__tracker__linux.cc
===================================================================
--- head/www/chromium/files/patch-net_base_address__tracker__linux.cc
+++ head/www/chromium/files/patch-net_base_address__tracker__linux.cc
@@ -1,105 +1,16 @@
---- net/base/address_tracker_linux.cc.orig 2019-12-16 21:51:27 UTC
+--- net/base/address_tracker_linux.cc.orig 2020-03-03 18:53:55 UTC
+++ net/base/address_tracker_linux.cc
-@@ -21,96 +21,10 @@
- namespace net {
- namespace internal {
+@@ -5,7 +5,9 @@
+ #include "net/base/address_tracker_linux.h"
--namespace {
--
--// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep
--// may send spurious messages over rtnetlink. RTM_NEWLINK messages where
--// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored.
--bool IgnoreWirelessChange(const struct nlmsghdr* header,
-- const struct ifinfomsg* msg) {
-- size_t length = IFLA_PAYLOAD(header);
-- for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length);
-- attr = RTA_NEXT(attr, length)) {
-- if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0)
-- return true;
-- }
-- return false;
--}
--
--// Retrieves address from NETLINK address message.
--// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0.
--bool GetAddress(const struct nlmsghdr* header,
-- IPAddress* out,
-- bool* really_deprecated) {
-- if (really_deprecated)
-- *really_deprecated = false;
-- const struct ifaddrmsg* msg =
-- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
-- size_t address_length = 0;
-- switch (msg->ifa_family) {
-- case AF_INET:
-- address_length = IPAddress::kIPv4AddressSize;
-- break;
-- case AF_INET6:
-- address_length = IPAddress::kIPv6AddressSize;
-- break;
-- default:
-- // Unknown family.
-- return false;
-- }
-- // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on
-- // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of
-- // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6
-- // have the IFA_LOCAL attribute.
-- uint8_t* address = NULL;
-- uint8_t* local = NULL;
-- size_t length = IFA_PAYLOAD(header);
-- for (const struct rtattr* attr =
-- reinterpret_cast<const struct rtattr*>(IFA_RTA(msg));
-- RTA_OK(attr, length);
-- attr = RTA_NEXT(attr, length)) {
-- switch (attr->rta_type) {
-- case IFA_ADDRESS:
-- DCHECK_GE(RTA_PAYLOAD(attr), address_length);
-- address = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
-- break;
-- case IFA_LOCAL:
-- DCHECK_GE(RTA_PAYLOAD(attr), address_length);
-- local = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
-- break;
-- case IFA_CACHEINFO: {
-- const struct ifa_cacheinfo *cache_info =
-- reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr));
-- if (really_deprecated)
-- *really_deprecated = (cache_info->ifa_prefered == 0);
-- } break;
-- default:
-- break;
-- }
-- }
-- if (local)
-- address = local;
-- if (!address)
-- return false;
-- *out = IPAddress(address, address_length);
-- return true;
--}
--
--} // namespace
--
- // static
- char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) {
-- memset(buf, 0, IFNAMSIZ);
-- base::ScopedFD ioctl_socket = GetSocketForIoctl();
-- if (!ioctl_socket.is_valid())
-- return buf;
--
-- struct ifreq ifr = {};
-- ifr.ifr_ifindex = interface_index;
--
-- if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0)
-- strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1);
-- return buf;
-+ NOTIMPLEMENTED();
-+ return NULL;
- }
-
- AddressTrackerLinux::AddressTrackerLinux()
-@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux(
+ #include <errno.h>
++#if !defined(OS_BSD)
+ #include <linux/if.h>
++#endif
+ #include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <utility>
+@@ -177,6 +179,7 @@ AddressTrackerLinux::AddressTrackerLinux(
AddressTrackerLinux::~AddressTrackerLinux() = default;
void AddressTrackerLinux::Init() {
@@ -107,7 +18,7 @@
netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
if (!netlink_fd_.is_valid()) {
PLOG(ERROR) << "Could not create NETLINK socket";
-@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
+@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
connection_type_initialized_cv_.Broadcast();
}
@@ -115,7 +26,7 @@
AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
AddressTrackerAutoLock lock(*this, address_map_lock_);
return address_map_;
-@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
+@@ -290,6 +294,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
const char* interface_name = get_interface_name_(interface_index, buf);
return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
}
@@ -123,15 +34,15 @@
NetworkChangeNotifier::ConnectionType
AddressTrackerLinux::GetCurrentConnectionType() {
-@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu
+@@ -348,6 +353,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu
bool* address_changed,
bool* link_changed,
bool* tunnel_changed) {
+#if !defined(OS_FREEBSD)
DCHECK(buffer);
- for (const struct nlmsghdr* header =
- reinterpret_cast<const struct nlmsghdr*>(buffer);
-@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu
+ // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes
+ // remaining in |buffer|.
+@@ -460,6 +466,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu
break;
}
}
@@ -142,7 +53,7 @@
}
void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
-@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
+@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
}
void AddressTrackerLinux::UpdateCurrentConnectionType() {
@@ -174,4 +85,4 @@
+ NOTIMPLEMENTED();
}
- int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting()
+ int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() {
Index: head/www/chromium/files/patch-net_base_network__change__notifier.cc
===================================================================
--- head/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ head/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig 2019-12-16 21:51:27 UTC
+--- net/base/network_change_notifier.cc.orig 2020-03-03 18:53:10 UTC
+++ net/base/network_change_notifier.cc
@@ -35,7 +35,7 @@
#include "net/base/network_change_notifier_linux.h"
@@ -9,7 +9,7 @@
#include "net/base/network_change_notifier_posix.h"
#elif defined(OS_FUCHSIA)
#include "net/base/network_change_notifier_fuchsia.h"
-@@ -240,7 +240,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -229,7 +229,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
// service in a separate process.
return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
initial_subtype);
@@ -18,7 +18,7 @@
return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
initial_subtype);
#elif defined(OS_LINUX)
-@@ -252,7 +252,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -241,7 +241,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
return std::make_unique<NetworkChangeNotifierFuchsia>(
0 /* required_features */);
#else
Index: head/www/chromium/files/patch-net_dns_host__resolver__proc.cc
===================================================================
--- head/www/chromium/files/patch-net_dns_host__resolver__proc.cc
+++ head/www/chromium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,6 +1,6 @@
---- net/dns/host_resolver_proc.cc.orig 2019-04-30 22:22:54 UTC
+--- net/dns/host_resolver_proc.cc.orig 2020-03-03 18:53:11 UTC
+++ net/dns/host_resolver_proc.cc
-@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
+@@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host,
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
Index: head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
===================================================================
--- head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,6 +1,6 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2019-10-21 19:06:38 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig 2020-03-03 18:53:11 UTC
+++ net/http/http_auth_gssapi_posix.cc
-@@ -366,8 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+@@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
static const char* const kDefaultLibraryNames[] = {
#if defined(OS_MACOSX)
"/System/Library/Frameworks/GSS.framework/GSS"
Index: head/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
===================================================================
--- head/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
+++ head/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
@@ -1,6 +1,6 @@
---- net/nqe/network_quality_estimator_unittest.cc.orig 2019-10-21 19:06:38 UTC
+--- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-03 18:53:55 UTC
+++ net/nqe/network_quality_estimator_unittest.cc
-@@ -2144,7 +2144,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
+@@ -2146,7 +2146,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
// TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
// enabled only on certain platforms.
// ChromeOS is disabled due to crbug.com/986904
Index: head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
===================================================================
--- head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
+++ head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
@@ -1,6 +1,6 @@
---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-10-21 19:06:38 UTC
+--- net/proxy_resolution/proxy_resolution_service.cc.orig 2020-03-03 18:53:55 UTC
+++ net/proxy_resolution/proxy_resolution_service.cc
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
#elif defined(OS_MACOSX)
#include "net/proxy_resolution/proxy_config_service_mac.h"
#include "net/proxy_resolution/proxy_resolver_mac.h"
@@ -9,7 +9,7 @@
#include "net/proxy_resolution/proxy_config_service_linux.h"
#elif defined(OS_ANDROID)
#include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -62,7 +62,7 @@ namespace net {
+@@ -63,7 +63,7 @@ namespace net {
namespace {
#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \
@@ -18,7 +18,7 @@
constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
semantics {
-@@ -1547,7 +1547,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
+@@ -1556,7 +1556,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return std::make_unique<UnsetProxyConfigService>();
Index: head/www/chromium/files/patch-net_url__request_url__request__context.h
===================================================================
--- head/www/chromium/files/patch-net_url__request_url__request__context.h
+++ head/www/chromium/files/patch-net_url__request_url__request__context.h
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context.h.orig 2019-10-30 16:20:11 UTC
+--- net/url_request/url_request_context.h.orig 2020-03-03 18:53:55 UTC
+++ net/url_request/url_request_context.h
-@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext
+@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext
// session.
const HttpNetworkSession::Context* GetNetworkSessionContext() const;
Index: head/www/chromium/files/patch-net_url__request_url__request__context.cc
===================================================================
--- head/www/chromium/files/patch-net_url__request_url__request__context.cc
+++ head/www/chromium/files/patch-net_url__request_url__request__context.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context.cc.orig 2019-10-30 16:19:57 UTC
+--- net/url_request/url_request_context.cc.orig 2020-03-03 18:53:55 UTC
+++ net/url_request/url_request_context.cc
-@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext::
+@@ -90,7 +90,7 @@ const HttpNetworkSession::Context* URLRequestContext::
return &network_session->context();
}
Index: head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
===================================================================
--- head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ head/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-12-16 21:51:27 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2020-03-03 18:53:55 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -496,7 +496,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -508,7 +508,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.
-@@ -505,7 +505,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -517,7 +517,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
ProxyResolutionService::CreateSystemProxyConfigService(
base::ThreadTaskRunnerHandle::Get().get());
}
Index: head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
===================================================================
--- head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,4 +1,4 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2019-12-16 21:51:27 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig 2020-03-03 18:53:55 UTC
+++ pdf/pdfium/pdfium_engine.cc
@@ -52,7 +52,7 @@
#include "ui/gfx/geometry/rect.h"
@@ -27,7 +27,7 @@
// PreviewModeClient does not know its pp::Instance.
SetLastInstance(client_->GetPluginInstance());
#endif
-@@ -867,7 +867,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
+@@ -878,7 +878,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
KillFormFocus();
@@ -36,7 +36,7 @@
SetLastInstance(client_->GetPluginInstance());
#endif
-@@ -2798,7 +2798,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -2832,7 +2832,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
DCHECK(image_data);
last_progressive_start_time_ = base::Time::Now();
@@ -45,7 +45,7 @@
SetLastInstance(client_->GetPluginInstance());
#endif
-@@ -3292,7 +3292,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3326,7 +3326,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
Index: head/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
===================================================================
--- head/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ head/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,7 +1,7 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-10-21 19:06:39 UTC
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-03-03 18:53:11 UTC
+++ remoting/host/it2me/it2me_native_messaging_host_main.cc
-@@ -28,12 +28,12 @@
- #include "remoting/host/resources.h"
+@@ -29,12 +29,12 @@
+ #include "remoting/host/switches.h"
#include "remoting/host/usage_stats_consent.h"
-#if defined(OS_LINUX)
@@ -14,8 +14,8 @@
+#endif // defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_MACOSX)
- #include "base/mac/scoped_nsautorelease_pool.h"
-@@ -108,7 +108,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+ #include "base/mac/mac_util.h"
+@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
remoting::LoadResources("");
@@ -24,7 +24,7 @@
// Required in order for us to run multiple X11 threads.
XInitThreads();
-@@ -124,7 +124,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -128,7 +128,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
// Need to prime the host OS version value for linux to prevent IO on the
// network thread. base::GetLinuxDistro() caches the result.
base::GetLinuxDistro();
Index: head/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
===================================================================
--- head/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ head/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/remoting_me2me_host.cc.orig 2019-12-16 21:51:27 UTC
+--- remoting/host/remoting_me2me_host.cc.orig 2020-03-03 18:53:55 UTC
+++ remoting/host/remoting_me2me_host.cc
-@@ -121,13 +121,13 @@
+@@ -118,13 +118,13 @@
#include "remoting/host/mac/permission_utils.h"
#endif // defined(OS_MACOSX)
@@ -16,7 +16,7 @@
#if defined(OS_WIN)
#include <commctrl.h>
-@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting";
+@@ -159,11 +159,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
-@@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -356,7 +356,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
-@@ -560,10 +560,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
+@@ -586,10 +586,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;
-@@ -758,7 +758,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -784,7 +784,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),
-@@ -844,7 +844,7 @@ void HostProcess::StartOnUiThread() {
+@@ -870,7 +870,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()->
-@@ -853,7 +853,7 @@ void HostProcess::StartOnUiThread() {
+@@ -879,7 +879,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 =
-@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -934,7 +934,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.
-@@ -1537,7 +1537,7 @@ void HostProcess::StartHost() {
+@@ -1538,7 +1538,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
-@@ -1718,7 +1718,7 @@ void HostProcess::OnCrash(const std::string& function_
+@@ -1708,7 +1708,7 @@ void HostProcess::OnCrash(const std::string& function_
int HostProcessMain() {
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
Index: head/www/chromium/files/patch-remoting_resources_remoting__strings.grd
===================================================================
--- head/www/chromium/files/patch-remoting_resources_remoting__strings.grd
+++ head/www/chromium/files/patch-remoting_resources_remoting__strings.grd
@@ -1,6 +1,6 @@
---- remoting/resources/remoting_strings.grd.orig 2019-12-16 21:51:27 UTC
+--- remoting/resources/remoting_strings.grd.orig 2020-03-03 18:53:55 UTC
+++ remoting/resources/remoting_strings.grd
-@@ -1366,7 +1366,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -1393,7 +1393,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
Open Screen Recording Preferences
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
</message>
-@@ -1382,7 +1382,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -1409,7 +1409,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
<message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
Launch the default XSession
</message>
Index: head/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
===================================================================
--- head/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
+++ head/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/libc_interceptor.cc.orig 2019-03-11 22:01:01 UTC
+--- sandbox/linux/services/libc_interceptor.cc.orig 2020-03-03 18:53:55 UTC
+++ sandbox/linux/services/libc_interceptor.cc
@@ -11,7 +11,9 @@
#include <stddef.h>
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <time.h>
-@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
+@@ -93,7 +95,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
} else {
base::AutoLock lock(g_timezones_lock.Get());
auto ret_pair = g_timezones.Get().insert(timezone);
Index: head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
===================================================================
--- head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,6 +1,6 @@
---- services/device/geolocation/location_arbitrator.cc.orig 2019-12-16 21:51:27 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig 2020-03-03 18:53:55 UTC
+++ services/device/geolocation/location_arbitrator.cc
-@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider(
std::unique_ptr<LocationProvider>
LocationArbitrator::NewSystemLocationProvider() {
Index: head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
===================================================================
--- head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,6 +1,6 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-03-11 22:01:01 UTC
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-03-03 18:53:55 UTC
+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -104,7 +104,11 @@ class TimeZoneMonitorLinuxImpl
+@@ -126,7 +126,11 @@ class TimeZoneMonitorLinuxImpl
// false positives are harmless, assuming the false positive rate is
// reasonable.
const char* const kFilesToWatch[] = {
Index: head/www/chromium/files/patch-services_network_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-services_network_BUILD.gn
+++ head/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2019-12-16 21:51:27 UTC
+--- services/network/BUILD.gn.orig 2020-03-03 18:53:56 UTC
+++ services/network/BUILD.gn
-@@ -259,7 +259,6 @@ jumbo_component("network_service") {
+@@ -256,7 +256,6 @@ jumbo_component("network_service") {
if (is_linux) {
deps += [
Index: head/www/chromium/files/patch-services_network_network__context.cc
===================================================================
--- head/www/chromium/files/patch-services_network_network__context.cc
+++ head/www/chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig 2019-12-16 21:51:27 UTC
+--- services/network/network_context.cc.orig 2020-03-03 18:53:56 UTC
+++ services/network/network_context.cc
-@@ -1638,7 +1638,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC
+@@ -1738,7 +1738,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC
net::CookieCryptoDelegate* crypto_delegate = nullptr;
if (params_->enable_encrypted_cookies) {
Index: head/www/chromium/files/patch-services_network_network__service.h
===================================================================
--- head/www/chromium/files/patch-services_network_network__service.h
+++ head/www/chromium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig 2019-12-16 21:51:27 UTC
+--- services/network/network_service.h.orig 2020-03-03 18:53:56 UTC
+++ services/network/network_service.h
-@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -144,7 +144,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;
@@ -8,4 +8,4 @@
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override;
#endif
- #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
Index: head/www/chromium/files/patch-services_network_network__service.cc
===================================================================
--- head/www/chromium/files/patch-services_network_network__service.cc
+++ head/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig 2019-12-16 21:51:27 UTC
+--- services/network/network_service.cc.orig 2020-03-03 18:53:56 UTC
+++ services/network/network_service.cc
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,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
-@@ -572,7 +572,7 @@ void NetworkService::OnCertDBChanged() {
+@@ -613,7 +613,7 @@ void NetworkService::OnCertDBChanged() {
net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
}
Index: head/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
===================================================================
--- head/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
+++ head/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
@@ -1,4 +1,4 @@
---- services/service_manager/zygote/zygote_main_linux.cc.orig 2019-03-11 22:01:02 UTC
+--- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-03-03 18:53:56 UTC
+++ services/service_manager/zygote/zygote_main_linux.cc
@@ -11,7 +11,9 @@
#include <stddef.h>
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -101,6 +103,7 @@ static bool CreateInitProcessReaper(
+@@ -99,6 +101,7 @@ static bool CreateInitProcessReaper(
// created through the setuid sandbox.
static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
base::OnceClosure post_fork_parent_callback) {
@@ -18,7 +18,7 @@
DCHECK(setuid_sandbox);
DCHECK(setuid_sandbox->IsSuidSandboxChild());
-@@ -133,6 +136,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli
+@@ -131,6 +134,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli
CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers());
return true;
@@ -28,7 +28,7 @@
}
static void DropAllCapabilities(int proc_fd) {
-@@ -178,6 +184,7 @@ static void EnterLayerOneSandbox(service_manager::Sand
+@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(service_manager::Sand
bool ZygoteMain(
std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
@@ -36,7 +36,7 @@
sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
-@@ -240,6 +247,9 @@ bool ZygoteMain(
+@@ -238,6 +245,9 @@ bool ZygoteMain(
// This function call can return multiple times, once per fork().
return zygote.ProcessRequests();
Index: head/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc
===================================================================
--- head/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc
+++ head/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc
@@ -1,6 +1,6 @@
---- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2019-12-17 19:52:52 UTC
+--- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2020-03-03 18:53:56 UTC
+++ services/tracing/public/cpp/perfetto/trace_event_data_source.cc
-@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata
+@@ -101,7 +101,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata
#endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
}
Index: head/www/chromium/files/patch-third__party_angle_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ head/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig 2019-12-16 21:56:11 UTC
+--- third_party/angle/BUILD.gn.orig 2020-03-03 18:55:22 UTC
+++ third_party/angle/BUILD.gn
-@@ -371,6 +371,7 @@ angle_static_library("angle_gpu_info_util") {
+@@ -389,6 +389,7 @@ angle_static_library("angle_gpu_info_util") {
"X11",
"Xi",
"Xext",
@@ -8,7 +8,7 @@
]
}
}
-@@ -1055,10 +1056,6 @@ foreach(is_shared_library,
+@@ -1107,10 +1108,6 @@ foreach(is_shared_library,
if (is_linux) {
sources += util_linux_sources
Index: head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
===================================================================
--- head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,20 +1,11 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-12-16 21:56:11 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-03-03 18:55:22 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
-@@ -70,7 +70,7 @@
- #if defined(ANGLE_ENABLE_VULKAN)
- # if defined(ANGLE_PLATFORM_WINDOWS)
- # include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
+@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
+ {
+ impl = rx::CreateVulkanWin32Display(state);
+ }
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_POSIX)
- # include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
- # elif defined(ANGLE_PLATFORM_ANDROID)
- # include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
-@@ -282,7 +282,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
- #if defined(ANGLE_ENABLE_VULKAN)
- # if defined(ANGLE_PLATFORM_WINDOWS)
- impl = new rx::DisplayVkWin32(state);
--# elif defined(ANGLE_PLATFORM_LINUX)
-+# elif defined(ANGLE_PLATFORM_POSIX)
- impl = new rx::DisplayVkXcb(state);
- # elif defined(ANGLE_PLATFORM_ANDROID)
- impl = new rx::DisplayVkAndroid(state);
+ if (rx::IsVulkanXcbDisplayAvailable())
+ {
+ impl = rx::CreateVulkanXcbDisplay(state);
Index: head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
===================================================================
--- head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
@@ -0,0 +1,11 @@
+--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-03-03 18:55:22 UTC
++++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
+@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable();
+ DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
+ #endif // defined(ANGLE_PLATFORM_WINDOWS)
+
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+ bool IsVulkanXcbDisplayAvailable();
+ DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
+ #endif // defined(ANGLE_PLATFORM_LINUX)
Index: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
===================================================================
--- head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
+++ head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
@@ -1,6 +1,6 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-12-16 21:56:20 UTC
+--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-03-03 18:55:32 UTC
+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
-@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
+@@ -238,7 +238,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
Index: head/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
===================================================================
--- head/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ head/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-09-09 21:55:24 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-03-03 18:53:56 UTC
+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -41,7 +41,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
base::TimeDelta::FromMicroseconds(100);
/* The value is based on user statistics on Nov 2017. */
Index: head/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
===================================================================
--- head/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ head/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-10-21 19:06:43 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-03-03 18:53:56 UTC
+++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -104,7 +104,7 @@ namespace {
+@@ -105,7 +105,7 @@ namespace {
static CompositingQueryMode g_compositing_query_mode =
kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
Index: head/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
===================================================================
--- head/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ head/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-12-16 21:51:28 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-03 18:53:56 UTC
+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
-@@ -152,7 +152,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const
+@@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const
// Disable snapback on desktop Linux to better integrate with the desktop
// behavior. Typically, Linux apps do not implement scrollbar snapback (this
// is true for at least GTK and QT apps).
@@ -9,7 +9,7 @@
return false;
#endif
-@@ -335,7 +335,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT
+@@ -312,7 +312,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT
bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
const WebMouseEvent& event) {
Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
===================================================================
--- head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,6 +1,15 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-12-16 21:51:29 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-03-03 18:53:57 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -162,7 +162,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -58,7 +58,7 @@
+ #include "third_party/skia/include/core/SkFontMgr.h"
+ #include "third_party/skia/include/core/SkRefCnt.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/gfx/font_fallback_linux.h"
+ #endif
+
+@@ -166,7 +166,7 @@ class PLATFORM_EXPORT FontCache {
sk_sp<SkFontMgr> FontManager() { return font_manager_; }
static void SetFontManager(sk_sp<SkFontMgr>);
@@ -9,25 +18,21 @@
// These are needed for calling QueryRenderStyleForStrike, since
// gfx::GetFontRenderParams makes distinctions based on DSF.
static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -237,7 +237,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -241,11 +241,11 @@ class PLATFORM_EXPORT FontCache {
const FontDescription&);
#endif // defined(OS_ANDROID)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- struct PlatformFallbackFont {
- String name;
- std::string filename;
-@@ -249,7 +249,7 @@ class PLATFORM_EXPORT FontCache {
- static void GetFontForCharacter(UChar32,
+ static bool GetFontForCharacter(UChar32,
const char* preferred_locale,
- PlatformFallbackFont*);
+ gfx::FallbackFontData*);
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
const FontPlatformData*,
-@@ -321,12 +321,12 @@ class PLATFORM_EXPORT FontCache {
+@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
const FontFaceCreationParams&,
std::string& name);
@@ -42,7 +47,7 @@
scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
const FontDescription&,
-@@ -360,7 +360,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -356,7 +356,7 @@ class PLATFORM_EXPORT FontCache {
std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
#endif // defined(OS_WIN)
Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
===================================================================
--- head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-09-09 21:55:26 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-03-03 18:53:14 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.cc
@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
@@ -13,8 +13,8 @@
FontPlatformData* FontCache::SystemFontPlatformData(
const FontDescription& font_description) {
const AtomicString& family = FontCache::SystemFontFamily();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
if (family.IsEmpty() || family == font_family_names::kSystemUi)
return nullptr;
#else
Index: head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
===================================================================
--- head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
+++ head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2020-01-16 22:52:21 UTC
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2020-03-03 18:55:22 UTC
+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
-@@ -14,49 +14,44 @@
+@@ -14,49 +14,35 @@
#include <openssl/cpu.h>
@@ -17,9 +17,12 @@
-
extern uint32_t OPENSSL_armcap_P;
--void OPENSSL_cpuid_setup(void) {
-- unsigned long hwcap = getauxval(AT_HWCAP);
++#include <sys/types.h>
+#include <machine/armreg.h>
++
+ void OPENSSL_cpuid_setup(void) {
+- unsigned long hwcap = getauxval(AT_HWCAP);
++ uint64_t id_aa64isar0;
- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
- // these values.
@@ -28,42 +31,30 @@
- static const unsigned long kPMULL = 1 << 4;
- static const unsigned long kSHA1 = 1 << 5;
- static const unsigned long kSHA256 = 1 << 6;
-+#ifndef ID_AA64ISAR0_AES_VAL
-+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
-+#endif
-+#ifndef ID_AA64ISAR0_SHA1_VAL
-+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1
-+#endif
-+#ifndef ID_AA64ISAR0_SHA2_VAL
-+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2
-+#endif
++ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
- if ((hwcap & kNEON) == 0) {
- // Matching OpenSSL, if NEON is missing, don't report other features
- // either.
- return;
- }
-+void OPENSSL_cpuid_setup(void) {
-+ uint64_t id_aa64isar0;
-
-+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-+
+-
OPENSSL_armcap_P |= ARMV7_NEON;
- if (hwcap & kAES) {
-+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
++ if (ID_AA64ISAR0_AES(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
OPENSSL_armcap_P |= ARMV8_AES;
}
- if (hwcap & kPMULL) {
-+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
++ if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
OPENSSL_armcap_P |= ARMV8_PMULL;
}
- if (hwcap & kSHA1) {
-+ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
++ if (ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
OPENSSL_armcap_P |= ARMV8_SHA1;
}
- if (hwcap & kSHA256) {
-+ if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
++ if(ID_AA64ISAR0_SHA2(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
OPENSSL_armcap_P |= ARMV8_SHA256;
}
}
Index: head/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
===================================================================
--- head/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
+++ head/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
@@ -1,8 +1,8 @@
---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2019-03-11 22:01:15 UTC
+--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-03-03 18:54:05 UTC
+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
-@@ -38,7 +38,7 @@ crashpad_is_standalone = crashpad_dependencies == "sta
- if (crashpad_is_in_chromium) {
+@@ -38,7 +38,7 @@ if (crashpad_is_in_chromium) {
crashpad_is_mac = is_mac
+ crashpad_is_ios = is_ios
crashpad_is_win = is_win
- crashpad_is_linux = is_linux
+ crashpad_is_linux = is_linux && !is_bsd
Index: head/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
===================================================================
--- head/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
+++ head/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
@@ -1,4 +1,4 @@
---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2020-01-16 22:52:22 UTC
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2020-03-03 18:55:23 UTC
+++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
@@ -7,8 +7,6 @@
#ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_
@@ -9,7 +9,7 @@
#include <cstddef>
#include <cstdint>
-@@ -16,30 +14,26 @@
+@@ -16,30 +14,19 @@
#if HAVE_ARM64_CRC32C
@@ -19,17 +19,12 @@
-// getauxval() is not available on Android until API level 20. Link it as a weak
-// symbol.
-extern "C" unsigned long getauxval(unsigned long type) __attribute__((weak));
-+#include <machine/armreg.h>
-
+-
-#define AT_HWCAP 16
-#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
-+#ifndef ID_AA64ISAR0_AES_VAL
-+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
-+#endif
-+#ifndef ID_AA64ISAR0_CRC32_VAL
-+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-+#endif
-
+-
++#include <machine/armreg.h>
++#include <sys/types.h>
namespace crc32c {
-inline bool CanUseArm64Linux() {
@@ -47,9 +42,9 @@
+ inline bool CanUseArm64Linux() {
+ uint64_t id_aa64isar0;
+
-+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-+ if ((ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) && \
-+ (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE))
++ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
++ if ((ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) && \
++ (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE))
+ return true;
+ return false;
+ }
Index: head/www/chromium/files/patch-third__party_libpng_pnglibconf.h
===================================================================
--- head/www/chromium/files/patch-third__party_libpng_pnglibconf.h
+++ head/www/chromium/files/patch-third__party_libpng_pnglibconf.h
@@ -0,0 +1,14 @@
+--- third_party/libpng/pnglibconf.h.orig 2020-03-03 18:53:28 UTC
++++ third_party/libpng/pnglibconf.h
+@@ -230,8 +230,11 @@
+ * This is necessary to build multiple copies of libpng. We need this while pdfium builds
+ * its own copy of libpng.
+ */
++/* Need to disable prefixing to unbundle chromium's libpng. */
++#if 0
+ #define PNG_PREFIX
+ #include "pngprefix.h"
++#endif
+ /* end of chromium prefixing */
+
+ #endif /* PNGLCONF_H */
Index: head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
===================================================================
--- head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
+++ head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,8 +1,8 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC
+--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-03 18:55:28 UTC
+++ third_party/perfetto/src/base/unix_socket.cc
-@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n
+@@ -593,7 +593,8 @@ void UnixSocket::ReadPeerCredentials() {
+ return;
- void UnixSocket::ReadPeerCredentials() {
#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
Index: head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
===================================================================
--- head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,7 +1,7 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-10-21 19:09:15 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-03-03 18:55:28 UTC
+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -2180,7 +2180,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
- protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();
+@@ -2193,7 +2193,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
+ auto* clock_snapshot = packet->set_clock_snapshot();
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
@@ -9,4 +9,4 @@
+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
struct {
clockid_t id;
- protos::ClockSnapshot::Clock::BuiltinClocks type;
+ protos::pbzero::ClockSnapshot::Clock::BuiltinClocks type;
Index: head/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
===================================================================
--- head/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
+++ head/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
@@ -1,6 +1,6 @@
---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2019-03-11 22:08:28 UTC
+--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-03-03 18:55:29 UTC
+++ third_party/skia/src/ports/SkOSFile_stdio.cpp
-@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) {
+@@ -132,7 +132,7 @@ void sk_fflush(FILE* f) {
void sk_fsync(FILE* f) {
#if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
Index: head/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
+++ head/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/swiftshader/BUILD.gn.orig 2019-12-16 21:56:18 UTC
+--- third_party/swiftshader/BUILD.gn.orig 2020-03-03 18:55:29 UTC
+++ third_party/swiftshader/BUILD.gn
-@@ -142,9 +142,6 @@ config("swiftshader_config") {
+@@ -135,9 +135,6 @@ config("swiftshader_config") {
ldflags = [ "-Wl,--gc-sections" ]
if (target_cpu == "mipsel") {
@@ -10,7 +10,7 @@
if (mips_arch_variant == "r1") {
ldflags += [
"-mips32",
-@@ -156,11 +153,8 @@ config("swiftshader_config") {
+@@ -149,11 +146,8 @@ config("swiftshader_config") {
}
} else if (target_cpu == "mips64el") {
ldflags += [
Index: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
===================================================================
--- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
+++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
@@ -1,6 +1,6 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-09-09 21:57:02 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-03-03 18:55:29 UTC
+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
-@@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id)
+@@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType
// FIXME: Check if display_id is the default display
}
@@ -9,7 +9,7 @@
#if defined(USE_X11)
if(!libX11)
#endif // Non X11 linux is headless only
-@@ -207,7 +207,7 @@ const char *QueryString(EGLDisplay dpy, EGLint name)
+@@ -216,7 +216,7 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EG
{
return success(
"EGL_KHR_client_get_all_proc_addresses "
@@ -18,7 +18,7 @@
"EGL_KHR_platform_gbm "
#endif
#if defined(USE_X11)
-@@ -1243,7 +1243,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
+@@ -1298,7 +1298,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum plat
{
TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list);
Index: head/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
===================================================================
--- head/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
+++ head/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
@@ -0,0 +1,55 @@
+--- third_party/swiftshader/src/Vulkan/VkDebug.cpp.orig 2020-03-05 18:26:16 UTC
++++ third_party/swiftshader/src/Vulkan/VkDebug.cpp
+@@ -22,6 +22,11 @@
+ #define PTRACE
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
++# if defined(__FreeBSD__)
++# include <sys/sysctl.h>
++# include <sys/user.h>
++# include <unistd.h>
++# endif
+ #elif defined(_WIN32) || defined(_WIN64)
+ #include <windows.h>
+ #elif defined(__APPLE__) || defined(__MACH__)
+@@ -33,7 +38,7 @@ namespace {
+
+ bool IsUnderDebugger()
+ {
+-#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__)
++#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) && !defined(__FreeBSD__)
+ static bool checked = false;
+ static bool res = false;
+
+@@ -55,7 +60,7 @@ bool IsUnderDebugger()
+ return res;
+ #elif defined(_WIN32) || defined(_WIN64)
+ return IsDebuggerPresent() != 0;
+-#elif defined(__APPLE__) || defined(__MACH__)
++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
+ // Code comes from the Apple Technical Q&A QA1361
+
+ // Tell sysctl what info we're requestion. Specifically we're asking for
+@@ -70,14 +75,22 @@ bool IsUnderDebugger()
+ struct kinfo_proc info;
+ size_t size = sizeof(info);
+
++# if defined(__FreeBSD__)
++ info.ki_flag = 0;
++# else
+ info.kp_proc.p_flag = 0;
++# endif
+
+ // Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0.
+ res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0);
+ ASSERT_MSG(res == 0, "syscl returned %d", res);
+
+ // We're being debugged if the P_TRACED flag is set
++# if defined(__FreeBSD__)
++ return ((info.ki_flag & P_TRACED) != 0);
++# else
+ return ((info.kp_proc.p_flag & P_TRACED) != 0);
++# endif
+ #else
+ return false;
+ #endif
Index: head/www/chromium/files/patch-third__party_webrtc_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-third__party_webrtc_BUILD.gn
+++ head/www/chromium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/BUILD.gn.orig 2019-09-09 21:57:03 UTC
+--- third_party/webrtc/BUILD.gn.orig 2020-03-03 18:55:30 UTC
+++ third_party/webrtc/BUILD.gn
-@@ -160,6 +160,9 @@ config("common_inherited_config") {
+@@ -170,6 +170,9 @@ config("common_inherited_config") {
if (is_linux) {
defines += [ "WEBRTC_LINUX" ]
}
Index: head/www/chromium/files/patch-third__party_zlib_arm__features.c
===================================================================
--- head/www/chromium/files/patch-third__party_zlib_arm__features.c
+++ head/www/chromium/files/patch-third__party_zlib_arm__features.c
@@ -1,22 +1,17 @@
---- third_party/zlib/arm_features.c.orig 2020-01-16 22:51:11 UTC
+--- third_party/zlib/arm_features.c.orig 2020-03-03 18:54:06 UTC
+++ third_party/zlib/arm_features.c
-@@ -16,6 +16,15 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+@@ -16,6 +16,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
#include <pthread.h>
#endif
+#if defined(__FreeBSD__)
+#include <machine/armreg.h>
-+#ifndef ID_AA64ISAR0_AES_VAL
-+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
-+#endif
-+#ifndef ID_AA64ISAR0_CRC32_VAL
-+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-+#endif
++#include <sys/types.h>
+#else
#if defined(ARMV8_OS_ANDROID)
#include <cpu-features.h>
#elif defined(ARMV8_OS_LINUX)
-@@ -30,6 +39,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+@@ -30,6 +34,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
#else
#error arm_features.c ARM feature detection in not defined for your platform
#endif
@@ -24,15 +19,15 @@
static void _arm_check_features(void);
-@@ -68,14 +78,24 @@ static void _arm_check_features(void)
+@@ -68,14 +73,24 @@ static void _arm_check_features(void)
arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
#elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
+#if defined(__FreeBSD__)
-+ uint64_t id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
++ uint64_t id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
++ if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
+ arm_cpu_enable_pmull = 1;
-+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
++ if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
+ arm_cpu_enable_crc32 = 1;
+#else
unsigned long features = getauxval(AT_HWCAP);
Index: head/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
===================================================================
--- head/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ head/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2019-12-16 21:51:33 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig 2020-03-03 18:54:06 UTC
+++ tools/json_schema_compiler/feature_compiler.py
-@@ -217,6 +217,7 @@ FEATURE_GRAMMAR = (
+@@ -218,6 +218,7 @@ FEATURE_GRAMMAR = (
'enum_map': {
'chromeos': 'Feature::CHROMEOS_PLATFORM',
'linux': 'Feature::LINUX_PLATFORM',
Index: head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-06-04 18:55:49 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-03-03 18:54:06 UTC
+++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
+@@ -44,7 +44,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ]
}
Index: head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
===================================================================
--- head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig 2019-12-16 21:51:33 UTC
+--- ui/base/resource/resource_bundle.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/base/resource/resource_bundle.cc
-@@ -818,7 +818,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -819,7 +819,7 @@ void ResourceBundle::ReloadFonts() {
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
-@@ -871,7 +871,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
+@@ -872,7 +872,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);
Index: head/www/chromium/files/patch-ui_base_ui__base__features.h
===================================================================
--- head/www/chromium/files/patch-ui_base_ui__base__features.h
+++ head/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.h.orig 2019-12-16 21:51:33 UTC
+--- ui/base/ui_base_features.h.orig 2020-03-03 18:54:06 UTC
+++ ui/base/ui_base_features.h
-@@ -63,10 +63,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+@@ -65,10 +65,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
Index: head/www/chromium/files/patch-ui_base_ui__base__features.cc
===================================================================
--- head/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ head/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig 2019-12-16 21:51:33 UTC
+--- ui/base/ui_base_features.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/base/ui_base_features.cc
-@@ -117,7 +117,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
+@@ -122,7 +122,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
"EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
// Enables stylus appearing as touch when in contact with digitizer.
const base::Feature kDirectManipulationStylus = {
"DirectManipulationStylus",
-@@ -127,7 +127,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -132,7 +132,7 @@ const base::Feature kDirectManipulationStylus = {
base::FEATURE_DISABLED_BY_DEFAULT
#endif
};
Index: head/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
===================================================================
--- head/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ head/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,6 +1,6 @@
---- ui/base/webui/web_ui_util.cc.orig 2019-12-16 21:51:33 UTC
+--- ui/base/webui/web_ui_util.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/base/webui/web_ui_util.cc
-@@ -227,7 +227,7 @@ std::string GetFontFamily() {
+@@ -237,7 +237,7 @@ std::string GetFontFamily() {
// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
// into Ozone: crbug.com/320050
Index: head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
===================================================================
--- head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
+++ head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
@@ -1,24 +1,14 @@
---- ui/base/x/x11_shm_image_pool_base.cc.orig 2019-12-16 21:51:33 UTC
+--- ui/base/x/x11_shm_image_pool_base.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/base/x/x11_shm_image_pool_base.cc
-@@ -12,12 +12,17 @@
-
- #include "base/bind.h"
- #include "base/callback.h"
-+#include "base/command_line.h"
-+#include "base/environment.h"
+@@ -16,6 +16,7 @@
+ #include "base/environment.h"
#include "base/location.h"
-+#include "base/strings/string_util.h"
+ #include "base/strings/string_util.h"
+#include "base/system/sys_info.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "ui/events/platform/platform_event_dispatcher.h"
- #include "ui/events/platform/platform_event_source.h"
- #include "ui/gfx/geometry/rect.h"
-+#include "ui/gfx/x/x11_switches.h"
-
- namespace ui {
-
-@@ -39,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
+@@ -43,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
1.0f / (kShmResizeThreshold * kShmResizeThreshold);
std::size_t MaxShmSegmentSizeImpl() {
@@ -33,7 +23,7 @@
}
std::size_t MaxShmSegmentSize() {
-@@ -139,7 +148,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
+@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
shmctl(state.shminfo_.shmid, IPC_RMID, 0);
return false;
}
@@ -42,7 +32,7 @@
// On Linux, a shmid can still be attached after IPC_RMID if otherwise
// kept alive. Detach before XShmAttach to prevent a memory leak in case
// the process dies.
-@@ -149,7 +158,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
+@@ -182,7 +187,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
if (!XShmAttach(display_, &state.shminfo_))
return false;
state.shmem_attached_to_server_ = true;
Index: head/www/chromium/files/patch-ui_compositor_compositor.h
===================================================================
--- head/www/chromium/files/patch-ui_compositor_compositor.h
+++ head/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig 2019-12-17 19:57:38 UTC
+--- ui/compositor/compositor.h.orig 2020-03-03 18:54:06 UTC
+++ ui/compositor/compositor.h
-@@ -412,7 +412,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
+@@ -417,7 +417,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
void OnFrameTokenChanged(uint32_t frame_token) override;
Index: head/www/chromium/files/patch-ui_compositor_compositor.cc
===================================================================
--- head/www/chromium/files/patch-ui_compositor_compositor.cc
+++ head/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig 2019-12-17 19:57:24 UTC
+--- ui/compositor/compositor.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/compositor/compositor.cc
-@@ -681,7 +681,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
+@@ -677,7 +677,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
NOTREACHED();
}
Index: head/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
===================================================================
--- head/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
+++ head/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
@@ -1,6 +1,6 @@
---- ui/compositor/host/host_context_factory_private.cc.orig 2019-12-17 19:57:59 UTC
+--- ui/compositor/host/host_context_factory_private.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/compositor/host/host_context_factory_private.cc
-@@ -31,7 +31,7 @@ namespace {
+@@ -30,7 +30,7 @@ namespace {
static const char* kBrowser = "Browser";
Index: head/www/chromium/files/patch-ui_gfx_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ head/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig 2019-10-21 19:07:29 UTC
+--- ui/gfx/BUILD.gn.orig 2020-03-03 18:54:06 UTC
+++ ui/gfx/BUILD.gn
-@@ -573,7 +573,7 @@ jumbo_source_set("memory_buffer_sources") {
+@@ -597,7 +597,7 @@ jumbo_source_set("memory_buffer_sources") {
deps += [ "//build/config/linux/libdrm" ]
}
Index: head/www/chromium/files/patch-ui_gfx_canvas__skia.cc
===================================================================
--- head/www/chromium/files/patch-ui_gfx_canvas__skia.cc
+++ head/www/chromium/files/patch-ui_gfx_canvas__skia.cc
@@ -1,6 +1,6 @@
---- ui/gfx/canvas_skia.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/canvas_skia.cc.orig 2020-03-03 18:53:32 UTC
+++ ui/gfx/canvas_skia.cc
-@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
+@@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
Range range = StripAcceleratorChars(flags, &adjusted_text);
bool elide_text = ((flags & NO_ELLIPSIS) == 0);
Index: head/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
===================================================================
--- head/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ head/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,6 +1,6 @@
---- ui/gfx/gpu_memory_buffer.h.orig 2019-12-16 21:51:34 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig 2020-03-03 18:54:06 UTC
+++ ui/gfx/gpu_memory_buffer.h
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/gfx_export.h"
@@ -9,7 +9,7 @@
#include "ui/gfx/native_pixmap_handle.h"
#elif defined(OS_MACOSX) && !defined(OS_IOS)
#include "ui/gfx/mac/io_surface.h"
-@@ -66,7 +66,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
base::UnsafeSharedMemoryRegion region;
uint32_t offset;
int32_t stride;
Index: head/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
===================================================================
--- head/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
+++ head/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,6 +1,6 @@
---- ui/gfx/native_pixmap_handle.cc.orig 2019-10-21 19:07:29 UTC
+--- ui/gfx/native_pixmap_handle.cc.orig 2020-03-03 18:53:32 UTC
+++ ui/gfx/native_pixmap_handle.cc
-@@ -8,7 +8,7 @@
+@@ -8,11 +8,15 @@
#include "build/build_config.h"
@@ -9,8 +9,16 @@
#include <drm_fourcc.h>
#include "base/posix/eintr_wrapper.h"
#endif
-@@ -20,7 +20,7 @@
++#if defined(OS_BSD)
++#include <unistd.h>
++#endif
++
+ #if defined(OS_FUCHSIA)
+ #include <lib/zx/vmo.h>
+ #include "base/fuchsia/fuchsia_logging.h"
+@@ -20,7 +24,7 @@
+
namespace gfx {
-#if defined(OS_LINUX)
@@ -18,7 +26,7 @@
static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapHandle::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
-@@ -31,7 +31,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
+@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
NativePixmapPlane::NativePixmapPlane(int stride,
int offset,
uint64_t size
@@ -27,7 +35,7 @@
,
base::ScopedFD fd
#elif defined(OS_FUCHSIA)
-@@ -42,7 +42,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
+@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
: stride(stride),
offset(offset),
size(size)
@@ -36,7 +44,7 @@
,
fd(std::move(fd))
#elif defined(OS_FUCHSIA)
-@@ -70,7 +70,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
+@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
NativePixmapHandle clone;
for (auto& plane : handle.planes) {
@@ -45,7 +53,7 @@
DCHECK(plane.fd.is_valid());
base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
if (!fd_dup.is_valid()) {
-@@ -96,7 +96,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
+@@ -96,7 +100,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
#endif
}
Index: head/www/chromium/files/patch-ui_gfx_render__text.cc
===================================================================
--- head/www/chromium/files/patch-ui_gfx_render__text.cc
+++ head/www/chromium/files/patch-ui_gfx_render__text.cc
@@ -1,6 +1,6 @@
---- ui/gfx/render_text.cc.orig 2019-09-09 21:55:46 UTC
+--- ui/gfx/render_text.cc.orig 2020-03-03 18:54:06 UTC
+++ ui/gfx/render_text.cc
-@@ -983,32 +983,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
+@@ -1147,32 +1147,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
const int extra_content = GetContentWidth() - display_rect_.width();
const int cursor_width = cursor_enabled_ ? 1 : 0;
Index: head/www/chromium/files/patch-ui_gl_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-ui_gl_BUILD.gn
+++ head/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig 2019-12-16 21:51:34 UTC
+--- ui/gl/BUILD.gn.orig 2020-03-03 18:54:06 UTC
+++ ui/gl/BUILD.gn
-@@ -221,7 +221,7 @@ jumbo_component("gl") {
+@@ -232,7 +232,7 @@ jumbo_component("gl") {
]
}
Index: head/www/chromium/files/patch-ui_gl_generate__bindings.py
===================================================================
--- head/www/chromium/files/patch-ui_gl_generate__bindings.py
+++ head/www/chromium/files/patch-ui_gl_generate__bindings.py
@@ -1,6 +1,6 @@
---- ui/gl/generate_bindings.py.orig 2019-12-16 21:51:34 UTC
+--- ui/gl/generate_bindings.py.orig 2020-03-03 18:54:06 UTC
+++ ui/gl/generate_bindings.py
-@@ -2738,6 +2738,9 @@ GLX_FUNCTIONS = [
+@@ -2766,6 +2766,9 @@ GLX_FUNCTIONS = [
'arguments':
'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
'int32_t* denominator' },
Index: head/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
===================================================================
--- head/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
+++ head/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_bindings_autogen_glx.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-03-03 18:53:32 UTC
+++ ui/gl/gl_bindings_autogen_glx.cc
@@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() {
@@ -32,7 +32,7 @@
void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
GLXDrawable drawable,
unsigned long* mask) {
-@@ -646,6 +657,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
+@@ -647,6 +658,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
}
@@ -44,7 +44,7 @@
void TraceGLXApi::glXGetSelectedEventFn(Display* dpy,
GLXDrawable drawable,
unsigned long* mask) {
-@@ -1068,6 +1084,14 @@ bool DebugGLXApi::glXGetMscRateOMLFn(Display* dpy,
+@@ -1068,6 +1084,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy,
<< static_cast<const void*>(denominator) << ")");
bool result =
glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
@@ -52,7 +52,7 @@
+ return result;
+}
+
-+__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
++__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
+ GL_SERVICE_LOG("glXGetProcAddressARB"
+ << "(" << static_cast<const void*>(procName) << ")");
+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);
Index: head/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
===================================================================
--- head/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ head/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme_base.cc.orig 2019-12-16 21:51:34 UTC
+--- ui/native_theme/native_theme_base.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/native_theme/native_theme_base.cc
-@@ -212,7 +212,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+@@ -230,7 +230,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
case kCheckbox:
PaintCheckbox(canvas, state, rect, extra.button, color_scheme);
break;
Index: head/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
===================================================================
--- head/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ head/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,8 +1,17 @@
---- ui/platform_window/platform_window_init_properties.h.orig 2019-10-30 16:37:28 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig 2020-03-03 18:54:07 UTC
+++ ui/platform_window/platform_window_init_properties.h
-@@ -73,7 +73,7 @@ struct PlatformWindowInitProperties {
- bool remove_standard_frame = false;
- std::string workspace;
+@@ -41,7 +41,7 @@ enum class PlatformWindowOpacity {
+
+ class WorkspaceExtensionDelegate;
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ class X11ExtensionDelegate;
+ #endif
+
+@@ -82,7 +82,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+
+ WorkspaceExtensionDelegate* workspace_extension_delegate = nullptr;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
Index: head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
+++ head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
@@ -1,6 +1,6 @@
---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-10-21 19:07:29 UTC
+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/bubble/bubble_dialog_delegate_view.cc
-@@ -135,7 +135,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
+@@ -134,7 +134,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
Index: head/www/chromium/files/patch-ui_views_controls_label.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_controls_label.cc
+++ head/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/label.cc.orig 2019-12-16 21:51:34 UTC
+--- ui/views/controls/label.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/controls/label.cc
-@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
+@@ -695,7 +695,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
-@@ -874,7 +874,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -880,7 +880,7 @@ bool Label::PasteSelectionClipboard() {
}
void Label::UpdateSelectionClipboard() {
Index: head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,4 +1,4 @@
---- ui/views/controls/textfield/textfield.cc.orig 2019-10-21 19:07:29 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/controls/textfield/textfield.cc
@@ -60,7 +60,7 @@
#include "base/win/win_util.h"
@@ -62,7 +62,7 @@
// Skip any accelerator handling that conflicts with custom keybindings.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
ui::GetTextEditKeyBindingsDelegate();
-@@ -2170,7 +2170,7 @@ bool Textfield::PasteSelectionClipboard() {
+@@ -2173,7 +2173,7 @@ bool Textfield::PasteSelectionClipboard() {
}
void Textfield::UpdateSelectionClipboard() {
Index: head/www/chromium/files/patch-ui_views_examples_widget__example.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_examples_widget__example.cc
+++ head/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig 2019-09-09 21:55:47 UTC
+--- ui/views/examples/widget_example.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/examples/widget_example.cc
-@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -70,7 +70,7 @@ void WidgetExample::CreateExampleView(View* container)
BuildButton(container, "Popup widget", POPUP);
BuildButton(container, "Dialog widget", DIALOG);
BuildButton(container, "Modal Dialog", MODAL_DIALOG);
Index: head/www/chromium/files/patch-ui_views_style_platform__style.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_style_platform__style.cc
+++ head/www/chromium/files/patch-ui_views_style_platform__style.cc
@@ -1,11 +1,11 @@
---- ui/views/style/platform_style.cc.orig 2019-07-24 18:59:23 UTC
+--- ui/views/style/platform_style.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/style/platform_style.cc
-@@ -17,7 +17,7 @@
+@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const
- #if defined(OS_CHROMEOS)
- #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #define DESKTOP_LINUX
- #endif
+ #endif // OS_MACOSX
+-#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !defined(OS_LINUX)
++#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !(defined(OS_LINUX) || defined(OS_BSD))
+ // static
+ std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
+ LabelButton* button) {
Index: head/www/chromium/files/patch-ui_views_views__delegate.h
===================================================================
--- head/www/chromium/files/patch-ui_views_views__delegate.h
+++ head/www/chromium/files/patch-ui_views_views__delegate.h
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC
+--- ui/views/views_delegate.h.orig 2020-03-03 18:54:07 UTC
+++ ui/views/views_delegate.h
-@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -131,7 +131,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;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD)
+-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
#endif
Index: head/www/chromium/files/patch-ui_views_views__delegate.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_views__delegate.cc
+++ head/www/chromium/files/patch-ui_views_views__delegate.cc
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/views_delegate.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/views_delegate.cc
@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
return false;
}
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
return nullptr;
}
Index: head/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ head/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-12-16 21:51:34 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -732,7 +732,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
+@@ -751,7 +751,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
// DesktopWindowTreeHost:
// Linux subclasses this host and adds some Linux specific bits.
Index: head/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
+++ head/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
@@ -1,36 +1,27 @@
---- ui/views/widget/native_widget_aura.cc.orig 2019-12-17 20:00:27 UTC
+--- ui/views/widget/native_widget_aura.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/widget/native_widget_aura.cc
-@@ -59,7 +59,7 @@
+@@ -64,7 +64,7 @@
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
#endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
#include "ui/views/linux_ui/linux_ui.h"
- #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
+ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
#endif
-@@ -1065,7 +1065,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS
- // Widget, public:
-
- namespace {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- void CloseWindow(aura::Window* window) {
- if (window) {
- Widget* widget = Widget::GetWidgetForNativeView(window);
@@ -1095,13 +1095,13 @@ void Widget::CloseAllSecondaryWidgets() {
EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
#endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow);
#endif
}
const ui::NativeTheme* Widget::GetNativeTheme() const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const LinuxUI* linux_ui = LinuxUI::instance();
if (linux_ui) {
ui::NativeTheme* native_theme =
Index: head/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ head/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,11 +1,11 @@
---- ui/views/window/dialog_delegate.cc.orig 2019-12-16 21:51:34 UTC
+--- ui/views/window/dialog_delegate.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/window/dialog_delegate.cc
-@@ -58,7 +58,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
+@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
// static
bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
// The new style doesn't support unparented dialogs on Linux desktop.
return parent != nullptr;
#elif defined(OS_WIN)
Index: head/www/chromium/files/patch-ui_views_window_frame__background.cc
===================================================================
--- head/www/chromium/files/patch-ui_views_window_frame__background.cc
+++ head/www/chromium/files/patch-ui_views_window_frame__background.cc
@@ -1,11 +1,11 @@
---- ui/views/window/frame_background.cc.orig 2019-06-04 18:55:50 UTC
+--- ui/views/window/frame_background.cc.orig 2020-03-03 18:54:07 UTC
+++ ui/views/window/frame_background.cc
-@@ -106,7 +106,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
+@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
const View* view) const {
// Fill the top with the frame color first so we have a constant background
// for areas not covered by the theme image.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
auto* native_theme = view->GetNativeTheme();
ui::NativeTheme::ExtraParams params;
params.frame_top_area.use_custom_frame = use_custom_frame_;
Index: head/www/chromium/files/patch-v8_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-v8_BUILD.gn
+++ head/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig 2019-12-16 21:56:22 UTC
+--- v8/BUILD.gn.orig 2020-03-03 18:55:34 UTC
+++ v8/BUILD.gn
-@@ -3639,7 +3639,7 @@ v8_component("v8_libbase") {
+@@ -3561,7 +3561,7 @@ v8_component("v8_libbase") {
}
}
@@ -9,7 +9,7 @@
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-linux.cc",
-@@ -3659,6 +3659,12 @@ v8_component("v8_libbase") {
+@@ -3581,6 +3581,12 @@ v8_component("v8_libbase") {
"dl",
"rt",
]
@@ -22,9 +22,9 @@
} else if (is_android) {
if (current_toolchain == host_toolchain) {
libs = [
-@@ -3916,6 +3922,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
- "src/snapshot/embedded/platform-embedded-file-writer-win.h",
+@@ -3840,6 +3846,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
"src/snapshot/mksnapshot.cc",
+ "src/snapshot/snapshot-empty.cc",
]
+ libs = ["execinfo"]
Index: head/www/chromium/files/patch-v8_include_v8config.h
===================================================================
--- head/www/chromium/files/patch-v8_include_v8config.h
+++ head/www/chromium/files/patch-v8_include_v8config.h
@@ -0,0 +1,21 @@
+--- v8/include/v8config.h.orig 2020-03-03 18:55:34 UTC
++++ v8/include/v8config.h
+@@ -273,7 +273,18 @@
+ # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \
+ (__has_attribute(warn_unused_result))
+
++// Work around Clang bug present in 9.0.1, at least.
++//
++// Clang stores alignment as a 32-bit unsigned integer, but V8 only uses
++// V8_ASSUME_ALIGNED() for a 4GB (2^32) alignment
++// (kPtrComprIsolateRootAlignment). As such, the alignment overflows and
++// becomes zero, triggering an internal Clang assertion that alignment must not
++// be zero.
++#if 0
+ # define V8_HAS_BUILTIN_ASSUME_ALIGNED (__has_builtin(__builtin_assume_aligned))
++#else
++# define V8_HAS_BUILTIN_ASSUME_ALIGNED 0
++#endif
+ # define V8_HAS_BUILTIN_BSWAP16 (__has_builtin(__builtin_bswap16))
+ # define V8_HAS_BUILTIN_BSWAP32 (__has_builtin(__builtin_bswap32))
+ # define V8_HAS_BUILTIN_BSWAP64 (__has_builtin(__builtin_bswap64))
Index: head/www/chromium/files/patch-v8_src_api_api.cc
===================================================================
--- head/www/chromium/files/patch-v8_src_api_api.cc
+++ head/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,15 +1,6 @@
---- v8/src/api/api.cc.orig 2019-12-16 21:56:22 UTC
+--- v8/src/api/api.cc.orig 2020-03-03 18:55:34 UTC
+++ v8/src/api/api.cc
-@@ -111,7 +111,7 @@
- #include "src/wasm/wasm-result.h"
- #include "src/wasm/wasm-serialization.h"
-
--#if V8_OS_LINUX || V8_OS_MACOSX
-+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD
- #include <signal.h>
- #include "include/v8-wasm-trap-handler-posix.h"
- #include "src/trap-handler/handler-inside-posix.h"
-@@ -5609,7 +5609,7 @@ bool v8::V8::Initialize() {
+@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() {
return true;
}
Index: head/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
===================================================================
--- head/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ head/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,6 +1,6 @@
---- v8/src/base/platform/platform-posix.cc.orig 2019-12-16 21:56:22 UTC
+--- v8/src/base/platform/platform-posix.cc.orig 2020-03-03 18:55:34 UTC
+++ v8/src/base/platform/platform-posix.cc
-@@ -383,7 +383,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
+@@ -427,7 +427,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
// static
bool OS::HasLazyCommits() {
@@ -9,7 +9,7 @@
return true;
#else
// TODO(bbudge) Return true for all POSIX platforms.
-@@ -514,6 +514,12 @@ int OS::GetCurrentThreadId() {
+@@ -558,6 +558,12 @@ int OS::GetCurrentThreadId() {
return static_cast<int>(syscall(__NR_gettid));
#elif V8_OS_ANDROID
return static_cast<int>(gettid());
Index: head/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
===================================================================
--- head/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
+++ head/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
@@ -1,6 +1,6 @@
---- weblayer/browser/browser_main_parts_impl.cc.orig 2019-12-16 21:51:34 UTC
+--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-03-03 18:54:07 UTC
+++ weblayer/browser/browser_main_parts_impl.cc
-@@ -37,7 +37,7 @@
+@@ -39,7 +39,7 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/init/input_method_initializer.h"
#endif
-@@ -84,7 +84,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
+@@ -90,7 +90,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
#if defined(USE_X11)
ui::SetDefaultX11ErrorHandlers();
#endif
Index: head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
===================================================================
--- head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
+++ head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
@@ -1,6 +1,6 @@
---- weblayer/browser/content_browser_client_impl.cc.orig 2020-01-07 21:53:35 UTC
+--- weblayer/browser/content_browser_client_impl.cc.orig 2020-03-03 18:54:07 UTC
+++ weblayer/browser/content_browser_client_impl.cc
-@@ -57,7 +57,7 @@
+@@ -65,7 +65,7 @@
#include "weblayer/browser/safe_browsing/safe_browsing_service.h"
#endif
@@ -9,7 +9,7 @@
#include "content/public/common/content_descriptors.h"
#endif
-@@ -200,7 +200,7 @@ ContentBrowserClientImpl::CreateNetworkContext(
+@@ -232,7 +232,7 @@ ContentBrowserClientImpl::CreateNetworkContext(
void ContentBrowserClientImpl::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {
@@ -18,7 +18,7 @@
network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New();
content::GetNetworkService()->SetCryptConfig(std::move(config));
#endif
-@@ -330,7 +330,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
+@@ -371,7 +371,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
}
#endif
@@ -27,7 +27,7 @@
void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -358,7 +358,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile
+@@ -405,7 +405,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile
mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
#endif // defined(OS_ANDROID)
}
Index: head/www/chromium/pkg-plist
===================================================================
--- head/www/chromium/pkg-plist
+++ head/www/chromium/pkg-plist
@@ -1,4 +1,7 @@
bin/chrome
+%%DRIVER%%bin/chromedriver
+man/man1/chrome.1.gz
+share/applications/chromium-browser.desktop
%%DATADIR%%/chrome
%%DATADIR%%/chrome-wrapper
%%DATADIR%%/chrome_100_percent.pak
@@ -8,6 +11,7 @@
%%DATADIR%%/libEGL.so
%%DATADIR%%/libGLESv2.so
%%DATADIR%%/libVkICD_mock_icd.so
+%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
%%DATADIR%%/locales/am.pak
%%DATADIR%%/locales/am.pak.info
%%DATADIR%%/locales/ar.pak
@@ -115,7 +119,6 @@
%%DATADIR%%/locales/zh-TW.pak
%%DATADIR%%/locales/zh-TW.pak.info
%%DATADIR%%/mksnapshot
-%%DATADIR%%/natives_blob.bin
%%DATADIR%%/product_logo_48.png
%%DATADIR%%/protoc
%%DATADIR%%/resources.pak
@@ -139,6 +142,7 @@
%%DATADIR%%/resources/inspector/Images/chromeRight.png
%%DATADIR%%/resources/inspector/Images/chromeSelect.png
%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
+%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png
%%DATADIR%%/resources/inspector/Images/errorWave.svg
%%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
%%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg
@@ -176,14 +180,40 @@
%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg
%%DATADIR%%/resources/inspector/Images/whatsnew.png
%%DATADIR%%/resources/inspector/InspectorBackendCommands.js
+%%DATADIR%%/resources/inspector/Runtime.js
%%DATADIR%%/resources/inspector/SupportedCSSProperties.js
%%DATADIR%%/resources/inspector/Tests.js
+%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js
+%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js
%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js
+%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js
+%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js
+%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js
+%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js
+%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js
+%%DATADIR%%/resources/inspector/accessibility/accessibility.js
%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
+%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js
+%%DATADIR%%/resources/inspector/animation/AnimationModel.js
+%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js
+%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js
+%%DATADIR%%/resources/inspector/animation/AnimationUI.js
+%%DATADIR%%/resources/inspector/animation/animation.js
%%DATADIR%%/resources/inspector/animation/animation_module.js
%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
+%%DATADIR%%/resources/inspector/audits/AuditsController.js
+%%DATADIR%%/resources/inspector/audits/AuditsPanel.js
+%%DATADIR%%/resources/inspector/audits/AuditsProtocolService.js
+%%DATADIR%%/resources/inspector/audits/AuditsReportRenderer.js
+%%DATADIR%%/resources/inspector/audits/AuditsReportSelector.js
+%%DATADIR%%/resources/inspector/audits/AuditsStartView.js
+%%DATADIR%%/resources/inspector/audits/AuditsStatusView.js
+%%DATADIR%%/resources/inspector/audits/RadioSetting.js
+%%DATADIR%%/resources/inspector/audits/audits.js
%%DATADIR%%/resources/inspector/audits/audits_module.js
+%%DATADIR%%/resources/inspector/audits/lighthouse/report-generator.js
+%%DATADIR%%/resources/inspector/audits/lighthouse/report.js
%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js
%%DATADIR%%/resources/inspector/audits_worker.js
%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js
@@ -236,13 +266,11 @@
%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json
%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json
%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js
-%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
-%%DATADIR%%/resources/inspector/bindings/bindings.js
%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js
%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js
+%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js
%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js
-%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js
%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js
%%DATADIR%%/resources/inspector/bindings/FileUtils.js
@@ -255,18 +283,67 @@
%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js
%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js
%%DATADIR%%/resources/inspector/bindings/TempFile.js
+%%DATADIR%%/resources/inspector/bindings/bindings.js
+%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
+%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js
+%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js
+%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js
+%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js
+%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js
%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
-%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js
%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js
+%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js
+%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js
+%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js
+%%DATADIR%%/resources/inspector/changes/ChangesView.js
+%%DATADIR%%/resources/inspector/changes/changes.js
%%DATADIR%%/resources/inspector/changes/changes_module.js
+%%DATADIR%%/resources/inspector/cm/active-line.js
+%%DATADIR%%/resources/inspector/cm/brace-fold.js
+%%DATADIR%%/resources/inspector/cm/closebrackets.js
+%%DATADIR%%/resources/inspector/cm/cm.js
%%DATADIR%%/resources/inspector/cm/cm_module.js
+%%DATADIR%%/resources/inspector/cm/codemirror.js
+%%DATADIR%%/resources/inspector/cm/comment.js
+%%DATADIR%%/resources/inspector/cm/foldcode.js
+%%DATADIR%%/resources/inspector/cm/foldgutter.js
+%%DATADIR%%/resources/inspector/cm/mark-selection.js
+%%DATADIR%%/resources/inspector/cm/matchbrackets.js
+%%DATADIR%%/resources/inspector/cm/multiplex.js
+%%DATADIR%%/resources/inspector/cm/overlay.js
+%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js
+%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js
+%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js
+%%DATADIR%%/resources/inspector/cm_modes/clike.js
+%%DATADIR%%/resources/inspector/cm_modes/clojure.js
+%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js
%%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
+%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js
+%%DATADIR%%/resources/inspector/cm_modes/jsx.js
+%%DATADIR%%/resources/inspector/cm_modes/livescript.js
+%%DATADIR%%/resources/inspector/cm_modes/markdown.js
+%%DATADIR%%/resources/inspector/cm_modes/php.js
+%%DATADIR%%/resources/inspector/cm_modes/python.js
+%%DATADIR%%/resources/inspector/cm_modes/shell.js
+%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js
+%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js
+%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js
+%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_module.js
+%%DATADIR%%/resources/inspector/cm_web_modes/css.js
+%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js
+%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js
+%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js
+%%DATADIR%%/resources/inspector/cm_web_modes/xml.js
+%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js
+%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js
+%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js
+%%DATADIR%%/resources/inspector/color_picker/Spectrum.js
+%%DATADIR%%/resources/inspector/color_picker/color_picker.js
%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
%%DATADIR%%/resources/inspector/common/App.js
%%DATADIR%%/resources/inspector/common/AppProvider.js
%%DATADIR%%/resources/inspector/common/CharacterIdMap.js
%%DATADIR%%/resources/inspector/common/Color.js
-%%DATADIR%%/resources/inspector/common/common.js
%%DATADIR%%/resources/inspector/common/Console.js
%%DATADIR%%/resources/inspector/common/ContentProvider.js
%%DATADIR%%/resources/inspector/common/EventTarget.js
@@ -288,23 +365,56 @@
%%DATADIR%%/resources/inspector/common/Trie.js
%%DATADIR%%/resources/inspector/common/UIString.js
%%DATADIR%%/resources/inspector/common/Worker.js
-%%DATADIR%%/resources/inspector/components/components.js
+%%DATADIR%%/resources/inspector/common/common-legacy.js
+%%DATADIR%%/resources/inspector/common/common.js
%%DATADIR%%/resources/inspector/components/DockController.js
%%DATADIR%%/resources/inspector/components/ImagePreview.js
%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js
%%DATADIR%%/resources/inspector/components/Linkifier.js
%%DATADIR%%/resources/inspector/components/Reload.js
%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js
-%%DATADIR%%/resources/inspector/console_counters/console_counters.js
-%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
+%%DATADIR%%/resources/inspector/components/components.js
+%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js
+%%DATADIR%%/resources/inspector/console/ConsoleFilter.js
+%%DATADIR%%/resources/inspector/console/ConsolePanel.js
+%%DATADIR%%/resources/inspector/console/ConsolePinPane.js
+%%DATADIR%%/resources/inspector/console/ConsolePrompt.js
+%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js
+%%DATADIR%%/resources/inspector/console/ConsoleView.js
+%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js
+%%DATADIR%%/resources/inspector/console/ConsoleViewport.js
+%%DATADIR%%/resources/inspector/console/console.js
%%DATADIR%%/resources/inspector/console/console_module.js
+%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
+%%DATADIR%%/resources/inspector/console_counters/console_counters.js
%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js
+%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js
+%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js
%%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
+%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js
+%%DATADIR%%/resources/inspector/coverage/CoverageListView.js
+%%DATADIR%%/resources/inspector/coverage/CoverageModel.js
+%%DATADIR%%/resources/inspector/coverage/CoverageView.js
+%%DATADIR%%/resources/inspector/coverage/coverage.js
%%DATADIR%%/resources/inspector/coverage/coverage_module.js
%%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js
+%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js
+%%DATADIR%%/resources/inspector/css_overview/css_overview.js
%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js
%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js
+%%DATADIR%%/resources/inspector/data_grid/DataGrid.js
+%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js
+%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js
+%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js
+%%DATADIR%%/resources/inspector/data_grid/data_grid.js
%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
@@ -313,8 +423,36 @@
%%DATADIR%%/resources/inspector/devtools_app.js
%%DATADIR%%/resources/inspector/devtools_compatibility.js
%%DATADIR%%/resources/inspector/devtools_extension_api.js
+%%DATADIR%%/resources/inspector/diff/DiffWrapper.js
+%%DATADIR%%/resources/inspector/diff/diff.js
+%%DATADIR%%/resources/inspector/diff/diff_match_patch.js
%%DATADIR%%/resources/inspector/diff/diff_module.js
%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js
+%%DATADIR%%/resources/inspector/dom_extension/dom_extension.js
+%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js
+%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js
+%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js
+%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js
+%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js
+%%DATADIR%%/resources/inspector/elements/DOMPath.js
+%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js
+%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js
+%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
+%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js
+%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js
+%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js
+%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js
+%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js
+%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js
+%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js
+%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js
+%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js
+%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js
+%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js
+%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js
+%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js
+%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js
+%%DATADIR%%/resources/inspector/elements/elements.js
%%DATADIR%%/resources/inspector/elements/elements_module.js
%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js
%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg
@@ -354,41 +492,109 @@
%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg
%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
+%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js
+%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js
+%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js
%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
-%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js
%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js
-%%DATADIR%%/resources/inspector/extensions/extensions.js
%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js
%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js
%%DATADIR%%/resources/inspector/extensions/ExtensionView.js
+%%DATADIR%%/resources/inspector/extensions/extensions.js
+%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
+%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js
+%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js
+%%DATADIR%%/resources/inspector/formatter/formatter.js
%%DATADIR%%/resources/inspector/formatter/formatter_module.js
%%DATADIR%%/resources/inspector/formatter_worker.js
+%%DATADIR%%/resources/inspector/formatter_worker.unbundled.js
+%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js
+%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js
+%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js
+%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js
+%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js
+%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js
+%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js
+%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js
+%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js
+%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js
+%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js
+%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js
+%%DATADIR%%/resources/inspector/har_importer/HARFormat.js
+%%DATADIR%%/resources/inspector/har_importer/HARImporter.js
+%%DATADIR%%/resources/inspector/har_importer/har_importer.js
%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js
%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js
+%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js
+%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js
%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
%%DATADIR%%/resources/inspector/heap_snapshot_worker.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker.unbundled.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js
%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
+%%DATADIR%%/resources/inspector/help/HelpImpl.js
+%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js
+%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js
+%%DATADIR%%/resources/inspector/help/help.js
%%DATADIR%%/resources/inspector/help/help_module.js
-%%DATADIR%%/resources/inspector/host/host.js
%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js
%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js
%%DATADIR%%/resources/inspector/host/Platform.js
%%DATADIR%%/resources/inspector/host/ResourceLoader.js
%%DATADIR%%/resources/inspector/host/UserMetrics.js
+%%DATADIR%%/resources/inspector/host/host.js
+%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js
+%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js
+%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js
+%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js
+%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js
+%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js
+%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js
%%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
%%DATADIR%%/resources/inspector/inspector.html
%%DATADIR%%/resources/inspector/inspector.js
+%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js
+%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js
+%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js
%%DATADIR%%/resources/inspector/integration_test_runner.html
%%DATADIR%%/resources/inspector/integration_test_runner.js
+%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js
+%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js
+%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js
%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js
%%DATADIR%%/resources/inspector/js_app.html
%%DATADIR%%/resources/inspector/js_app.js
+%%DATADIR%%/resources/inspector/js_main/JsMain.js
+%%DATADIR%%/resources/inspector/js_main/js_main.js
%%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
+%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js
+%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js
+%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js
+%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js
+%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js
+%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js
+%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js
%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
+%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js
+%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js
+%%DATADIR%%/resources/inspector/layers/LayersPanel.js
+%%DATADIR%%/resources/inspector/layers/layers.js
%%DATADIR%%/resources/inspector/layers/layers_module.js
%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
%%DATADIR%%/resources/inspector/media/media_module.js
+%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js
+%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js
+%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js
+%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js
+%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js
+%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js
+%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js
%%DATADIR%%/resources/inspector/ndb_app.html
%%DATADIR%%/resources/inspector/ndb_app.js
%%DATADIR%%/resources/inspector/network/network_module.js
@@ -396,8 +602,17 @@
%%DATADIR%%/resources/inspector/node_app.html
%%DATADIR%%/resources/inspector/node_app.js
%%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
+%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js
+%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js
+%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js
+%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js
+%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js
+%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js
+%%DATADIR%%/resources/inspector/object_ui/object_ui.js
%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js
%%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js
+%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js
+%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js
%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
%%DATADIR%%/resources/inspector/persistence/Automapping.js
@@ -406,30 +621,33 @@
%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js
%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js
%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js
-%%DATADIR%%/resources/inspector/persistence/persistence.js
%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js
%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js
%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js
%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js
%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js
+%%DATADIR%%/resources/inspector/persistence/persistence.js
+%%DATADIR%%/resources/inspector/platform/platform.js
%%DATADIR%%/resources/inspector/platform/utilities.js
-%%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js
%%DATADIR%%/resources/inspector/profiler/profiler_module.js
-%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js
%%DATADIR%%/resources/inspector/protocol/NodeURL.js
%%DATADIR%%/resources/inspector/protocol/protocol.js
+%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js
+%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js
+%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
+%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js
+%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js
+%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js
+%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js
+%%DATADIR%%/resources/inspector/quick_open/quick_open.js
%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
%%DATADIR%%/resources/inspector/resources/resources_module.js
%%DATADIR%%/resources/inspector/root.js
-%%DATADIR%%/resources/inspector/Runtime.js
-%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
-%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
-%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
-%%DATADIR%%/resources/inspector/sdk/Connections.js
-%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
-%%DATADIR%%/resources/inspector/sdk/CookieModel.js
-%%DATADIR%%/resources/inspector/sdk/CookieParser.js
+%%DATADIR%%/resources/inspector/screencast/InputModel.js
+%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js
+%%DATADIR%%/resources/inspector/screencast/ScreencastView.js
+%%DATADIR%%/resources/inspector/screencast/screencast.js
%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js
%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js
%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js
@@ -440,14 +658,21 @@
%%DATADIR%%/resources/inspector/sdk/CSSRule.js
%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js
%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js
-%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js
+%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
+%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
+%%DATADIR%%/resources/inspector/sdk/Connections.js
+%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
+%%DATADIR%%/resources/inspector/sdk/CookieModel.js
+%%DATADIR%%/resources/inspector/sdk/CookieParser.js
%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js
%%DATADIR%%/resources/inspector/sdk/DOMModel.js
+%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js
%%DATADIR%%/resources/inspector/sdk/EmulationModel.js
%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js
%%DATADIR%%/resources/inspector/sdk/HARLog.js
%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js
%%DATADIR%%/resources/inspector/sdk/IsolateManager.js
+%%DATADIR%%/resources/inspector/sdk/IssuesModel.js
%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js
%%DATADIR%%/resources/inspector/sdk/LogModel.js
%%DATADIR%%/resources/inspector/sdk/NetworkLog.js
@@ -461,10 +686,9 @@
%%DATADIR%%/resources/inspector/sdk/Resource.js
%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js
%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js
+%%DATADIR%%/resources/inspector/sdk/SDKModel.js
%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js
%%DATADIR%%/resources/inspector/sdk/Script.js
-%%DATADIR%%/resources/inspector/sdk/sdk.js
-%%DATADIR%%/resources/inspector/sdk/SDKModel.js
%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js
%%DATADIR%%/resources/inspector/sdk/ServerTiming.js
%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js
@@ -475,26 +699,70 @@
%%DATADIR%%/resources/inspector/sdk/TargetManager.js
%%DATADIR%%/resources/inspector/sdk/TracingManager.js
%%DATADIR%%/resources/inspector/sdk/TracingModel.js
+%%DATADIR%%/resources/inspector/sdk/sdk.js
+%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js
+%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm
+%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
+%%DATADIR%%/resources/inspector/search/SearchConfig.js
+%%DATADIR%%/resources/inspector/search/SearchResultsPane.js
+%%DATADIR%%/resources/inspector/search/SearchView.js
+%%DATADIR%%/resources/inspector/search/search.js
%%DATADIR%%/resources/inspector/search/search_module.js
+%%DATADIR%%/resources/inspector/security/SecurityModel.js
+%%DATADIR%%/resources/inspector/security/SecurityPanel.js
+%%DATADIR%%/resources/inspector/security/security.js
%%DATADIR%%/resources/inspector/security/security_module.js
%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js
%%DATADIR%%/resources/inspector/services/ServiceManager.js
%%DATADIR%%/resources/inspector/services/services.js
+%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js
+%%DATADIR%%/resources/inspector/settings/SettingsScreen.js
+%%DATADIR%%/resources/inspector/settings/settings.js
%%DATADIR%%/resources/inspector/settings/settings_module.js
%%DATADIR%%/resources/inspector/shell.js
+%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js
+%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js
+%%DATADIR%%/resources/inspector/snippets/snippets.js
%%DATADIR%%/resources/inspector/snippets/snippets_module.js
+%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js
+%%DATADIR%%/resources/inspector/source_frame/FontView.js
+%%DATADIR%%/resources/inspector/source_frame/ImageView.js
+%%DATADIR%%/resources/inspector/source_frame/JSONView.js
+%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js
+%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js
+%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js
+%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js
+%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js
+%%DATADIR%%/resources/inspector/source_frame/XMLView.js
+%%DATADIR%%/resources/inspector/source_frame/source_frame.js
%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js
%%DATADIR%%/resources/inspector/sources/sources_module.js
%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js
+%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js
+%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js
+%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js
+%%DATADIR%%/resources/inspector/text_editor/text_editor.js
%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
-%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
+%%DATADIR%%/resources/inspector/text_utils/Text.js
+%%DATADIR%%/resources/inspector/text_utils/TextRange.js
+%%DATADIR%%/resources/inspector/text_utils/TextUtils.js
+%%DATADIR%%/resources/inspector/text_utils/text_utils.js
%%DATADIR%%/resources/inspector/timeline/timeline_module.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js
+%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js
+%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js
+%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js
+%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
%%DATADIR%%/resources/inspector/toolbox.html
%%DATADIR%%/resources/inspector/toolbox.js
+%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
%%DATADIR%%/resources/inspector/ui/Action.js
%%DATADIR%%/resources/inspector/ui/ActionDelegate.js
%%DATADIR%%/resources/inspector/ui/ActionRegistry.js
-%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
%%DATADIR%%/resources/inspector/ui/Context.js
%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js
%%DATADIR%%/resources/inspector/ui/ContextMenu.js
@@ -541,7 +809,6 @@
%%DATADIR%%/resources/inspector/ui/Toolbar.js
%%DATADIR%%/resources/inspector/ui/Tooltip.js
%%DATADIR%%/resources/inspector/ui/Treeoutline.js
-%%DATADIR%%/resources/inspector/ui/ui.js
%%DATADIR%%/resources/inspector/ui/UIUtils.js
%%DATADIR%%/resources/inspector/ui/View.js
%%DATADIR%%/resources/inspector/ui/ViewManager.js
@@ -550,16 +817,30 @@
%%DATADIR%%/resources/inspector/ui/XLink.js
%%DATADIR%%/resources/inspector/ui/XWidget.js
%%DATADIR%%/resources/inspector/ui/ZoomManager.js
+%%DATADIR%%/resources/inspector/ui/ui.js
+%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js
+%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js
+%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js
+%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js
+%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/Types.js
+%%DATADIR%%/resources/inspector/web_audio/web_audio.js
%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js
%%DATADIR%%/resources/inspector/worker_app.html
%%DATADIR%%/resources/inspector/worker_app.js
-%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
%%DATADIR%%/resources/inspector/workspace/FileManager.js
%%DATADIR%%/resources/inspector/workspace/UISourceCode.js
-%%DATADIR%%/resources/inspector/workspace/workspace.js
%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js
+%%DATADIR%%/resources/inspector/workspace/workspace.js
+%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js
+%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js
+%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
%%DATADIR%%/snapshot_blob.bin
-%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so
%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so
%%DATADIR%%/v8_context_snapshot.bin
@@ -568,9 +849,6 @@
%%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so
%%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so
%%DEBUG%%%%DATADIR%%/libtest_shared_library.so
-%%DRIVER%%bin/chromedriver
-man/man1/chrome.1.gz
-share/applications/chromium-browser.desktop
share/icons/hicolor/128x128/apps/chrome.png
share/icons/hicolor/22x22/apps/chrome.png
share/icons/hicolor/24x24/apps/chrome.png

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 6:15 AM (10 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37051086
Default Alt Text
D23984.id69308.diff (398 KB)

Event Timeline