Attachment #212180 for bug #244625

View | Details | Raw Unified | Return to bug 244625
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	chromium
PORTVERSION=	80.0.3987.132
CATEGORIES?=	www java
MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
		LOCAL/cpm/chromium/:fonts

		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 \


CODECS_VARS=		GN_ARGS+=ffmpeg_branding="Chrome" \
			GN_ARGS+=proprietary_codecs=true \
			GN_ARGS+=enable_platform_hevc=true
CODECS_VARS_OFF=	GN_ARGS+=ffmpeg_branding="Chromium" \
			GN_ARGS+=proprietary_codecs=false \
			GN_ARGS+=enable_platform_hevc=false

CUPS_LIB_DEPENDS=	libcups.so:print/cups
CUPS_VARS=		GN_ARGS+=use_cups=true

	#./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 fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
.endif

do-configure:

.endfor
	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
.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 \

Lines 1-7 Link Here

(-)www/chromium/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1579261549	1	TIMESTAMP = 1583291717
2	SHA256 (chromium-79.0.3945.130.tar.xz) = 56193431ab9d1193773b133d86b419bfae8d8b9196eea253660895e0e8f87ba0	2	SHA256 (chromium-80.0.3987.132.tar.xz) = 2c0012059046a5a7e2bf6e9502f1898f1953226d63b724b82fc18226e285c201
3	SIZE (chromium-79.0.3945.130.tar.xz) = 778319112	3	SIZE (chromium-80.0.3987.132.tar.xz) = 796975056
4	SHA256 (chromium-79.0.3945.130-testdata.tar.xz) = da0b544e2f9a3022c5120a0dc21b945e4565e7e4b64f086eefd720e2c1e516d8	4	SHA256 (chromium-80.0.3987.132-testdata.tar.xz) = 6cbe559778ab75386c90b2de29416bc63b5b6d5b1232876b6a7626359362a91b
5	SIZE (chromium-79.0.3945.130-testdata.tar.xz) = 252386344	5	SIZE (chromium-80.0.3987.132-testdata.tar.xz) = 251267384
6	SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1	6	SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
7	SIZE (test_fonts.tar.xz) = 200040	7	SIZE (test_fonts.tar.xz) = 200040




--- BUILD.gn.orig	2020-03-03 18:53:46 UTC
+++ BUILD.gn
@@ -411,7 +411,7 @@ group("gn_all") {
     ]

     ]
     if (is_desktop_linux && use_ozone) {
       deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
@@ -918,7 +907,6 @@ if (is_chromeos) {
       "//ppapi/examples/video_decode",
       "//sandbox/linux:chrome_sandbox",
       "//sandbox/linux:sandbox_linux_unittests",

 
       # Blocked on https://github.com/catapult-project/catapult/issues/2297
       #"//third_party/catapult/telemetry:bitmaptools",
@@ -1069,7 +1057,7 @@ if (!is_ios) {
       ]
     }
 

       data_deps +=
           [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
     }
@@ -1078,7 +1066,7 @@ if (!is_ios) {
       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 

       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 
@@ -1220,9 +1208,6 @@ group("chromium_builder_perf") {
 
     if (is_win) {
       data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-ash_display_mirror__window__controller.cc (-2 / +2 lines)
1	--- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC	1	--- ash/display/mirror_window_controller.cc.orig 2020-03-03 18:53:46 UTC
2	+++ ash/display/mirror_window_controller.cc	2	+++ ash/display/mirror_window_controller.cc
3	@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow(	3	@@ -298,7 +298,11 @@ void MirrorWindowController::UpdateWindow(
4	return info.id() == iter->first;	4	return info.id() == iter->first;
5	}) == display_info_list.end()) {	5	}) == display_info_list.end()) {
6	CloseAndDeleteHost(iter->second, true);	6	CloseAndDeleteHost(iter->second, true);




--- base/BUILD.gn.orig	2020-03-03 18:53:46 UTC
+++ base/BUILD.gn
@@ -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.

       host_toolchain != "//build/toolchain/cros:host") {
     libs += [ "atomic" ]
   }
@@ -1328,7 +1328,7 @@ jumbo_component("base") {
         "allocator/allocator_shim_override_glibc_weak_symbols.h",
       ]
       deps += [ "//base/allocator:tcmalloc" ]

       sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
     } else if (is_android && use_allocator == "none") {
       sources += [
@@ -1919,6 +1919,33 @@ jumbo_component("base") {
     }
   }
 

+
   # iOS
   if (is_ios) {
     sources -= [
@@ -3069,6 +3096,12 @@ test("base_unittests") {
 
     manifest = "//build/config/fuchsia/tests.cmx"
   }
+
+  if (is_bsd) {

+    ]
+  } 
 
   if (!is_fuchsia && !is_ios) {
     sources += [ "files/file_locking_unittest.cc" ]

Lines 1-7 Link Here

(-)www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (-5 / +5 lines)
1	--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC	1	--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-03-03 18:52:59 UTC
2	+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc	2	+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
3	@@ -5,18 +5,28 @@	3	@@ -6,18 +6,28 @@
4	#include "base/allocator/allocator_shim.h"	4	#include "base/compiler_specific.h"
5		5
6	#include <dlfcn.h>	6	#include <dlfcn.h>
7	-#include <malloc.h>	7	-#include <malloc.h>
Lines 36-42 Link Here
36	} // extern "C"	36	} // extern "C"
37		37
38	namespace {	38	namespace {
39	@@ -24,32 +34,32 @@ namespace {	39	@@ -25,32 +35,32 @@ namespace {
40	using base::allocator::AllocatorDispatch;	40	using base::allocator::AllocatorDispatch;
41		41
42	void* GlibcMalloc(const AllocatorDispatch, size_t size, void context) {	42	void* GlibcMalloc(const AllocatorDispatch, size_t size, void context) {
Lines 73-76 Link Here
73	+ __free(address);	73	+ __free(address);
74	}	74	}
75		75
76	size_t GlibcGetSizeEstimate(const AllocatorDispatch*,	76	NO_SANITIZE("cfi-icall")




--- base/debug/elf_reader.cc.orig	2020-03-03 18:52:59 UTC
+++ base/debug/elf_reader.cc
@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
     bool found = false;
     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) {
         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
 
       size_t section_size = bits::Align(current_note->n_namesz, 4) +
                             bits::Align(current_note->n_descsz, 4) +

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_files_file__util__posix.cc (-2 / +2 lines)
1	--- base/files/file_util_posix.cc.orig 2019-12-16 21:51:21 UTC	1	--- base/files/file_util_posix.cc.orig 2020-03-03 18:52:59 UTC
2	+++ base/files/file_util_posix.cc	2	+++ base/files/file_util_posix.cc
3	@@ -435,7 +435,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,	3	@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
4	}	4	}
5		5
6	bool CreateLocalNonBlockingPipe(int fds[2]) {	6	bool CreateLocalNonBlockingPipe(int fds[2]) {




--- base/i18n/icu_util.cc.orig	2019-12-16 21:51:21 UTC
+++ base/i18n/icu_util.cc
@@ -43,7 +43,7 @@
 #endif
 
 #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().

Line 0 Link Here

(-)www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc (+11 lines)
	1	--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-03 18:53:47 UTC
	2	+++ base/memory/madv_free_discardable_memory_posix.cc
	3	@@ -267,7 +267,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
	4
	5	bool MadvFreeDiscardableMemoryPosix::IsResident() const {
	6	DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
	7	-#ifdef OS_MACOSX
	8	+#if defined(OS_MACOSX) \|\| defined(OS_BSD)
	9	std::vector<char> vec(allocated_pages_);
	10	#else
	11	std::vector<unsigned char> vec(allocated_pages_);




--- base/memory/platform_shared_memory_region.h.orig	2020-03-03 18:52:59 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -27,7 +27,7 @@
 #include "base/files/scoped_file.h"
 #endif
 

 namespace content {
 class SandboxIPCHandler;
 }
@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
     kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
   };
 

   // Structure to limit access to executable region creation.
   struct ExecutableRegion {
    private:
@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
                            CheckPlatformHandlePermissionsCorrespondToMode);
   static PlatformSharedMemoryRegion Create(Mode mode,
                                            size_t size




--- base/memory/platform_shared_memory_region_posix.cc.orig	2020-03-03 18:52:59 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const {
   return {fd.get(), readonly_fd.get()};
 }
 

 // static
 ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
   PlatformSharedMemoryRegion region =
@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
     return region.PassPlatformHandle().fd;
   return ScopedFD();
 }

 
 // static
 PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
 // static
 PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                               size_t size

                                                               ,
                                                               bool executable
 #endif
@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
   // flag.
   FilePath directory;
   if (!GetShmemTempDir(




--- base/memory/protected_memory_posix.cc.orig	2019-05-01 17:25:41 UTC
+++ base/memory/protected_memory_posix.cc
@@ -8,9 +8,9 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include <sys/resource.h>
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include <mach/mach.h>
@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
   return SetMemory(start, end, PROT_READ);
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 void AssertMemoryIsReadOnly(const void* ptr) {
 #if DCHECK_IS_ON()
   const uintptr_t page_mask = ~(base::GetPageSize() - 1);
@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
   DCHECK_EQ(region_info.protection, VM_PROT_READ);
 #endif  // DCHECK_IS_ON()
 }
-#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
 
 }  // namespace base

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_launch.h (-3 / +3 lines)
1	--- base/process/launch.h.orig 2019-06-04 18:55:15 UTC	1	--- base/process/launch.h.orig 2020-03-03 18:52:59 UTC
2	+++ base/process/launch.h	2	+++ base/process/launch.h
3	@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions {	3	@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions {
4	bool clear_environment = false;	4	bool clear_environment = false;
5	#endif // OS_WIN \|\| OS_POSIX \|\| OS_FUCHSIA	5	#endif // OS_WIN \|\| OS_POSIX \|\| OS_FUCHSIA
6		6
Lines 9-15 Link Here
9	// If non-zero, start the process using clone(), using flags as provided.	9	// If non-zero, start the process using clone(), using flags as provided.
10	// Unlike in clone, clone_flags may not contain a custom termination signal	10	// Unlike in clone, clone_flags may not contain a custom termination signal
11	// that is sent to the parent when the child dies. The termination signal will	11	// that is sent to the parent when the child dies. The termination signal will
12	@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions {	12	@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions {
13		13
14	// Sets parent process death signal to SIGKILL.	14	// Sets parent process death signal to SIGKILL.
15	bool kill_on_parent_death = false;	15	bool kill_on_parent_death = false;




--- 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,24 @@ 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);
+}
+#endif
 
 #else  // #if defined(OS_WIN)
 

Line 0 Link Here

(-)www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc (+11 lines)
	1	--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-03-03 18:52:59 UTC
	2	+++ base/profiler/sampling_profiler_thread_token.cc
	3	@@ -7,7 +7,7 @@
	4	namespace base {
	5
	6	SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
	7	-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	8	+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	9	return {PlatformThread::CurrentId(), pthread_self()};
	10	#else
	11	return {PlatformThread::CurrentId()};




--- 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
 };




--- 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");




--- 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.

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_test_fontconfig__util__linux.cc (-3 / +1 lines)
1	--- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC	1	--- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC
2	+++ base/test/fontconfig_util_linux.cc	2	+++ base/test/fontconfig_util_linux.cc
3	@@ -6,24 +6,397 @@	3	@@ -6,22 +6,397 @@
4		4
5	#include <fontconfig/fontconfig.h>	5	#include <fontconfig/fontconfig.h>
6		6
Lines 386-393 Link Here
386	+ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr);	386	+ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr);
387		387
388	- std::unique_ptr<Environment> env(Environment::Create());	388	- std::unique_ptr<Environment> env(Environment::Create());
389	- // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf.
390	- // Prevent fontconfig from doing this.
391	- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));	389	- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));
392	+ // Write the data to a different file and then atomically rename it to	390	+ // Write the data to a different file and then atomically rename it to
393	+ // fonts.conf. This avoids the file being in a bad state when different	391	+ // fonts.conf. This avoids the file being in a bad state when different

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_test_test__file__util__posix.cc (-2 / +2 lines)
1	--- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC	1	--- base/test/test_file_util_posix.cc.orig 2020-03-03 18:52:59 UTC
2	+++ base/test/test_file_util_posix.cc	2	+++ base/test/test_file_util_posix.cc
3	@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() {	3	@@ -84,7 +84,7 @@ void SyncPageCacheToDisk() {
4	sync();	4	sync();
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_threading_platform__thread.h (-2 / +11 lines)
1	--- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC	1	--- base/threading/platform_thread.h.orig 2020-03-03 18:52:59 UTC
2	+++ base/threading/platform_thread.h	2	+++ base/threading/platform_thread.h
3	@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread {	3	@@ -36,6 +36,8 @@ typedef DWORD PlatformThreadId;
		4	typedef zx_handle_t PlatformThreadId;
		5	#elif defined(OS_MACOSX)
		6	typedef mach_port_t PlatformThreadId;
		7	+#elif defined(OS_FREEBSD)
		8	+typedef long PlatformThreadId;
		9	#elif defined(OS_POSIX)
		10	typedef pid_t PlatformThreadId;
		11	#endif
		12	@@ -221,7 +223,7 @@ class BASE_EXPORT PlatformThread {
4		13
5	static ThreadPriority GetCurrentThreadPriority();	14	static ThreadPriority GetCurrentThreadPriority();
6		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_threading_platform__thread__posix.cc (-2 / +24 lines)
1	--- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC	1	--- base/threading/platform_thread_posix.cc.orig 2020-03-03 18:53:47 UTC
2	+++ base/threading/platform_thread_posix.cc	2	+++ base/threading/platform_thread_posix.cc
3	@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) {	3	@@ -32,6 +32,10 @@
		4	#include <sys/syscall.h>
		5	#endif
		6
		7	+#if defined(OS_FREEBSD)
		8	+#include <sys/thr.h>
		9	+#endif
		10	+
		11	#if defined(OS_FUCHSIA)
		12	#include <zircon/process.h>
		13	#else
		14	@@ -66,7 +70,7 @@ void* ThreadFunc(void* params) {
4	if (!thread_params->joinable)	15	if (!thread_params->joinable)
5	base::ThreadRestrictions::SetSingletonAllowed(false);	16	base::ThreadRestrictions::SetSingletonAllowed(false);
6		17
Lines 9-11 Link Here
9	// Threads on linux/android may inherit their priority from the thread	20	// Threads on linux/android may inherit their priority from the thread
10	// where they were created. This explicitly sets the priority of all new	21	// where they were created. This explicitly sets the priority of all new
11	// threads.	22	// threads.
		23	@@ -188,6 +192,10 @@ PlatformThreadId PlatformThread::CurrentId() {
		24	return g_thread_id;
		25	#elif defined(OS_ANDROID)
		26	return gettid();
		27	+#elif defined(OS_FREEBSD)
		28	+ long x;
		29	+ thr_self(&x);
		30	+ return x;
		31	#elif defined(OS_FUCHSIA)
		32	return zx_thread_self();
		33	#elif defined(OS_SOLARIS) \|\| defined(OS_QNX)




--- build/config/BUILD.gn.orig	2020-03-03 18:53:47 UTC
+++ build/config/BUILD.gn
@@ -133,7 +133,7 @@ config("debug") {
       # builds, and we have to tell it to turn it off.
       defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
     }

     # 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?
@@ -231,9 +231,7 @@ config("default_libs") {
     ]
   } else if (is_linux) {
     libs = [

     ]
   }
 }
@@ -321,7 +319,7 @@ config("executable_config") {
       "//build/config/ios:ios_dynamic_flags",
       "//build/config/ios:ios_executable_flags",
     ]




--- 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

       (current_cpu == "x64" || current_cpu == "x86")
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                               root_build_dir)
@@ -308,7 +308,7 @@ config("compiler") {
 
     # Linker warnings.
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&

       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
       ldflags += [ "-Wl,--fatal-warnings" ]
     }
@@ -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.

       ldflags += [
         "-Wl,-z,defs",
         "-Wl,--as-needed",
@@ -503,7 +503,7 @@ config("compiler") {
     }
   }
 

     cflags += [ "-fcrash-diagnostics-dir=" +
                 rebase_path("//tools/clang/crashreports", root_build_dir) ]
 
@@ -773,7 +773,7 @@ config("compiler_cpu_abi") {
         cflags += [ "-mtune=$arm_tune" ]
       }
     } else if (current_cpu == "arm64") {

         cflags += [ "--target=aarch64-linux-gnu" ]
         ldflags += [ "--target=aarch64-linux-gnu" ]
       }
@@ -1124,7 +1124,7 @@ config("compiler_deterministic") {
       "-Xclang",
       ".",
     ]

       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
     }
@@ -1513,7 +1513,7 @@ config("default_warnings") {
         cflags += [ "-Wno-nonportable-include-path" ]
       }
 

         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
         # recognize.
         cflags += [
@@ -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).

     arflags = [ "-T" ]
   } else if (is_win && use_lld) {
     arflags = [ "/llvmlibthin" ]
@@ -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) {

     }
 
     if (use_debug_fission && !is_nacl && !is_android) {
@@ -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" &&

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_compiler_compiler.gni (-2 / +2 lines)
1	--- build/config/compiler/compiler.gni.orig 2019-12-16 21:51:21 UTC	1	--- build/config/compiler/compiler.gni.orig 2020-03-03 18:53:47 UTC
2	+++ build/config/compiler/compiler.gni	2	+++ build/config/compiler/compiler.gni
3	@@ -192,7 +192,7 @@ declare_args() {	3	@@ -187,7 +187,7 @@ declare_args() {
4	declare_args() {	4	declare_args() {
5	# Whether to use the gold linker from binutils instead of lld or bfd.	5	# Whether to use the gold linker from binutils instead of lld or bfd.
6	use_gold =	6	use_gold =




--- build/linux/unbundle/libusb.gn.orig	2019-03-17 01:47:13 UTC
+++ build/linux/unbundle/libusb.gn
@@ -0,0 +1,24 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_libusb") {
+  packages = [ "libusb-1.0" ]
+}
+
+shim_headers("libusb_shim") {
+  root_path = "src/libusb"
+  headers = [
+    "libusb.h",
+  ]
+}
+
+source_set("libusb") {
+  deps = [
+    ":libusb_shim",
+  ]
+  public_configs = [ ":system_libusb" ]
+}




--- 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" ]
 }

Lines 1-6 Link Here

(-)www/chromium/files/patch-cc_BUILD.gn (-3 / +3 lines)
1	--- cc/BUILD.gn.orig 2019-12-16 21:51:21 UTC	1	--- cc/BUILD.gn.orig 2020-03-03 18:53:47 UTC
2	+++ cc/BUILD.gn	2	+++ cc/BUILD.gn
3	@@ -576,7 +576,7 @@ cc_test_static_library("test_support") {	3	@@ -578,7 +578,7 @@ cc_test_static_library("test_support") {
4	if (enable_vulkan) {	4	if (enable_vulkan) {
5	deps += [ "//gpu/vulkan/init" ]	5	deps += [ "//gpu/vulkan/init" ]
6	}	6	}
Lines 9-15 Link Here
9	data_deps = [	9	data_deps = [
10	"//third_party/mesa_headers",	10	"//third_party/mesa_headers",
11	]	11	]
12	@@ -780,9 +780,6 @@ cc_test("cc_unittests") {	12	@@ -783,9 +783,6 @@ cc_test("cc_unittests") {
13	"//ui/gfx/geometry",	13	"//ui/gfx/geometry",
14	"//ui/gl",	14	"//ui/gl",
15	"//ui/gl:test_support",	15	"//ui/gl:test_support",

Lines 1-6 Link Here

(-)www/chromium/files/patch-cc_trees_property__tree.cc (-2 / +2 lines)
1	--- cc/trees/property_tree.cc.orig 2019-12-16 21:51:22 UTC	1	--- cc/trees/property_tree.cc.orig 2020-03-03 18:53:47 UTC
2	+++ cc/trees/property_tree.cc	2	+++ cc/trees/property_tree.cc
3	@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro	3	@@ -1234,13 +1234,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
4		4
5	gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);	5	gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__command__ids.h (-2 / +2 lines)
1	--- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC	1	--- chrome/app/chrome_command_ids.h.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/chrome_command_ids.h	2	+++ chrome/app/chrome_command_ids.h
3	@@ -63,7 +63,7 @@	3	@@ -62,7 +62,7 @@
4	#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049	4	#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
5	#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050	5	#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc (-3 / +3 lines)
1	--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-12-16 21:51:22 UTC	1	--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/chrome_content_browser_overlay_manifest.cc	2	+++ chrome/app/chrome_content_browser_overlay_manifest.cc
3	@@ -70,7 +70,7 @@	3	@@ -60,7 +60,7 @@
4	#include "chrome/browser/ui/webui/app_management/app_management.mojom.h"	4	#include "chrome/browser/ui/webui/app_management/app_management.mojom.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	defined(OS_CHROMEOS)	9	defined(OS_CHROMEOS)
10	#include "chrome/browser/ui/webui/discards/discards.mojom.h"	10	#include "chrome/browser/ui/webui/discards/discards.mojom.h"
11	#endif	11	#endif
12	@@ -189,7 +189,7 @@ const service_manager::Manifest& GetChromeContentBrows	12	@@ -145,7 +145,7 @@ const service_manager::Manifest& GetChromeContentBrows
13	#else	13	#else
14	app_management::mojom::PageHandlerFactory,	14	app_management::mojom::PageHandlerFactory,
15	#endif	15	#endif




--- 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"

 #include "components/nacl/common/nacl_paths.h"
 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
 #endif
@@ -142,7 +142,7 @@
 #include "v8/include/v8.h"
 #endif
 

 #include "base/environment.h"
 #endif
 
@@ -246,7 +246,7 @@ bool UseHooks() {
 
 #endif  // defined(OS_WIN)
 

 void AdjustLinuxOOMScore(const std::string& process_type) {
   // Browsers and zygotes should still be killable, but killed last.
   const int kZygoteScore = 0;
@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
   if (score > -1)
     base::AdjustOOMScore(base::GetCurrentProcId(), score);
 }

       // The zygote process opens the resources for the renderers.
       process_type == service_manager::switches::kZygoteProcess ||
 #endif
@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
   return false;
 }
 

 // 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) ||
@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
     PLOG(FATAL) << "execlp failed";
   }
 }

 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 void SIGTERMProfilingShutdown(int signal) {
@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
   std::string process_type =
       command_line->GetSwitchValueASCII(switches::kProcessType);
 

   // 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.
@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
       user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
     }
   }

 #if defined(OS_MACOSX)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 #endif  // OS_MAC
@@ -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);

   // Record the startup process creation time on supported platforms.
   startup_metric_utils::RecordStartupProcessCreationTime(
       base::Process::Current().CreationTime());
@@ -684,7 +684,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
     *exit_code = 0;
     return true;  // Got a --version switch; exit with a success error code.
   }

   // This will directly exit if the user asked for help.
   HandleHelpSwitches(command_line);
 #endif
@@ -708,7 +708,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif

   nacl::RegisterPathProvider();
 #endif
 
@@ -902,7 +902,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_WIN)
   child_process_logging::Init();
 #endif

   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
   // cpu_brand info.
   base::CPU cpu_info;
@@ -1026,7 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitializePDF();
 #endif
 

   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != service_manager::switches::kZygoteProcess) {
 #if defined(OS_ANDROID)
@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
     }
 #endif  // defined(OS_ANDROID)
   }

 
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
@@ -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.




--- chrome/app/chromium_strings.grd.orig	2020-03-03 18:53:48 UTC
+++ chrome/app/chromium_strings.grd
@@ -623,7 +623,7 @@ Chromium is unable to recover your settings.
       </if>
 
       <!-- about:browser-switch strings -->

         <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>
@@ -727,7 +727,7 @@ Chromium is unable to recover your settings.
       </message>
 
       <!-- ProcessSingleton -->

         <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>
@@ -960,7 +960,7 @@ Chromium is unable to recover your settings.
       </message>
 
       <!-- Plugin Placeholders -->




--- chrome/app/generated_resources.grd.orig	2020-03-03 18:53:48 UTC
+++ chrome/app/generated_resources.grd
@@ -5008,7 +5008,7 @@ Keep your key file in a safe place. You will need it t
       </if>
 
       <!-- chrome://browser-switch strings -->

         <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
           Legacy Browser Support
         </message>
@@ -6712,7 +6712,7 @@ the Bookmarks menu.">
         Google Pay
       </message>
 

         <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>
@@ -7669,7 +7669,7 @@ Please help our engineers fix this problem. Tell us wh
         Set as default
       </message>
 




--- chrome/app/google_chrome_strings.grd.orig	2020-03-03 18:53:48 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -635,7 +635,7 @@ Google Chrome is unable to recover your settings.
       </if>
 
       <!-- about:browser-switch strings -->

         <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>
@@ -739,7 +739,7 @@ Google Chrome is unable to recover your settings.
       </message>
 
       <!-- ProcessSingleton -->

         <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>
@@ -979,7 +979,7 @@ Google Chrome is unable to recover your settings.
       </message>
 
       <!-- Plugin Placeholders -->

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_settings__strings.grdp (-3 / +3 lines)
1	--- chrome/app/settings_strings.grdp.orig 2019-12-16 21:51:23 UTC	1	--- chrome/app/settings_strings.grdp.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/app/settings_strings.grdp	2	+++ chrome/app/settings_strings.grdp
3	@@ -760,7 +760,7 @@	3	@@ -784,7 +784,7 @@
4	Themes	4	Themes
5	</message>	5	</message>
6	</if>	6	</if>
Lines 9-15 Link Here
9	<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">	9	<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
10	GTK+	10	GTK+
11	</message>	11	</message>
12	@@ -774,7 +774,7 @@	12	@@ -798,7 +798,7 @@
13	Use Classic	13	Use Classic
14	</message>	14	</message>
15	</if>	15	</if>




           <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>




--- chrome/browser/about_flags.cc.orig	2020-03-03 18:53:51 UTC
+++ chrome/browser/about_flags.cc
@@ -166,7 +166,7 @@
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_features.h"
 

 #include "base/allocator/buildflags.h"
 #endif
 
@@ -804,7 +804,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
          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[
      heap_profiling::kMemlogSamplingRate5MB},
 };
 

 const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
     {"DocumentUseServerScore", "true"},
     {"DocumentUseClientScore", "false"},
@@ -956,7 +956,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
      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
     {"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 kTranslateBubbleUITab[] = {
     {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}};
@@ -1981,13 +1981,13 @@ const FeatureEntry kFeatureEntries[] = {
     {"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[] = {
      flag_descriptions::kCloudPrintXpsDescription, kOsWin,
      SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
 #endif  // OS_WIN

     {"enable-webgl-draft-extensions",
      flag_descriptions::kWebglDraftExtensionsName,
      flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
@@ -2031,14 +2031,14 @@ const FeatureEntry kFeatureEntries[] = {
                                     "OverrideTranslateTriggerInIndia")},
 #endif  // OS_ANDROID
 

 
 #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
     {"enable-native-notifications",
@@ -2119,7 +2119,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[] = {
      flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
      FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
 #endif  // BUILDFLAG(USE_TCMALLOC)

 #if defined(OS_ANDROID)
     {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
      flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
@@ -2197,7 +2197,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
 #endif  // OS_ANDROID

     {"enable-save-data", flag_descriptions::kEnableSaveDataName,
      flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(
@@ -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,
@@ -2903,7 +2903,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOmniboxAutocompleteTitlesName,
      flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},

 
     {"enable-speculative-service-worker-start-on-query-input",
      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
@@ -3136,13 +3136,13 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kClickToOpenPDFDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
 

 
 #if !defined(OS_ANDROID)
     {"chrome-colors", flag_descriptions::kChromeColorsName,
@@ -3965,13 +3965,13 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
 #endif
 

         // defined(OS_CHROMEOS)
 
     {"enable-audio-focus-enforcement",
@@ -4425,12 +4425,12 @@ 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[] = {
      flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
      FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
 

 
 #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
     {"win-use-native-spellchecker",
@@ -4450,12 +4450,12 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kSafetyTipDescription, kOsAll,
      FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)},
 

 
 #if defined(OS_CHROMEOS)
     {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
@@ -4587,12 +4587,12 @@ const FeatureEntry kFeatureEntries[] = {
          chrome::android::kDarkenWebsitesCheckboxInThemesSetting)},
 #endif  // defined(OS_ANDROID)
 

 
     {"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",

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc (-2 / +2 lines)
1	--- chrome/browser/background/background_mode_manager.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/background/background_mode_manager.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/background/background_mode_manager.cc	2	+++ chrome/browser/background/background_mode_manager.cc
3	@@ -770,7 +770,7 @@ gfx::ImageSkia GetStatusTrayIcon() {	3	@@ -797,7 +797,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
4	return gfx::ImageSkia();	4	return gfx::ImageSkia();
5		5
6	return family->CreateExact(size).AsImageSkia();	6	return family->CreateExact(size).AsImageSkia();




--- chrome/browser/browser_features.cc.orig	2019-10-30 15:46:57 UTC
+++ chrome/browser/browser_features.cc
@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{
     "DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 const base::Feature kSyncClipboardServiceFeature{
     "SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT};
-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
 
 }  // namespace features




--- chrome/browser/browser_features.h.orig	2019-10-30 15:47:15 UTC
+++ chrome/browser/browser_features.h
@@ -20,9 +20,9 @@ namespace features {
 extern const base::Feature kDoubleTapToZoomInTabletMode;
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 extern const base::Feature kSyncClipboardServiceFeature;
-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
 
 }  // namespace features
 

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_browser__resources.grd (-4 / +4 lines)
1	--- chrome/browser/browser_resources.grd.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/browser_resources.grd.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/browser_resources.grd	2	+++ chrome/browser/browser_resources.grd
3	@@ -108,7 +108,7 @@	3	@@ -54,7 +54,7 @@
4	<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_HTML" file="resources\discards\sorted_table_behavior.html" compress="gzip" allowexternalscript="true" type="BINDATA" />	4	<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" />
5	<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />	5	<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
6	</if>	6	</if>
7	- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">	7	- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
Lines 9-15 Link Here
9	<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" />	9	<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" />
10	<include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" />	10	<include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" />
11	<include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" />	11	<include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
12	@@ -550,7 +550,7 @@	12	@@ -457,7 +457,7 @@
13	<include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />	13	<include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />
14	</if>	14	</if>
15	<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" />	15	<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" />




--- chrome/browser/chrome_browser_main.cc.orig	2020-03-03 18:53:51 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -223,9 +223,9 @@
 #include "components/arc/metrics/stability_metrics_manager.h"
 #endif  // defined(OS_CHROMEOS)
 

 
 #if defined(OS_LINUX)
 #include "components/crash/content/app/breakpad_linux.h"
@@ -264,7 +264,7 @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \

 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
 #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
 #endif
@@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
       AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
     }
 

     // 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 .
@@ -1082,7 +1082,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                  &user_native_messaging_dir));
     if (!base::PathExists(user_native_messaging_dir))
       base::CreateDirectory(user_native_messaging_dir);

   }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   }
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (-12 / +18 lines)
1	--- chrome/browser/chrome_content_browser_client.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/chrome_content_browser_client.cc	2	+++ chrome/browser/chrome_content_browser_client.cc
3	@@ -388,7 +388,7 @@	3	@@ -382,7 +382,7 @@
4	#include "components/user_manager/user.h"	4	#include "components/user_manager/user.h"
5	#include "components/user_manager/user_manager.h"	5	#include "components/user_manager/user_manager.h"
6	#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"	6	#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
Lines 9-15 Link Here
9	#include "chrome/browser/chrome_browser_main_linux.h"	9	#include "chrome/browser/chrome_browser_main_linux.h"
10	#elif defined(OS_ANDROID)	10	#elif defined(OS_ANDROID)
11	#include "base/android/application_status_listener.h"	11	#include "base/android/application_status_listener.h"
12	@@ -442,7 +442,7 @@	12	@@ -435,12 +435,12 @@
13	#endif // !defined(OS_ANDROID)	13	#endif // !defined(OS_ANDROID)
14		14
15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 18-24 Link Here
18	#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"	18	#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
19	#include "services/service_manager/sandbox/features.h"	19	#include "services/service_manager/sandbox/features.h"
20	#endif	20	#endif
21	@@ -475,7 +475,7 @@	21
		22	-#if defined(OS_LINUX)
		23	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
		24	#include "components/crash/content/app/crash_switches.h"
		25	#include "components/crash/content/app/crashpad.h"
		26	#endif
		27	@@ -468,7 +468,7 @@
22	#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"	28	#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
23	#endif	29	#endif
24		30
Lines 27-33 Link Here
27	#if defined(USE_X11)	33	#if defined(USE_X11)
28	#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h"	34	#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h"
29	#else	35	#else
30	@@ -1193,7 +1193,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(	36	@@ -1222,7 +1222,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
31	#elif defined(OS_CHROMEOS)	37	#elif defined(OS_CHROMEOS)
32	main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(	38	main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
33	parameters, startup_data_);	39	parameters, startup_data_);
Lines 36-42 Link Here
36	main_parts =	42	main_parts =
37	std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);	43	std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
38	#elif defined(OS_ANDROID)	44	#elif defined(OS_ANDROID)
39	@@ -1219,7 +1219,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(	45	@@ -1248,7 +1248,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
40	// Construct additional browser parts. Stages are called in the order in	46	// Construct additional browser parts. Stages are called in the order in
41	// which they are added.	47	// which they are added.
42	#if defined(TOOLKIT_VIEWS)	48	#if defined(TOOLKIT_VIEWS)
Lines 45-51 Link Here
45	#if defined(USE_X11)	51	#if defined(USE_X11)
46	main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11());	52	main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11());
47	#else	53	#else
48	@@ -1955,7 +1955,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin	54	@@ -1987,7 +1987,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
49	command_line->AppendSwitchASCII(switches::kMetricsClientID,	55	command_line->AppendSwitchASCII(switches::kMetricsClientID,
50	client_info->client_id);	56	client_info->client_id);
51	}	57	}
Lines 54-60 Link Here
54	#if defined(OS_ANDROID)	60	#if defined(OS_ANDROID)
55	bool enable_crash_reporter = true;	61	bool enable_crash_reporter = true;
56	#else	62	#else
57	@@ -2212,7 +2212,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin	63	@@ -2252,7 +2252,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
58	StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(	64	StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
59	process_type, command_line);	65	process_type, command_line);
60		66
Lines 63-69 Link Here
63	// Processes may only query perf_event_open with the BPF sandbox disabled.	69	// Processes may only query perf_event_open with the BPF sandbox disabled.
64	if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&	70	if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
65	command_line->HasSwitch(service_manager::switches::kNoSandbox)) {	71	command_line->HasSwitch(service_manager::switches::kNoSandbox)) {
66	@@ -3526,7 +3526,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst	72	@@ -3553,7 +3553,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
67	}	73	}
68	}	74	}
69		75
Lines 72-78 Link Here
72	void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(	78	void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
73	const base::CommandLine& command_line,	79	const base::CommandLine& command_line,
74	int child_process_id,	80	int child_process_id,
75	@@ -3666,7 +3666,7 @@ void ChromeContentBrowserClient::BindCredentialManager	81	@@ -3683,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager
76	}	82	}
77		83
78	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	84	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 81-87 Link Here
81	bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) {	87	bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) {
82	const base::Value* audio_sandbox_enabled_policy_value =	88	const base::Value* audio_sandbox_enabled_policy_value =
83	policies.GetValue(policy::key::kAudioSandboxEnabled);	89	policies.GetValue(policy::key::kAudioSandboxEnabled);
84	@@ -3684,7 +3684,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&	90	@@ -3701,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&
85		91
86	void ChromeContentBrowserClient::WillStartServiceManager() {	92	void ChromeContentBrowserClient::WillStartServiceManager() {
87	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	93	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 90-96 Link Here
90	if (startup_data_) {	96	if (startup_data_) {
91	auto* chrome_feature_list_creator =	97	auto* chrome_feature_list_creator =
92	startup_data_->chrome_feature_list_creator();	98	startup_data_->chrome_feature_list_creator();
93	@@ -3977,7 +3977,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati	99	@@ -3988,7 +3988,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
94	}	100	}
95		101
96	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	102	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (-2 / +2 lines)
1	--- chrome/browser/chrome_content_browser_client.h.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/chrome_content_browser_client.h.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/chrome_content_browser_client.h	2	+++ chrome/browser/chrome_content_browser_client.h
3	@@ -367,12 +367,12 @@ class ChromeContentBrowserClient : public content::Con	3	@@ -371,12 +371,12 @@ class ChromeContentBrowserClient : public content::Con
4	void OverridePageVisibilityState(	4	void OverridePageVisibilityState(
5	content::RenderFrameHost* render_frame_host,	5	content::RenderFrameHost* render_frame_host,
6	content::PageVisibilityState* visibility_state) override;	6	content::PageVisibilityState* visibility_state) override;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc (-2 / +2 lines)
1	--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-10-21 19:06:21 UTC	1	--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/custom_handlers/protocol_handler_registry.cc	2	+++ chrome/browser/custom_handlers/protocol_handler_registry.cc
3	@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler(	3	@@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler(
4	// If true default protocol handlers will be removed if the OS level	4	// If true default protocol handlers will be removed if the OS level
5	// registration for a protocol is no longer Chrome.	5	// registration for a protocol is no longer Chrome.
6	bool ShouldRemoveHandlersNotInOS() {	6	bool ShouldRemoveHandlersNotInOS() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc (-2 / +2 lines)
1	--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-09-09 21:55:09 UTC	1	--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/devtools/devtools_eye_dropper.cc	2	+++ chrome/browser/devtools/devtools_eye_dropper.cc
3	@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {	3	@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() {
4	// magnified projection only with centered hotspot.	4	// magnified projection only with centered hotspot.
5	// Mac Retina requires cursor to be > 120px in order to render smoothly.	5	// Mac Retina requires cursor to be > 120px in order to render smoothly.
6		6




--- 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

   registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
 #endif
 #if defined(OS_ANDROID)
@@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
 }
 
 bool DownloadPrefs::IsAutoOpenUsed() const {

   if (ShouldOpenPdfInSystemReader())
     return true;
 #endif
@@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
     return false;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);

   if (base::FilePath::CompareEqualIgnoreCase(extension,
                                              FILE_PATH_LITERAL("pdf")) &&
       ShouldOpenPdfInSystemReader())
@@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
   SaveAutoOpenState();
 }
 

 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
   if (should_open_pdf_in_system_reader_ == should_open)
     return;
@@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc (-2 / +2 lines)
1	--- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/download/download_shelf_context_menu.cc	2	+++ chrome/browser/download/download_shelf_context_menu.cc
3	@@ -135,7 +135,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo	3	@@ -137,7 +137,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
4	: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;	4	: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
5	break;	5	break;
6	}	6	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (-2 / +2 lines)
1	--- chrome/browser/extensions/BUILD.gn.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/extensions/BUILD.gn.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/extensions/BUILD.gn	2	+++ chrome/browser/extensions/BUILD.gn
3	@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") {	3	@@ -1154,6 +1154,12 @@ jumbo_static_library("extensions") {
4	deps += [ "//chrome/common:service_process_mojom" ]	4	deps += [ "//chrome/common:service_process_mojom" ]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc (-3 / +3 lines)
1	--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/extensions/api/settings_private/prefs_util.cc	2	+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
3	@@ -159,7 +159,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist	3	@@ -158,7 +158,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
4	(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =	4	(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
5	settings_api::PrefType::PREF_TYPE_BOOLEAN;	5	settings_api::PrefType::PREF_TYPE_BOOLEAN;
6		6
Lines 9-15 Link Here
9	(*s_whitelist)[::prefs::kUseCustomChromeFrame] =	9	(*s_whitelist)[::prefs::kUseCustomChromeFrame] =
10	settings_api::PrefType::PREF_TYPE_BOOLEAN;	10	settings_api::PrefType::PREF_TYPE_BOOLEAN;
11	#endif	11	#endif
12	@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist	12	@@ -168,7 +168,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
13	// Appearance settings.	13	// Appearance settings.
14	(*s_whitelist)[::prefs::kCurrentThemeID] =	14	(*s_whitelist)[::prefs::kCurrentThemeID] =
15	settings_api::PrefType::PREF_TYPE_STRING;	15	settings_api::PrefType::PREF_TYPE_STRING;




--- 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
@@ -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
 
@@ -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();
   extensions::InputMethodAPI::GetFactoryInstance();
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
   extensions::InputImeAPI::GetFactoryInstance();
 #endif
   extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();




--- chrome/browser/flag_descriptions.cc.orig	2020-03-03 18:53:51 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -3861,7 +3861,7 @@ const char kDynamicTcmallocDescription[] =
 
 #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[] =
     "utilization.";
 #endif  // BUILDFLAG(USE_TCMALLOC)
 

 
 // All views-based platforms --------------------------------------------------
 
@@ -3886,13 +3886,13 @@ const char kReopenTabInProductHelpDescription[] =
 
 // Random platform combinations -----------------------------------------------
 

 
 #if BUILDFLAG(ENABLE_CLICK_TO_CALL)
 
@@ -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)
 




--- 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"

 
 // This file declares strings used in chrome://flags. These messages are not
 // translated, because instead of end-users they target Chromium developers and
@@ -2299,7 +2299,7 @@ extern const char kDynamicTcmallocName[];
 
 #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[];
 extern const char kDynamicTcmallocDescription[];
 #endif  // BUILDFLAG(USE_TCMALLOC)
 

 
 // All views-based platforms --------------------------------------------------
 
@@ -2318,12 +2318,12 @@ extern const char kReopenTabInProductHelpDescription[]
 
 // Random platform combinations -----------------------------------------------
 

 
 #if BUILDFLAG(ENABLE_CLICK_TO_CALL)
 
@@ -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)
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc (-2 / +2 lines)
1	--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc	2	+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
3	@@ -37,7 +37,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; /	3	@@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; /
4	const char kProduct[] = "Chrome";	4	const char kProduct[] = "Chrome";
5	#elif defined(OS_MACOSX)	5	#elif defined(OS_MACOSX)
6	const char kProduct[] = "Chrome_Mac";	6	const char kProduct[] = "Chrome_Mac";

Lines 7-13 Link Here

(-)www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc (-1 / +1 lines)
7	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
8	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
9	#include "content/public/browser/child_process_security_policy.h"	9	#include "content/public/browser/child_process_security_policy.h"
10	#include "storage/browser/fileapi/isolated_context.h"	10	#include "storage/browser/file_system/isolated_context.h"
11	-#endif // defined(OS_LINUX) \|\| defined(OS_CHROMEOS)	11	-#endif // defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
12	+#endif // defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)	12	+#endif // defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
13		13

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc (-3 / +3 lines)
1	--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/metrics/chrome_metrics_service_client.cc	2	+++ chrome/browser/metrics/chrome_metrics_service_client.cc
3	@@ -704,11 +704,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic	3	@@ -708,11 +708,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
4	#endif // defined(OS_WIN)	4	#endif // defined(OS_WIN)
5		5
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 14-20 Link Here
14		14
15	#if BUILDFLAG(ENABLE_PLUGINS)	15	#if BUILDFLAG(ENABLE_PLUGINS)
16	plugin_metrics_provider_ = new PluginMetricsProvider(local_state);	16	plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
17	@@ -947,7 +947,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve	17	@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
18	}	18	}
19	#endif	19	#endif
20	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	20	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc (-3 / +3 lines)
1	--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/metrics/process_memory_metrics_emitter.cc	2	+++ chrome/browser/metrics/process_memory_metrics_emitter.cc
3	@@ -375,7 +375,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc	3	@@ -425,7 +425,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
4		4
5	builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024);	5	builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024);
6	builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024);	6	builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024);
Lines 9-15 Link Here
9	builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /	9	builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
10	1024);	10	1024);
11	#endif	11	#endif
12	@@ -398,7 +398,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc	12	@@ -448,7 +448,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
13	MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +	13	MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
14	process_name + ".SharedMemoryFootprint",	14	process_name + ".SharedMemoryFootprint",
15	pmd.os_dump().shared_footprint_kb / 1024);	15	pmd.os_dump().shared_footprint_kb / 1024);




--- chrome/browser/net/system_network_context_manager.cc.orig	2020-03-03 18:53:51 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -79,11 +79,11 @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #endif  // defined(OS_CHROMEOS)
 

-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 
 #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);
 

 
 #if defined(OS_POSIX)
   auth_dynamic_params->ntlm_v2_enabled =
@@ -480,10 +480,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
   pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
                              auth_pref_callback);
 

 
 #if defined(OS_POSIX)
   pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
@@ -535,10 +535,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
   registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
                                std::string());

 
 #if defined(OS_POSIX)
   registry->RegisterBooleanPref(
@@ -643,7 +643,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
       insecure_stub_resolver_enabled, secure_dns_mode,
       std::move(dns_over_https_servers));
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc (-3 / +3 lines)
1	--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-10-21 19:06:22 UTC	1	--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/notifications/notification_display_service_impl.cc	2	+++ chrome/browser/notifications/notification_display_service_impl.cc
3	@@ -33,7 +33,7 @@	3	@@ -34,7 +34,7 @@
4	#include "chrome/browser/notifications/notification_platform_bridge_message_center.h"	4	#include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"	9	#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
10	#endif	10	#endif
11		11
12	@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer	12	@@ -123,7 +123,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
13	AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,	13	AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
14	std::make_unique<PersistentNotificationHandler>());	14	std::make_unique<PersistentNotificationHandler>());
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (-2 / +2 lines)
1	--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/password_manager/chrome_password_manager_client.cc	2	+++ chrome/browser/password_manager/chrome_password_manager_client.cc
3	@@ -85,7 +85,11 @@	3	@@ -87,7 +87,11 @@
4	#include "net/base/url_util.h"	4	#include "net/base/url_util.h"
5	#include "net/cert/cert_status_flags.h"	5	#include "net/cert/cert_status_flags.h"
6	#include "services/metrics/public/cpp/ukm_recorder.h"	6	#include "services/metrics/public/cpp/ukm_recorder.h"

Lines 1-11 Link Here

(-)www/chromium/files/patch-chrome_browser_platform__util.h (-11 lines)
1	--- chrome/browser/platform_util.h.orig 2019-06-04 18:55:17 UTC
2	+++ chrome/browser/platform_util.h
3	@@ -41,7 +41,7 @@ enum OpenOperationResult {
4	enum OpenItemType {
5	OPEN_FILE,
6	OPEN_FOLDER,
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	SHOW_ITEM_IN_FOLDER
10	#endif
11	};

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc (-2 / +2 lines)
1	--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-10-21 19:06:22 UTC	1	--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/plugins/plugin_info_host_impl.cc	2	+++ chrome/browser/plugins/plugin_info_host_impl.cc
3	@@ -383,7 +383,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(	3	@@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
4	std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {	4	std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
5	if (cus_plugin_info) {	5	if (cus_plugin_info) {
6	output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;	6	output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc (-2 / +2 lines)
1	--- chrome/browser/plugins/plugins_resource_service.cc.orig 2019-03-11 22:00:53 UTC	1	--- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/plugins/plugins_resource_service.cc	2	+++ chrome/browser/plugins/plugins_resource_service.cc
3	@@ -63,7 +63,7 @@ GURL GetPluginsServerURL() {	3	@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
4	filename = "plugins_win.json";	4	filename = "plugins_win.json";
5	#elif defined(OS_CHROMEOS)	5	#elif defined(OS_CHROMEOS)
6	filename = "plugins_chromeos.json";	6	filename = "plugins_chromeos.json";




--- 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
@@ -117,7 +117,7 @@
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \

 #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
 #endif
 
@@ -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,

 #if defined(OS_POSIX)
   { key::kNtlmV2Enabled,
     prefs::kNtlmV2Enabled,
@@ -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 },
@@ -1208,7 +1208,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
     browser_switcher::prefs::kChromeParameters,
     base::Value::Type::LIST },
 #endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (-2 / +2 lines)
1	--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-10-21 19:06:22 UTC	1	--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-03-03 18:53:01 UTC
2	+++ chrome/browser/policy/policy_prefs_browsertest.cc	2	+++ chrome/browser/policy/policy_prefs_browsertest.cc
3	@@ -184,6 +184,8 @@ class PolicyTestCase {	3	@@ -250,6 +250,8 @@ class PolicyTestCase {
4	const std::string os("chromeos");	4	const std::string os("chromeos");
5	#elif defined(OS_LINUX)	5	#elif defined(OS_LINUX)
6	const std::string os("linux");	6	const std::string os("linux");

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (-3 / +3 lines)
1	--- chrome/browser/prefs/browser_prefs.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/prefs/browser_prefs.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/prefs/browser_prefs.cc	2	+++ chrome/browser/prefs/browser_prefs.cc
3	@@ -346,7 +346,7 @@	3	@@ -352,7 +352,7 @@
4	#endif	4	#endif
5		5
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 9-15 Link Here
9	#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"	9	#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
10	#endif	10	#endif
11		11
12	@@ -978,7 +978,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync	12	@@ -1005,7 +1005,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
13	#endif	13	#endif
14		14
15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \




--- 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
@@ -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)
+#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
 #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();

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (-2 / +2 lines)
1	--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/profiles/profile_attributes_entry.cc	2	+++ chrome/browser/profiles/profile_attributes_entry.cc
3	@@ -102,7 +102,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac	3	@@ -115,7 +115,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
4	if (is_force_signin_enabled_) {	4	if (is_force_signin_enabled_) {
5	if (!IsAuthenticated())	5	if (!IsAuthenticated())
6	is_force_signin_profile_locked_ = true;	6	is_force_signin_profile_locked_ = true;




--- 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
@@ -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.

   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
                                   IDS_CONTENT_CONTEXT_UNDO);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
@@ -1743,7 +1743,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
   if (!use_spelling)
     return;
 

   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
                                   IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
 #else
@@ -2082,7 +2082,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
     case IDC_CHECK_SPELLING_WHILE_TYPING:
       return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
 




--- 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
@@ -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>

           <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
             <div class="separator"></div>
             <cr-button id="useDefault" on-click="onUseDefaultTap_">
@@ -74,7 +74,7 @@
             </cr-button>
           </template>
 </if>

           <div class="settings-row continuation"
               hidden="[[!showThemesSecondary_(
                   prefs.extensions.theme.id.value, useSystemTheme_)]]"
@@ -137,7 +137,7 @@
             pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
             label="$i18n{showBookmarksBar}">
         </settings-toggle-button>

Line 0 Link Here

(-)www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc (+11 lines)
	1	--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-03-03 18:53:52 UTC
	2	+++ chrome/browser/sharing/shared_clipboard/feature_flags.cc
	3	@@ -11,7 +11,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboar
	4	base::FEATURE_DISABLED_BY_DEFAULT};
	5
	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	7	- defined(OS_CHROMEOS)
	8	+ defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	9	const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver",
	10	base::FEATURE_DISABLED_BY_DEFAULT};
	11

Line 0 Link Here

(-)www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h (+11 lines)
	1	--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-03-03 18:53:52 UTC
	2	+++ chrome/browser/sharing/shared_clipboard/feature_flags.h
	3	@@ -18,7 +18,7 @@ extern const base::Feature kSharedClipboardReceiver;
	4	extern const base::Feature kSharedClipboardUI;
	5
	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	7	- defined(OS_CHROMEOS)
	8	+ defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	9	// Feature to enable handling remote copy messages.
	10	extern const base::Feature kRemoteCopyReceiver;
	11

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc (-2 / +2 lines)
1	--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2019-06-04 18:55:18 UTC	1	--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ssl/captive_portal_blocking_page.cc	2	+++ chrome/browser/ssl/captive_portal_blocking_page.cc
3	@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c	3	@@ -135,7 +135,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
4	wifi_service->GetConnectedNetworkSSID(&ssid, &error);	4	wifi_service->GetConnectedNetworkSSID(&ssid, &error);
5	if (!error.empty())	5	if (!error.empty())
6	return std::string();	6	return std::string();




--- chrome/browser/sync/chrome_sync_client.cc.orig	2020-03-03 18:53:52 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -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(
@@ -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)

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (-2 / +2 lines)
1	--- chrome/browser/ui/browser_command_controller.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/browser/ui/browser_command_controller.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/browser_command_controller.cc	2	+++ chrome/browser/ui/browser_command_controller.cc
3	@@ -81,7 +81,7 @@	3	@@ -81,7 +81,7 @@
4	#include "chrome/browser/ui/browser_commands_chromeos.h"	4	#include "chrome/browser/ui/browser_commands_chromeos.h"
Lines 27-33 Link Here
27	case IDC_MINIMIZE_WINDOW:	27	case IDC_MINIMIZE_WINDOW:
28	browser_->window()->Minimize();	28	browser_->window()->Minimize();
29	break;	29	break;
30	@@ -945,7 +945,7 @@ void BrowserCommandController::InitCommandState() {	30	@@ -951,7 +951,7 @@ void BrowserCommandController::InitCommandState() {
31	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);	31	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
32	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);	32	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
33	#endif	33	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc (-2 / +2 lines)
1	--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-04-30 22:22:36 UTC	1	--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/input_method/input_method_engine_base.cc	2	+++ chrome/browser/ui/input_method/input_method_engine_base.cc
3	@@ -30,7 +30,7 @@	3	@@ -31,7 +31,7 @@
4	#include "ui/base/ime/chromeos/ime_keymap.h"	4	#include "ui/base/ime/chromeos/ime_keymap.h"
5	#elif defined(OS_WIN)	5	#elif defined(OS_WIN)
6	#include "ui/events/keycodes/keyboard_codes_win.h"	6	#include "ui/events/keycodes/keyboard_codes_win.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (-2 / +2 lines)
1	--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-10-21 19:06:24 UTC	1	--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/startup/bad_flags_prompt.cc	2	+++ chrome/browser/ui/startup/bad_flags_prompt.cc
3	@@ -89,7 +89,7 @@ static const char* kBadFlags[] = {	3	@@ -87,7 +87,7 @@ static const char* kBadFlags[] = {
4	extensions::switches::kExtensionsOnChromeURLs,	4	extensions::switches::kExtensionsOnChromeURLs,
5	#endif	5	#endif
6		6




--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -82,7 +82,7 @@
 #include "chrome/browser/ui/user_manager.h"
 #endif
 

 #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
 #endif
 
@@ -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) {

   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
 
@@ -662,8 +662,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
   }
 #endif  // OS_CHROMEOS
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (-3 / +3 lines)
1	--- chrome/browser/ui/tab_helpers.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/browser/ui/tab_helpers.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/tab_helpers.cc	2	+++ chrome/browser/ui/tab_helpers.cc
3	@@ -122,7 +122,7 @@	3	@@ -124,7 +124,7 @@
4	#include "components/zoom/zoom_controller.h"	4	#include "components/zoom/zoom_controller.h"
5	#endif // defined(OS_ANDROID)	5	#endif // defined(OS_ANDROID)
6		6
Lines 9-15 Link Here
9	#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"	9	#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
10	#include "chrome/browser/ui/hats/hats_helper.h"	10	#include "chrome/browser/ui/hats/hats_helper.h"
11	#endif	11	#endif
12	@@ -314,11 +314,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con	12	@@ -329,11 +329,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
13	#endif	13	#endif
14		14
15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (-2 / +2 lines)
1	--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-10-21 19:06:24 UTC	1	--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/toolbar/app_menu_model.cc	2	+++ chrome/browser/ui/toolbar/app_menu_model.cc
3	@@ -685,7 +685,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)	3	@@ -687,7 +687,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
4	return app_menu_icon_controller_->GetTypeAndSeverity().type ==	4	return app_menu_icon_controller_->GetTypeAndSeverity().type ==
5	AppMenuIconController::IconType::UPGRADE_NOTIFICATION;	5	AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
6	}	6	}




--- 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
@@ -33,7 +33,7 @@
 #include "ui/wm/core/wm_state.h"
 #endif  // defined(USE_AURA)
 

 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -43,7 +43,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/l10n/l10n_util.h"

 
 // This connector is used in ui_devtools's TracingAgent to hook up with the
 // tracing service.
@@ -105,7 +105,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
         devtools_server_->tracing_agent());
   }
 

   // 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.
@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
   base::RunLoop().RunUntilIdle();
 
   exit(EXIT_FAILURE);

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (-2 / +2 lines)
1	--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/views/first_run_dialog.cc	2	+++ chrome/browser/ui/views/first_run_dialog.cc
3	@@ -115,8 +115,10 @@ std::unique_ptr<views::View> FirstRunDialog::CreateExt	3	@@ -119,8 +119,10 @@ void FirstRunDialog::Done() {
4	bool FirstRunDialog::Accept() {	4	bool FirstRunDialog::Accept() {
5	GetWidget()->Hide();	5	GetWidget()->Hide();
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (-2 / +2 lines)
1	--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/views/frame/browser_view.cc	2	+++ chrome/browser/ui/views/frame/browser_view.cc
3	@@ -1519,7 +1519,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT	3	@@ -1560,7 +1560,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
4	const bool should_use_native_frame = frame_->ShouldUseNativeFrame();	4	const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
5		5
6	bool must_regenerate_frame;	6	bool must_regenerate_frame;




--- 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"

 #include "ui/views/controls/menu/menu_runner.h"
 #endif
 
@@ -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)
     // 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 {




--- 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
@@ -62,7 +62,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
 
 void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
     ui::SimpleMenuModel* model) {

   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);
@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
     model->AddSeparator(ui::NORMAL_SEPARATOR);
     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   }

   model->AddSeparator(ui::NORMAL_SEPARATOR);
   model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
                                   IDS_SHOW_WINDOW_DECORATIONS_MENU);
@@ -113,7 +113,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
     model->AddSeparator(ui::NORMAL_SEPARATOR);
     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   }




--- chrome/browser/ui/views/tabs/tab.cc.orig	2019-12-16 21:51:24 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
@@ -582,7 +582,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) 
   if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
     return;
   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) 
 }
 
 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




--- 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
@@ -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.

+#if defined(OS_LINUX) || defined(OS_BSD)
   can_release_capture_ = false;
 #endif
   start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
     else
       SetCapture(target_context);
 

     // 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.
@@ -2060,7 +2060,7 @@ TabDragController::Liveness TabDragController::GetLoca
     if (dragged_window)
       exclude.insert(dragged_window);
   }

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (-4 / +4 lines)
1	--- chrome/browser/ui/webui/about_ui.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/browser/ui/webui/about_ui.cc.orig 2020-03-03 18:53:52 UTC
2	+++ chrome/browser/ui/webui/about_ui.cc	2	+++ chrome/browser/ui/webui/about_ui.cc
3	@@ -562,7 +562,7 @@ std::string ChromeURLs() {	3	@@ -561,7 +561,7 @@ std::string ChromeURLs() {
4	return html;	4	return html;
5	}	5	}
6		6
Lines 9-17 Link Here
9	std::string AboutLinuxProxyConfig() {	9	std::string AboutLinuxProxyConfig() {
10	std::string data;	10	std::string data;
11	AppendHeader(&data, 0,	11	AppendHeader(&data, 0,
12	@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest(	12	@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest(
13	response =	13	response =
14	ui::ResourceBundle::GetSharedInstance().DecompressDataResource(idr);	14	ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
15	}	15	}
16	-#if defined(OS_LINUX) \|\| defined(OS_OPENBSD)	16	-#if defined(OS_LINUX) \|\| defined(OS_OPENBSD)
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)




--- 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
@@ -215,11 +215,11 @@
 #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
 #endif
 

 #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
 #endif
 
@@ -328,7 +328,7 @@ bool IsAboutUI(const GURL& url) {
 #if !defined(OS_ANDROID)
           || url.host_piece() == chrome::kChromeUITermsHost
 #endif

           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
 #endif
 #if defined(OS_CHROMEOS)
@@ -658,7 +658,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
   if (url.host_piece() == chrome::kChromeUINaClHost)
     return &NewWebUI<NaClUI>;
 #endif

   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
     return &NewWebUI<ConstrainedWebDialogUI>;
 #endif
@@ -706,17 +706,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
     return &NewWebUI<CastUI>;
   }
 #endif

Line 0 Link Here

(-)www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc (+11 lines)
	1	--- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig 2020-03-03 18:53:53 UTC
	2	+++ chrome/browser/web_applications/components/web_app_file_handler_registration.cc
	3	@@ -15,7 +15,7 @@ namespace web_app {
	4	//
	5	// Note: Because OS_LINUX includes OS_CHROMEOS be sure to use the stub on
	6	// OS_CHROMEOS.
	7	-#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
	8	+#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) && !defined(OS_BSD)
	9	bool ShouldRegisterFileHandlersWithOs() {
	10	return false;
	11	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_BUILD.gn (-2 / +2 lines)
1	--- chrome/common/BUILD.gn.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/BUILD.gn.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/BUILD.gn	2	+++ chrome/common/BUILD.gn
3	@@ -299,6 +299,10 @@ static_library("common") {	3	@@ -278,6 +278,10 @@ static_library("common") {
4	public_deps += [ "//ppapi/shared_impl" ]	4	public_deps += [ "//ppapi/shared_impl" ]
5	}	5	}
6		6




--- chrome/common/channel_info_posix.cc.orig	2020-03-03 18:53:03 UTC
+++ chrome/common/channel_info_posix.cc
@@ -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());
@@ -89,7 +89,7 @@ std::string GetDesktopName(base::Environment* env) {
   return "chromium-browser.desktop";
 #endif
 }

+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 
 version_info::Channel GetChannel() {
   return GetChannelImpl(nullptr);

Lines 1-8 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__features.cc (-5 / +5 lines)
1	--- chrome/common/chrome_features.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/chrome_features.cc.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/chrome_features.cc	2	+++ chrome/common/chrome_features.cc
3	@@ -86,13 +86,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc	3	@@ -81,13 +81,13 @@ const base::Feature kAsyncDns {
4	base::FEATURE_DISABLED_BY_DEFAULT};	4	#endif
5	#endif // defined(OS_ANDROID)	5	};
6		6
7	-#if defined(OS_WIN) \|\| defined(OS_LINUX)	7	-#if defined(OS_WIN) \|\| defined(OS_LINUX)
8	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
Lines 16-22 Link Here
16		16
17	// Enables or disables whether permission prompts are automatically blocked	17	// Enables or disables whether permission prompts are automatically blocked
18	// after the user has explicitly dismissed them too many times.	18	// after the user has explicitly dismissed them too many times.
19	@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{	19	@@ -147,7 +147,7 @@ const base::Feature kThirdPartyModulesBlocking{
20	const base::Feature kTLS13HardeningForLocalAnchors{	20	const base::Feature kTLS13HardeningForLocalAnchors{
21	"TLS13HardeningForLocalAnchors", base::FEATURE_DISABLED_BY_DEFAULT};	21	"TLS13HardeningForLocalAnchors", base::FEATURE_DISABLED_BY_DEFAULT};
22		22




--- chrome/common/chrome_features.h.orig	2020-03-03 18:53:53 UTC
+++ chrome/common/chrome_features.h
@@ -62,10 +62,10 @@ extern const base::Feature kAppServiceShelf;
 extern const base::Feature kAutoFetchOnNetErrorPage;
 #endif
 
 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)

 
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kBlockPromptsIfDismissedOften;
@@ -84,7 +84,7 @@ extern const base::Feature kBundledConnectionHelpFeatu
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kCaptionSettings;
 




--- 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");

       if (!GetUserDownloadsDirectorySafe(&cur))
         return false;
       break;
@@ -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"));

 #else
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
 #endif
@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
     }
 #endif
 #if defined(OS_CHROMEOS) || \

     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
       break;
     }
 #endif

     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
       cur = base::FilePath(kFilepathSinglePrefExtensions);
       break;
@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
 #endif
       break;
 

     case chrome::DIR_NATIVE_MESSAGING:
 #if defined(OS_MACOSX)
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -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"));

 #else
       cur = base::FilePath(FILE_PATH_LITERAL(
           "/etc/chromium/native-messaging-hosts"));
@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
       break;

 #if !defined(OS_ANDROID)
     case chrome::DIR_GLOBAL_GCM_STORE:
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
       cur = cur.Append(kGCMStoreDirname);
       break;
 #endif  // !defined(OS_ANDROID)

     case chrome::FILE_COMPONENT_FLASH_HINT:
       if (!base::PathService::Get(
               chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
       }
       cur = cur.Append(kComponentUpdatedFlashHint);
       break;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__switches.cc (-2 / +2 lines)
1	--- chrome/common/chrome_switches.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/chrome_switches.cc.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/chrome_switches.cc	2	+++ chrome/common/chrome_switches.cc
3	@@ -852,7 +852,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n	3	@@ -868,7 +868,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
4	const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";	4	const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__switches.h (-2 / +2 lines)
1	--- chrome/common/chrome_switches.h.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/chrome_switches.h.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/chrome_switches.h	2	+++ chrome/common/chrome_switches.h
3	@@ -263,7 +263,7 @@ extern const char kAllowNaClFileHandleAPI[];	3	@@ -266,7 +266,7 @@ extern const char kAllowNaClFileHandleAPI[];
4	extern const char kAllowNaClSocketAPI[];	4	extern const char kAllowNaClSocketAPI[];
5	#endif	5	#endif
6		6

Lines 1-9 Link Here

(-)www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (-4 / +4 lines)
1	--- chrome/common/extensions/api/api_sources.gni.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/extensions/api/api_sources.gni.orig 2019-12-16 21:51:24 UTC
2	+++ chrome/common/extensions/api/api_sources.gni	2	+++ chrome/common/extensions/api/api_sources.gni
3	@@ -110,7 +110,7 @@ if (is_chromeos) {	3	@@ -113,7 +113,7 @@ if (is_chromeos) {
4	"wallpaper.json",	4	if (use_cups) {
5	"wallpaper_private.json",	5	schema_sources_ += [ "printing.idl" ]
6	]	6	}
7	-} else if (is_linux \|\| is_win) {	7	-} else if (is_linux \|\| is_win) {
8	+} else if (is_linux \|\| is_bsd \|\| is_win) {	8	+} else if (is_linux \|\| is_bsd \|\| is_win) {
9	schema_sources_ += [ "input_ime.json" ]	9	schema_sources_ += [ "input_ime.json" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_features.gni (-2 / +2 lines)
1	--- chrome/common/features.gni.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/features.gni.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/features.gni	2	+++ chrome/common/features.gni
3	@@ -53,9 +53,9 @@ declare_args() {	3	@@ -51,9 +51,9 @@ declare_args() {
4	(is_desktop_linux && use_dbus) \|\| is_chromeos	4	(is_desktop_linux && use_dbus) \|\| is_chromeos
5		5
6	enable_one_click_signin =	6	enable_one_click_signin =




--- chrome/common/pref_names.cc.orig	2020-03-03 18:53:53 UTC
+++ chrome/common/pref_names.cc
@@ -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";
 

 // Linux specific preference on whether we should match the system theme.
 const char kUsesSystemTheme[] = "extensions.theme.use_system";
 #endif
@@ -1176,7 +1176,7 @@ const char kShowUpdatePromotionInfoBar[] =
     "browser.show_update_promotion_info_bar";
 #endif
 

 // 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";
@@ -1593,7 +1593,7 @@ const char kDownloadDefaultDirectory[] = "download.def
 // upgrade a unsafe location to a safe location.
 const char kDownloadDirUpgraded[] = "download.directory_upgrade";
 

 const char kOpenPdfDownloadInSystemReader[] =
     "download.open_pdf_in_system_reader";
 #endif
@@ -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)




--- chrome/common/pref_names.h.orig	2020-03-03 18:53:53 UTC
+++ chrome/common/pref_names.h
@@ -331,7 +331,7 @@ extern const char kHistoryMenuPromoShown[];
 extern const char kForceGoogleSafeSearch[];
 extern const char kForceYouTubeRestrict[];
 extern const char kAllowedDomainsForApps[];

 extern const char kUsesSystemTheme[];
 #endif
 extern const char kCurrentThemePackFilename[];
@@ -362,7 +362,7 @@ extern const char kDefaultBrowserSettingEnabled[];
 #if defined(OS_MACOSX)
 extern const char kShowUpdatePromotionInfoBar[];
 #endif

 extern const char kUseCustomChromeFrame[];
 #endif
 #if BUILDFLAG(ENABLE_PLUGINS)
@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[];
 extern const char kDownloadDefaultDirectory[];
 extern const char kDownloadExtensionsToOpen[];
 extern const char kDownloadDirUpgraded[];

 extern const char kOpenPdfDownloadInSystemReader[];
 #endif
 #if defined(OS_ANDROID)
@@ -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)




--- chrome/common/webui_url_constants.cc.orig	2020-03-03 18:53:53 UTC
+++ chrome/common/webui_url_constants.cc
@@ -316,7 +316,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
 const char kChromeUICastHost[] = "cast";
 #endif
 

 const char kChromeUIDiscardsHost[] = "discards";
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
 const char kChromeUIHatsHost[] = "hats";
@@ -327,17 +327,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
 const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
 #endif
 

 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
 #endif
 
@@ -599,13 +599,13 @@ const char* const kChromeHostURLs[] = {
     kChromeUIInternetDetailDialogHost,
     kChromeUIAssistantOptInHost,
 #endif

 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
     kChromeUILinuxProxyConfigHost,
 #endif
-#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)

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_webui__url__constants.h (-3 / +3 lines)
1	--- chrome/common/webui_url_constants.h.orig 2019-12-16 21:51:24 UTC	1	--- chrome/common/webui_url_constants.h.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/common/webui_url_constants.h	2	+++ chrome/common/webui_url_constants.h
3	@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);	3	@@ -274,7 +274,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
4	extern const char kChromeUICastHost[];	4	extern const char kChromeUICastHost[];
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	extern const char kChromeUIDiscardsHost[];	9	extern const char kChromeUIDiscardsHost[];
10	extern const char kChromeUIDiscardsURL[];	10	extern const char kChromeUIDiscardsURL[];
11	extern const char kChromeUIHatsHost[];	11	extern const char kChromeUIHatsHost[];
12	@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];	12	@@ -286,17 +286,17 @@ extern const char kChromeUIHatsURL[];
13	extern const char kChromeUILinuxProxyConfigHost[];	13	extern const char kChromeUILinuxProxyConfigHost[];
14	#endif	14	#endif
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (-2 / +2 lines)
1	--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/renderer/chrome_content_renderer_client.cc	2	+++ chrome/renderer/chrome_content_renderer_client.cc
3	@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(	3	@@ -1056,7 +1056,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
4	}	4	}
5		5
6	case chrome::mojom::PluginStatus::kRestartRequired: {	6	case chrome::mojom::PluginStatus::kRestartRequired: {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_test_BUILD.gn (-2 / +2 lines)
1	--- chrome/test/BUILD.gn.orig 2020-01-07 21:53:20 UTC	1	--- chrome/test/BUILD.gn.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/test/BUILD.gn	2	+++ chrome/test/BUILD.gn
3	@@ -5870,7 +5870,7 @@ test("chrome_app_unittests") {	3	@@ -5920,7 +5920,7 @@ test("chrome_app_unittests") {
4	"//components/safe_browsing:buildflags",	4	"//components/safe_browsing:buildflags",
5	"//components/tracing",	5	"//components/tracing",
6	]	6	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc (-2 / +2 lines)
1	--- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-12-16 21:51:24 UTC	1	--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-03-03 18:53:53 UTC
2	+++ chrome/test/chromedriver/chrome_launcher.cc	2	+++ chrome/test/chromedriver/chrome_launcher.cc
3	@@ -67,6 +67,10 @@	3	@@ -68,6 +68,10 @@
4	#include "chrome/test/chromedriver/keycode_text_conversion.h"	4	#include "chrome/test/chromedriver/keycode_text_conversion.h"
5	#endif	5	#endif
6		6




--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2020-03-03 18:53:03 UTC
+++ chrome/test/chromedriver/chrome/chrome_finder.cc
@@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
         installation_locations[i].Append(L"Chromium\\Application"));
   }
 }

 void GetApplicationDirs(std::vector<base::FilePath>* locations) {
   // TODO: Respect users' PATH variables.
   // Until then, we use an approximation of the most common defaults.
@@ -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::kBrowserProcessExecutablePath),
     base::FilePath(chrome::kBrowserProcessExecutablePathChromium),




--- chromecast/browser/cast_browser_main_parts.cc.orig	2020-03-03 18:53:53 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
@@ -73,7 +73,7 @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_switches.h"
 

 #include <fontconfig/fontconfig.h>
 #include <signal.h>
 #include <sys/prctl.h>
@@ -305,7 +305,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
     {cc::switches::kDisableThreadedAnimation, ""},
 #endif  // defined(OS_ANDROID)
 #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)

 #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.
@@ -315,7 +315,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
     {switches::kEnableHardwareOverlays, "cast"},
 #endif
 #endif

     // 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.
@@ -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_font = GetApplicationFontsDir();
   const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
   if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (-2 / +2 lines)
1	--- chromecast/browser/cast_content_browser_client.cc.orig 2019-10-21 19:06:28 UTC	1	--- chromecast/browser/cast_content_browser_client.cc.orig 2020-03-03 18:53:53 UTC
2	+++ chromecast/browser/cast_content_browser_client.cc	2	+++ chromecast/browser/cast_content_browser_client.cc
3	@@ -534,7 +534,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS	3	@@ -443,7 +443,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
4	switches::kAudioOutputChannels));	4	switches::kAudioOutputChannels));
5	}	5	}
6	} else if (process_type == switches::kGpuProcess) {	6	} else if (process_type == switches::kGpuProcess) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc (-2 / +2 lines)
1	--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2019-12-17 19:25:44 UTC	1	--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-03-03 18:53:04 UTC
2	+++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc	2	+++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc
3	@@ -7,7 +7,7 @@	3	@@ -7,7 +7,7 @@
4	#include <map>	4	#include <map>
Lines 9-15 Link Here
9	#include <sys/stat.h>	9	#include <sys/stat.h>
10	#endif	10	#endif
11		11
12	@@ -398,7 +398,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri	12	@@ -393,7 +393,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri
13	named_channel.TakeServerEndpoint();	13	named_channel.TakeServerEndpoint();
14	DCHECK(server_endpoint.is_valid());	14	DCHECK(server_endpoint.is_valid());
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc (-2 / +2 lines)
1	--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-12-16 21:51:25 UTC	1	--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/autofill/core/browser/personal_data_manager.cc	2	+++ components/autofill/core/browser/personal_data_manager.cc
3	@@ -1819,10 +1819,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar	3	@@ -1816,10 +1816,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
4		4
5	bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {	5	bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
6	// The feature is only for Linux, Windows and Mac.	6	// The feature is only for Linux, Windows and Mac.

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc (-2 / +2 lines)
1	--- components/autofill/core/common/autofill_payments_features.cc.orig 2019-12-16 21:51:25 UTC	1	--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/autofill/core/common/autofill_payments_features.cc	2	+++ components/autofill/core/common/autofill_payments_features.cc
3	@@ -162,7 +162,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio	3	@@ -130,7 +130,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
4		4
5	bool ShouldShowImprovedUserConsentForCreditCardSave() {	5	bool ShouldShowImprovedUserConsentForCreditCardSave() {
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \




--- components/crash/content/app/BUILD.gn.orig	2020-03-03 18:53:53 UTC
+++ components/crash/content/app/BUILD.gn
@@ -53,17 +53,20 @@ static_library("app") {
     "crashpad_win.cc",
   ]
 

 
   defines = [ "CRASH_IMPLEMENTATION" ]
 
@@ -75,7 +78,7 @@ static_library("app") {
     "//build:branding_buildflags",
   ]
 

     deps += [
       "//third_party/crashpad/crashpad/client",
       "//third_party/crashpad/crashpad/util",
@@ -101,7 +104,7 @@ static_library("app") {
     ]
   }
 

     deps += [ "//third_party/breakpad:client" ]
   }
 
@@ -132,7 +135,7 @@ static_library("app") {
     libs = [ "log" ]
   }
 

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc (-2 / +2 lines)
1	--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-12-16 21:51:25 UTC	1	--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/discardable_memory/service/discardable_shared_memory_manager.cc	2	+++ components/discardable_memory/service/discardable_shared_memory_manager.cc
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	#include "components/discardable_memory/common/discardable_shared_memory_heap.h"	4	#include "components/discardable_memory/common/discardable_shared_memory_heap.h"
Lines 9-15 Link Here
9	#include "base/files/file_path.h"	9	#include "base/files/file_path.h"
10	#include "base/files/file_util.h"	10	#include "base/files/file_util.h"
11	#include "base/metrics/histogram_macros.h"	11	#include "base/metrics/histogram_macros.h"
12	@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() {	12	@@ -181,7 +181,7 @@ int64_t GetDefaultMemoryLimit() {
13	max_default_memory_limit /= 8;	13	max_default_memory_limit /= 8;
14	#endif	14	#endif
15		15

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_feature__engagement_public_event__constants.cc (-2 / +2 lines)
1	--- components/feature_engagement/public/event_constants.cc.orig 2019-10-21 19:06:29 UTC	1	--- components/feature_engagement/public/event_constants.cc.orig 2020-03-03 18:53:05 UTC
2	+++ components/feature_engagement/public/event_constants.cc	2	+++ components/feature_engagement/public/event_constants.cc
3	@@ -12,12 +12,12 @@ namespace feature_engagement {	3	@@ -12,12 +12,12 @@ namespace feature_engagement {
4	namespace events {	4	namespace events {
Lines 16-22 Link Here
16	defined(OS_CHROMEOS)	16	defined(OS_CHROMEOS)
17	const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met";	17	const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met";
18	const char kTabReopened[] = "tab_reopened";	18	const char kTabReopened[] = "tab_reopened";
19	@@ -39,7 +39,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo	19	@@ -42,7 +42,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo
20	const char kIncognitoWindowSessionTimeMet[] =	20	const char kIncognitoWindowSessionTimeMet[] =
21	"incognito_window_session_time_met";	21	"incognito_window_session_time_met";
22	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)	22	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_feature__engagement_public_event__constants.h (-2 / +2 lines)
1	--- components/feature_engagement/public/event_constants.h.orig 2019-10-21 19:06:29 UTC	1	--- components/feature_engagement/public/event_constants.h.orig 2020-03-03 18:53:05 UTC
2	+++ components/feature_engagement/public/event_constants.h	2	+++ components/feature_engagement/public/event_constants.h
3	@@ -14,15 +14,15 @@ namespace events {	3	@@ -14,15 +14,15 @@ namespace events {
4		4
Lines 19-25 Link Here
19	defined(OS_CHROMEOS)	19	defined(OS_CHROMEOS)
20	// All conditions for reopen closed tab IPH were met. Since this IPH needs to	20	// All conditions for reopen closed tab IPH were met. Since this IPH needs to
21	// track user events (opening/closing tabs, focusing the omnibox, etc) on the	21	// track user events (opening/closing tabs, focusing the omnibox, etc) on the
22	@@ -75,7 +75,7 @@ extern const char kIncognitoWindowOpened[];	22	@@ -80,7 +80,7 @@ extern const char kIncognitoWindowOpened[];
23	extern const char kIncognitoWindowSessionTimeMet[];	23	extern const char kIncognitoWindowSessionTimeMet[];
24	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)	24	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
25		25

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc (-2 / +2 lines)
1	--- components/feature_engagement/public/feature_constants.cc.orig 2019-10-21 19:06:29 UTC	1	--- components/feature_engagement/public/feature_constants.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/feature_engagement/public/feature_constants.cc	2	+++ components/feature_engagement/public/feature_constants.cc
3	@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode",	3	@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode",
4	const base::Feature kIPHDummyFeature{"IPH_Dummy",	4	const base::Feature kIPHDummyFeature{"IPH_Dummy",
Lines 9-15 Link Here
9	defined(OS_CHROMEOS)	9	defined(OS_CHROMEOS)
10	const base::Feature kIPHFocusModeFeature{"IPH_FocusMode",	10	const base::Feature kIPHFocusModeFeature{"IPH_FocusMode",
11	base::FEATURE_DISABLED_BY_DEFAULT};	11	base::FEATURE_DISABLED_BY_DEFAULT};
12	@@ -31,7 +31,7 @@ const base::Feature kIPHIncognitoWindowFeature{	12	@@ -33,7 +33,7 @@ const base::Feature kIPHIncognitoWindowFeature{
13	const base::Feature kIPHNewTabFeature{"IPH_NewTab",	13	const base::Feature kIPHNewTabFeature{"IPH_NewTab",
14	base::FEATURE_DISABLED_BY_DEFAULT};	14	base::FEATURE_DISABLED_BY_DEFAULT};
15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)	15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_feature__engagement_public_feature__constants.h (-2 / +2 lines)
1	--- components/feature_engagement/public/feature_constants.h.orig 2019-10-21 19:06:29 UTC	1	--- components/feature_engagement/public/feature_constants.h.orig 2020-03-03 18:53:53 UTC
2	+++ components/feature_engagement/public/feature_constants.h	2	+++ components/feature_engagement/public/feature_constants.h
3	@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode;	3	@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode;
4	// A feature to ensure all arrays can contain at least one feature.	4	// A feature to ensure all arrays can contain at least one feature.
Lines 9-15 Link Here
9	defined(OS_CHROMEOS)	9	defined(OS_CHROMEOS)
10	extern const base::Feature kIPHFocusModeFeature;	10	extern const base::Feature kIPHFocusModeFeature;
11	extern const base::Feature kIPHGlobalMediaControlsFeature;	11	extern const base::Feature kIPHGlobalMediaControlsFeature;
12	@@ -28,7 +28,7 @@ extern const base::Feature kIPHBookmarkFeature;	12	@@ -29,7 +29,7 @@ extern const base::Feature kIPHBookmarkFeature;
13	extern const base::Feature kIPHIncognitoWindowFeature;	13	extern const base::Feature kIPHIncognitoWindowFeature;
14	extern const base::Feature kIPHNewTabFeature;	14	extern const base::Feature kIPHNewTabFeature;
15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH)	15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH)

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_feature__engagement_public_feature__list.cc (-3 / +3 lines)
1	--- components/feature_engagement/public/feature_list.cc.orig 2019-12-16 21:51:25 UTC	1	--- components/feature_engagement/public/feature_list.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/feature_engagement/public/feature_list.cc	2	+++ components/feature_engagement/public/feature_list.cc
3	@@ -54,7 +54,7 @@ const base::Feature* const kAllFeatures[] = {	3	@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = {
4	&kIPHBadgedReadingListFeature,	4	&kIPHBadgedReadingListFeature,
5	&kIPHBadgedTranslateManualTriggerFeature,	5	&kIPHBadgedTranslateManualTriggerFeature,
6	#endif // defined(OS_IOS)	6	#endif // defined(OS_IOS)
Lines 9-15 Link Here
9	defined(OS_CHROMEOS)	9	defined(OS_CHROMEOS)
10	&kIPHFocusModeFeature,	10	&kIPHFocusModeFeature,
11	&kIPHGlobalMediaControlsFeature,	11	&kIPHGlobalMediaControlsFeature,
12	@@ -64,7 +64,7 @@ const base::Feature* const kAllFeatures[] = {	12	@@ -68,7 +68,7 @@ const base::Feature* const kAllFeatures[] = {
13	&kIPHIncognitoWindowFeature,	13	&kIPHIncognitoWindowFeature,
14	&kIPHNewTabFeature,	14	&kIPHNewTabFeature,
15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)	15	#endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)




--- components/feature_engagement/public/feature_list.h.orig	2020-03-03 18:53:53 UTC
+++ components/feature_engagement/public/feature_list.h
@@ -110,7 +110,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge
                        "IPH_BadgedTranslateManualTrigger");
 #endif  // defined(OS_IOS)
 

     defined(OS_CHROMEOS)
 DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
 DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls");
@@ -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)

         // defined(OS_CHROMEOS)
 
 }  // namespace
@@ -170,7 +170,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
         VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature),
         VARIATION_ENTRY(kIPHBadgedReadingListFeature),
         VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature),

     defined(OS_CHROMEOS)
         VARIATION_ENTRY(kIPHFocusModeFeature),
         VARIATION_ENTRY(kIPHGlobalMediaControls),
@@ -181,7 +181,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
         VARIATION_ENTRY(kIPHIncognitoWindowFeature),
         VARIATION_ENTRY(kIPHNewTabFeature),
 #endif  // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_flags__ui_flags__state.cc (-2 / +2 lines)
1	--- components/flags_ui/flags_state.cc.orig 2019-10-21 19:06:29 UTC	1	--- components/flags_ui/flags_state.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/flags_ui/flags_state.cc	2	+++ components/flags_ui/flags_state.cc
3	@@ -690,7 +690,7 @@ int FlagsState::GetCurrentPlatform() {	3	@@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() {
4	return kOsWin;	4	return kOsWin;
5	#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.	5	#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
6	return kOsCrOS;	6	return kOsCrOS;

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_gcm__driver_gcm__client.h (-2 / +2 lines)
1	--- components/gcm_driver/gcm_client.h.orig 2019-10-21 19:06:29 UTC	1	--- components/gcm_driver/gcm_client.h.orig 2020-03-03 18:53:53 UTC
2	+++ components/gcm_driver/gcm_client.h	2	+++ components/gcm_driver/gcm_client.h
3	@@ -86,6 +86,7 @@ class GCMClient {	3	@@ -87,6 +87,7 @@ class GCMClient {
4	PLATFORM_CROS,	4	PLATFORM_CROS,
5	PLATFORM_IOS,	5	PLATFORM_IOS,
6	PLATFORM_ANDROID,	6	PLATFORM_ANDROID,

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc (-2 / +2 lines)
1	--- components/gcm_driver/gcm_client_impl.cc.orig 2019-09-09 21:55:14 UTC	1	--- components/gcm_driver/gcm_client_impl.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/gcm_driver/gcm_client_impl.cc	2	+++ components/gcm_driver/gcm_client_impl.cc
3	@@ -134,6 +134,9 @@ void ToCheckinProtoVersion(	3	@@ -135,6 +135,9 @@ void ToCheckinProtoVersion(
4	case GCMClient::PLATFORM_CROS:	4	case GCMClient::PLATFORM_CROS:
5	platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;	5	platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;
6	break;	6	break;

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_metrics_BUILD.gn (-3 / +3 lines)
1	--- components/metrics/BUILD.gn.orig 2019-12-16 21:51:25 UTC	1	--- components/metrics/BUILD.gn.orig 2020-03-03 18:53:53 UTC
2	+++ components/metrics/BUILD.gn	2	+++ components/metrics/BUILD.gn
3	@@ -165,6 +165,11 @@ jumbo_static_library("metrics") {	3	@@ -171,6 +171,11 @@ jumbo_static_library("metrics") {
4	if (is_fuchsia) {	4	if (is_fuchsia) {
5	sources += [ "drive_metrics_provider_fuchsia.cc" ]	5	sources += [ "drive_metrics_provider_fuchsia.cc" ]
6	}	6	}
Lines 11-14 Link Here
11	+	11	+
12	}	12	}
13		13
14	# The component metrics provider is a separate target because it depends upon	14	if (is_android) {

Lines 1-9 Link Here

(-)www/chromium/files/patch-components_neterror_resources_neterror.js (-3 / +3 lines)
1	--- components/neterror/resources/neterror.js.orig 2019-04-30 22:22:42 UTC	1	--- components/neterror/resources/neterror.js.orig 2020-03-03 18:53:53 UTC
2	+++ components/neterror/resources/neterror.js	2	+++ components/neterror/resources/neterror.js
3	@@ -160,7 +160,7 @@ function setUpCachedButton(buttonStrings) {	3	@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
4	}	4	}
5		5
6	var primaryControlOnLeft = true;	6	let primaryControlOnLeft = true;
7	-// <if expr="is_macosx or is_ios or is_linux or is_android">	7	-// <if expr="is_macosx or is_ios or is_linux or is_android">
8	+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">	8	+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
9	primaryControlOnLeft = false;	9	primaryControlOnLeft = false;

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc (-2 / +2 lines)
1	--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-12-16 21:51:25 UTC	1	--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-03-03 18:53:53 UTC
2	+++ components/network_session_configurator/browser/network_session_configurator.cc	2	+++ components/network_session_configurator/browser/network_session_configurator.cc
3	@@ -743,7 +743,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C	3	@@ -749,7 +749,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
4	}	4	}
5	#endif // #if !defined(OS_ANDROID)	5	#endif // #if !defined(OS_ANDROID)
6		6




--- 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"

-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 
 #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.

   // 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
@@ -131,7 +131,7 @@ class OSCrypt {
   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
 };
 

 // 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.
@@ -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();




--- 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>

 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -31,7 +31,7 @@
 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

 #include <limits.h>  // For HOST_NAME_MAX
 #endif
 
@@ -60,7 +60,7 @@
 #include "base/system/sys_info.h"
 #endif
 

 #include "base/system/sys_info.h"
 #endif
 
@@ -69,11 +69,24 @@ namespace policy {
 namespace em = enterprise_management;
 
 std::string GetMachineName() {

+  }
+  return std::string();
 #elif defined(OS_MACOSX)
 // TODO(crbug.com/1024115): Find a different replacement for -[NSHost
 // currentHost] on iOS.
@@ -123,7 +136,7 @@ std::string GetMachineName() {
 }
 
 std::string GetOSVersion() {

   return base::SysInfo::OperatingSystemVersion();
 #elif defined(OS_WIN)
   base::win::OSInfo::VersionNumber version_number =
@@ -146,7 +159,7 @@ std::string GetOSArchitecture() {
 }
 
 std::string GetOSUsername() {




--- components/policy/resources/policy_templates.json.orig	2020-03-03 18:53:53 UTC
+++ components/policy/resources/policy_templates.json
@@ -1081,7 +1081,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'string',
       'schema': { 'type': 'string' },

       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -1111,7 +1111,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -1138,7 +1138,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'string',
       'schema': { 'type': 'string' },

       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -1937,7 +1937,7 @@
       'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'dynamic_refresh': True,
         'per_profile': False,
@@ -3780,7 +3780,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'string',
       'schema': { 'type': 'string' },

       'features': {
         'dynamic_refresh': False,
         'per_profile': False,
@@ -3834,7 +3834,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'dynamic_refresh': True,
         'per_profile': False,
@@ -7302,7 +7302,7 @@
       'owners': ['file://src/net/cert/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'dynamic_refresh': True,
         'per_profile': False,
@@ -8526,7 +8526,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -9202,7 +9202,7 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_policy_tools_generate__policy__source.py (-3 / +3 lines)
1	--- components/policy/tools/generate_policy_source.py.orig 2019-12-16 21:51:25 UTC	1	--- components/policy/tools/generate_policy_source.py.orig 2020-03-03 18:53:54 UTC
2	+++ components/policy/tools/generate_policy_source.py	2	+++ components/policy/tools/generate_policy_source.py
3	@@ -96,6 +96,7 @@ class PolicyDetails:	3	@@ -97,6 +97,7 @@ class PolicyDetails:
4	'chrome.linux',	4	'chrome.linux',
5	'chrome.mac',	5	'chrome.mac',
6	'chrome.fuchsia',	6	'chrome.fuchsia',
Lines 8-14 Link Here
8	'chrome.*',	8	'chrome.*',
9	'chrome.win7',	9	'chrome.win7',
10	]:	10	]:
11	@@ -118,7 +119,7 @@ class PolicyDetails:	11	@@ -119,7 +120,7 @@ class PolicyDetails:
12	if platform.startswith('chrome.'):	12	if platform.startswith('chrome.'):
13	platform_sub = platform[7:]	13	platform_sub = platform[7:]
14	if platform_sub == '*':	14	if platform_sub == '*':

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc (-2 / +2 lines)
1	--- components/sync_device_info/device_info_sync_bridge.cc.orig 2019-12-31 14:39:30 UTC	1	--- components/sync_device_info/device_info_sync_bridge.cc.orig 2020-03-03 18:53:54 UTC
2	+++ components/sync_device_info/device_info_sync_bridge.cc	2	+++ components/sync_device_info/device_info_sync_bridge.cc
3	@@ -432,11 +432,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(	3	@@ -445,11 +445,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(
4	return;	4	return;
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc (-2 / +10 lines)
1	--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-12-16 21:50:47 UTC	1	--- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-03-03 18:53:06 UTC
2	+++ components/sync_device_info/local_device_info_util_linux.cc	2	+++ components/sync_device_info/local_device_info_util_linux.cc
3	@@ -36,6 +36,23 @@ std::string GetChromeOSDeviceNameFromType() {	3	@@ -8,6 +8,7 @@
		4	#include <string>
		5
		6	#include "base/linux_util.h"
		7	+#include "build/build_config.h"
		8
		9	#if defined(OS_CHROMEOS)
		10	#include "chromeos/constants/devicetype.h"
		11	@@ -36,6 +37,23 @@ std::string GetChromeOSDeviceNameFromType() {
4	std::string GetPersonalizableDeviceNameInternal() {	12	std::string GetPersonalizableDeviceNameInternal() {
5	#if defined(OS_CHROMEOS)	13	#if defined(OS_CHROMEOS)
6	return GetChromeOSDeviceNameFromType();	14	return GetChromeOSDeviceNameFromType();

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_viz_host_host__display__client.cc (-2 / +2 lines)
1	--- components/viz/host/host_display_client.cc.orig 2019-12-17 19:29:17 UTC	1	--- components/viz/host/host_display_client.cc.orig 2020-03-03 18:53:07 UTC
2	+++ components/viz/host/host_display_client.cc	2	+++ components/viz/host/host_display_client.cc
3	@@ -59,7 +59,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(	3	@@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
4	}	4	}
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_viz_host_host__display__client.h (-2 / +2 lines)
1	--- components/viz/host/host_display_client.h.orig 2019-12-17 19:29:39 UTC	1	--- components/viz/host/host_display_client.h.orig 2020-03-03 18:53:07 UTC
2	+++ components/viz/host/host_display_client.h	2	+++ components/viz/host/host_display_client.h
3	@@ -42,7 +42,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom	3	@@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
4	mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;	4	mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc (-3 / +3 lines)
1	--- components/viz/service/display_embedder/software_output_surface.cc.orig 2019-12-17 19:30:11 UTC	1	--- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-03-03 18:53:54 UTC
2	+++ components/viz/service/display_embedder/software_output_surface.cc	2	+++ components/viz/service/display_embedder/software_output_surface.cc
3	@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::	3	@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
4	base::TimeTicks now = base::TimeTicks::Now();	4	base::TimeTicks now = base::TimeTicks::Now();
5	base::TimeDelta interval_to_next_refresh =	5	base::TimeDelta interval_to_next_refresh =
6	now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;	6	now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
Lines 9-15 Link Here
9	if (needs_swap_size_notifications_)	9	if (needs_swap_size_notifications_)
10	client_->DidSwapWithSize(pixel_size);	10	client_->DidSwapWithSize(pixel_size);
11	#endif	11	#endif
12	@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla	12	@@ -147,7 +147,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
13	return gfx::OVERLAY_TRANSFORM_NONE;	13	return gfx::OVERLAY_TRANSFORM_NONE;
14	}	14	}
15		15

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc (-2 / +2 lines)
1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2019-12-17 19:31:16 UTC	1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-03-03 18:53:54 UTC
2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc	2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
3	@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create(	3	@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create(
4	output_surface->SetNeedsSwapSizeNotifications(	4	output_surface->SetNeedsSwapSizeNotifications(
Lines 9-15 Link Here
9	// For X11, we need notify client about swap completion after resizing, so the	9	// For X11, we need notify client about swap completion after resizing, so the
10	// client can use it for synchronize with X11 WM.	10	// client can use it for synchronize with X11 WM.
11	output_surface->SetNeedsSwapSizeNotifications(true);	11	output_surface->SetNeedsSwapSizeNotifications(true);
12	@@ -358,7 +358,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw	12	@@ -353,7 +353,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
13	#if defined(OS_ANDROID)	13	#if defined(OS_ANDROID)
14	if (display_client_)	14	if (display_client_)
15	display_client_->DidCompleteSwapWithSize(pixel_size);	15	display_client_->DidCompleteSwapWithSize(pixel_size);

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h (-2 / +2 lines)
1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2019-12-17 19:31:54 UTC	1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-03-03 18:53:54 UTC
2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h	2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
3	@@ -140,7 +140,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp	3	@@ -138,7 +138,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
4	// to the BFS.	4	// to the BFS.
5	std::unique_ptr<Display> display_;	5	std::unique_ptr<Display> display_;
6		6




--- 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"

 
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
 #include "content/child/field_trial.h"
@@ -298,7 +298,7 @@ void InitializeZygoteSandboxForBrowserProcess(
 }
 #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
 

 
 #if BUILDFLAG(ENABLE_PLUGINS)
 // Loads the (native) libraries but does not initialize them (i.e., does not
@@ -395,7 +395,7 @@ void PreSandboxInit() {
 }
 #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
 

 
 }  // namespace
 
@@ -453,7 +453,7 @@ int RunZygote(ContentMainDelegate* delegate) {
   delegate->ZygoteStarting(&zygote_fork_delegates);
   media::InitializeMediaLibrary();
 

   PreSandboxInit();
 #endif
 
@@ -618,11 +618,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
                    base::GlobalDescriptors::kBaseDescriptor);
 #endif  // !OS_ANDROID
 




--- content/browser/browser_main_loop.cc.orig	2020-03-03 18:53:54 UTC
+++ content/browser/browser_main_loop.cc
@@ -248,6 +248,13 @@
 #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
 #endif
 

 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
@@ -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());

 #endif
 
 #if defined(USE_X11)
@@ -648,7 +660,7 @@ int BrowserMainLoop::EarlyInitialization() {
   }
 #endif  // !defined(OS_MACOSX)
 

     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.
@@ -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);




--- 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"

 #include "services/service_manager/zygote/host/zygote_communication_linux.h"
 #include "services/service_manager/zygote/host/zygote_host_impl_linux.h"
 
@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
     int* launch_result) {
   *is_synchronous_launch = true;
 

   service_manager::ZygoteHandle zygote_handle =
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
           ? nullptr
@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
         GetProcessType());
     *launch_result = LAUNCH_RESULT_SUCCESS;
 

     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
@@ -92,13 +94,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
       service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
           handle, kLowestRendererOomScore);
     }

 
   Process process;
   process.process = base::LaunchProcess(*command_line(), options);
@@ -116,10 +118,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
     const ChildProcessLauncherHelper::Process& process,
     bool known_dead) {
   ChildProcessTerminationInfo info;

     info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
                                                       &info.exit_code);
   } else {
@@ -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.

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc (-2 / +2 lines)
1	--- content/browser/compositor/gpu_process_transport_factory.cc.orig 2019-12-17 19:32:45 UTC	1	--- content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/compositor/gpu_process_transport_factory.cc	2	+++ content/browser/compositor/gpu_process_transport_factory.cc
3	@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {	3	@@ -115,7 +115,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
4	return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();	4	return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (-2 / +2 lines)
1	--- content/browser/gpu/gpu_process_host.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/gpu/gpu_process_host.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/gpu/gpu_process_host.cc	2	+++ content/browser/gpu/gpu_process_host.cc
3	@@ -1087,7 +1087,7 @@ bool GpuProcessHost::LaunchGpuProcess() {	3	@@ -1039,7 +1039,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
4	std::unique_ptr<base::CommandLine> cmd_line =	4	std::unique_ptr<base::CommandLine> cmd_line =
5	std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);	5	std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
6	#else	6	#else

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_media_media__internals.cc (-2 / +2 lines)
1	--- content/browser/media/media_internals.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/media/media_internals.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/media/media_internals.cc	2	+++ content/browser/media/media_internals.cc
3	@@ -513,7 +513,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit	3	@@ -512,7 +512,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
4	device_dict->SetString("id", descriptor.device_id);	4	device_dict->SetString("id", descriptor.device_id);
5	device_dict->SetString("name", descriptor.GetNameAndModel());	5	device_dict->SetString("name", descriptor.GetNameAndModel());
6	device_dict->Set("formats", std::move(format_list));	6	device_dict->Set("formats", std::move(format_list));

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (-2 / +2 lines)
1	--- content/browser/ppapi_plugin_process_host.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/ppapi_plugin_process_host.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/ppapi_plugin_process_host.cc	2	+++ content/browser/ppapi_plugin_process_host.cc
3	@@ -366,7 +366,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn	3	@@ -365,7 +365,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
4	base::CommandLine::StringType plugin_launcher =	4	base::CommandLine::StringType plugin_launcher =
5	browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);	5	browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
6		6




--- 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
@@ -243,7 +243,7 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #endif
 

 #include <sys/resource.h>
 #include <sys/time.h>
 
@@ -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() {

   struct rlimit limit;
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
     return kUnknownPlatformProcessLimit;
@@ -1181,7 +1181,7 @@ size_t GetPlatformProcessLimit() {
 #else
   // TODO(https://crbug.com/104689): Implement on other platforms.
   return kUnknownPlatformProcessLimit;

 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@@ -1229,7 +1229,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
         return;
     }
 

     if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
       ConnectToFontService(std::move(font_receiver));
       return;
@@ -1628,7 +1628,7 @@ bool RenderProcessHostImpl::Init() {
   renderer_prefix =
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (-4 / +4 lines)
1	--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/renderer_host/render_process_host_impl.h.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/renderer_host/render_process_host_impl.h	2	+++ content/browser/renderer_host/render_process_host_impl.h
3	@@ -439,10 +439,10 @@ class CONTENT_EXPORT RenderProcessHostImpl	3	@@ -473,10 +473,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
4	is_for_guests_only_ = is_for_guests_only;	4	is_for_guests_only_ = is_for_guests_only;
5	}	5	}
6		6
Lines 11-15 Link Here
11	-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)	11	-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
12	+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)	12	+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
13		13
14	RendererAudioOutputStreamFactoryContext*	14	// Called when a video capture stream or an audio stream is added or removed
15	GetRendererAudioOutputStreamFactoryContext() override;	15	// and used to determine if the process should be backgrounded or not.

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (-2 / +2 lines)
1	--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/renderer_host/render_view_host_impl.cc	2	+++ content/browser/renderer_host/render_view_host_impl.cc
3	@@ -208,7 +208,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(	3	@@ -209,7 +209,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
4	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);	4	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
5	prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =	5	prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
6	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);	6	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (-3 / +3 lines)
1	--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/renderer_host/render_widget_host_view_aura.cc	2	+++ content/browser/renderer_host/render_widget_host_view_aura.cc
3	@@ -116,7 +116,7 @@	3	@@ -116,7 +116,7 @@
4	#include "content/browser/accessibility/browser_accessibility_auralinux.h"	4	#include "content/browser/accessibility/browser_accessibility_auralinux.h"
Lines 9-15 Link Here
9	#include "ui/base/ime/linux/text_edit_command_auralinux.h"	9	#include "ui/base/ime/linux/text_edit_command_auralinux.h"
10	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"	10	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
11	#endif	11	#endif
12	@@ -2212,7 +2212,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {	12	@@ -2180,7 +2180,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
13	}	13	}
14		14
15	bool RenderWidgetHostViewAura::NeedsMouseCapture() {	15	bool RenderWidgetHostViewAura::NeedsMouseCapture() {
Lines 18-24 Link Here
18	return NeedsInputGrab();	18	return NeedsInputGrab();
19	#endif	19	#endif
20	return false;	20	return false;
21	@@ -2385,7 +2385,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit	21	@@ -2349,7 +2349,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
22	if (!target_host)	22	if (!target_host)
23	return;	23	return;
24		24

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (-2 / +2 lines)
1	--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-10-21 19:06:32 UTC	1	--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc	2	+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
3	@@ -620,7 +620,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand	3	@@ -611,7 +611,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
4	if (event->type() == ui::ET_MOUSE_EXITED) {	4	if (event->type() == ui::ET_MOUSE_EXITED) {
5	if (mouse_locked \|\| selection_popup)	5	if (mouse_locked \|\| selection_popup)
6	return false;	6	return false;

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc (-2 / +2 lines)
1	--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2019-10-21 19:06:32 UTC	1	--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/scheduler/responsiveness/jank_monitor.cc	2	+++ content/browser/scheduler/responsiveness/jank_monitor.cc
3	@@ -293,7 +293,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv	3	@@ -321,7 +321,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
4	// in context menus, among others). Simply ignore the mismatches for now.	4	// in context menus, among others). Simply ignore the mismatches for now.
5	// See https://crbug.com/929813 for the details of why the mismatch	5	// See https://crbug.com/929813 for the details of why the mismatch
6	// happens.	6	// happens.




--- content/browser/utility_process_host.cc.orig	2020-03-03 18:53:54 UTC
+++ content/browser/utility_process_host.cc
@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
 #include "services/network/network_sandbox_win.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
 #include "content/browser/font_service.h"  // nogncheck
 #endif
@@ -217,7 +217,7 @@ UtilityProcessHost::UtilityProcessHost()
 
 UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
     : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
-#if defined(OS_LINUX)

       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;

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (-2 / +2 lines)
1	--- content/browser/webui/shared_resources_data_source.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/browser/webui/shared_resources_data_source.cc	2	+++ content/browser/webui/shared_resources_data_source.cc
3	@@ -126,12 +126,12 @@ const std::map<int, std::string> CreateMojoResourceIdT	3	@@ -127,12 +127,12 @@ const std::map<int, std::string> CreateMojoResourceIdT
4	"mojo/mojo/public/mojom/base/string16.mojom.html"},	4	"mojo/mojo/public/mojom/base/string16.mojom.html"},
5	{IDR_MOJO_STRING16_MOJOM_LITE_JS,	5	{IDR_MOJO_STRING16_MOJOM_LITE_JS,
6	"mojo/mojo/public/mojom/base/string16.mojom-lite.js"},	6	"mojo/mojo/public/mojom/base/string16.mojom-lite.js"},

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_common_BUILD.gn (-2 / +2 lines)
1	--- content/common/BUILD.gn.orig 2019-12-16 21:51:26 UTC	1	--- content/common/BUILD.gn.orig 2020-03-03 18:53:54 UTC
2	+++ content/common/BUILD.gn	2	+++ content/common/BUILD.gn
3	@@ -366,6 +366,12 @@ source_set("common") {	3	@@ -363,6 +363,12 @@ source_set("common") {
4	libs += [ "android" ]	4	libs += [ "android" ]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_gpu_BUILD.gn (-2 / +2 lines)
1	--- content/gpu/BUILD.gn.orig 2019-12-16 21:51:26 UTC	1	--- content/gpu/BUILD.gn.orig 2020-03-03 18:53:54 UTC
2	+++ content/gpu/BUILD.gn	2	+++ content/gpu/BUILD.gn
3	@@ -126,7 +126,7 @@ target(link_target_type, "gpu_sources") {	3	@@ -132,7 +132,7 @@ target(link_target_type, "gpu_sources") {
4		4
5	# Use DRI on desktop Linux builds.	5	# Use DRI on desktop Linux builds.
6	if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&	6	if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&




--- 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

 #include "content/gpu/gpu_sandbox_hook_linux.h"
 #include "content/public/common/sandbox_init.h"
 #include "services/service_manager/sandbox/linux/sandbox_linux.h"
@@ -106,7 +106,7 @@ namespace content {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                        const gpu::GPUInfo*,
                        const gpu::GpuPreferences&);
@@ -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 {

     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
 #elif defined(OS_WIN)
     return StartSandboxWindows(sandbox_info_);
@@ -298,7 +298,7 @@ int GpuMain(const MainFunctionParams& parameters) {
     main_thread_task_executor =
         std::make_unique<base::SingleThreadTaskExecutor>(
             gpu_preferences.message_pump_type);

 #error "Unsupported Linux platform."
 #elif defined(OS_MACOSX)
     // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
@@ -409,7 +409,7 @@ int GpuMain(const MainFunctionParams& parameters) {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                        const gpu::GPUInfo* gpu_info,
                        const gpu::GpuPreferences& gpu_prefs) {
@@ -444,7 +444,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
 
   return res;
 }




--- 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 @@
 

   mojo::PendingRemote<font_service::mojom::FontService> font_service;
   ChildThread::Get()->BindHostReceiver(
       font_service.InitWithNewPipeAndPassReceiver());
@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
 void PpapiBlinkPlatformImpl::Shutdown() {}
 
 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() {
 }
 
 blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)

Lines 1-11 Link Here

(-)www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc (-11 lines)
1	--- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-04-30 22:22:47 UTC
2	+++ content/public/app/v8_snapshot_overlay_manifest.cc
3	@@ -15,7 +15,7 @@ namespace content {
4	const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
5	static base::NoDestructor<service_manager::Manifest> manifest {
6	service_manager::ManifestBuilder()
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	.PreloadFile(kV8NativesDataDescriptor,
10	base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
11	#if defined(USE_V8_CONTEXT_SNAPSHOT)

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_public_common_child__process__host.h (-2 / +2 lines)
1	--- content/public/common/child_process_host.h.orig 2019-10-21 19:06:32 UTC	1	--- content/public/common/child_process_host.h.orig 2020-03-03 18:53:07 UTC
2	+++ content/public/common/child_process_host.h	2	+++ content/public/common/child_process_host.h
3	@@ -52,7 +52,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se	3	@@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
4	// No special behavior requested.	4	// No special behavior requested.
5	CHILD_NORMAL = 0,	5	CHILD_NORMAL = 0,
6		6

Lines 1-9 Link Here

(-)www/chromium/files/patch-content_public_common_common__param__traits__macros.h (-3 / +3 lines)
1	--- content/public/common/common_param_traits_macros.h.orig 2019-12-16 21:51:26 UTC	1	--- content/public/common/common_param_traits_macros.h.orig 2020-03-03 18:53:54 UTC
2	+++ content/public/common/common_param_traits_macros.h	2	+++ content/public/common/common_param_traits_macros.h
3	@@ -339,7 +339,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen	3	@@ -332,7 +332,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
		4	IPC_STRUCT_TRAITS_MEMBER(accept_languages)
4	IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)	5	IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
5	IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)	6	IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
6	IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
7	-#if defined(OS_LINUX)	7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)	9	IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)




--- content/public/common/content_features.cc.orig	2020-03-03 18:53:54 UTC
+++ content/public/common/content_features.cc
@@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
 const base::Feature kAudioServiceOutOfProcess{
   "AudioServiceOutOfProcess",
 #if defined(OS_WIN) || defined(OS_MACOSX) || \

       base::FEATURE_ENABLED_BY_DEFAULT
 #else
       base::FEATURE_DISABLED_BY_DEFAULT
@@ -622,7 +622,7 @@ const base::Feature kWebAssemblyThreads {
 };
 
 // Enable WebAssembly trap handler.

     defined(ARCH_CPU_X86_64)
 const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                             base::FEATURE_ENABLED_BY_DEFAULT};
@@ -657,7 +657,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
 // https://w3c.github.io/webauthn
 const base::Feature kWebAuthCable {
   "WebAuthenticationCable",

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_public_common_content__switches.cc (-2 / +2 lines)
1	--- content/public/common/content_switches.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/public/common/content_switches.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/public/common/content_switches.cc	2	+++ content/public/common/content_switches.cc
3	@@ -976,7 +976,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =	3	@@ -981,7 +981,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
4	// Enable indication that browser is controlled by automation.	4	// Enable indication that browser is controlled by automation.
5	const char kEnableAutomation[] = "enable-automation";	5	const char kEnableAutomation[] = "enable-automation";
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_public_common_content__switches.h (-2 / +2 lines)
1	--- content/public/common/content_switches.h.orig 2019-12-16 21:51:26 UTC	1	--- content/public/common/content_switches.h.orig 2020-03-03 18:53:54 UTC
2	+++ content/public/common/content_switches.h	2	+++ content/public/common/content_switches.h
3	@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke	3	@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
4	CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];	4	CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_public_test_browser__test__base.cc (-2 / +2 lines)
1	--- content/public/test/browser_test_base.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/public/test/browser_test_base.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/public/test/browser_test_base.cc	2	+++ content/public/test/browser_test_base.cc
3	@@ -97,6 +97,10 @@	3	@@ -96,6 +96,10 @@
4	#include "ui/views/test/event_generator_delegate_mac.h"	4	#include "ui/views/test/event_generator_delegate_mac.h"
5	#endif	5	#endif
6		6

Lines 1-11 Link Here

(-)www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc (-11 lines)
1	--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-10-21 19:06:32 UTC
2	+++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc
3	@@ -244,7 +244,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
4	TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) {
5	SetupRenderer(kDefaultOutputDeviceId);
6	renderer_proxy_->Start();
7	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_FUCHSIA)
8	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
9	static const int kExpectedBufferSize = kHardwareSampleRate / 100;
10	#elif defined(OS_ANDROID)
11	static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100;




--- content/renderer/render_thread_impl.cc.orig	2020-03-03 18:53:54 UTC
+++ content/renderer/render_thread_impl.cc
@@ -173,12 +173,21 @@
 #include "mojo/public/cpp/bindings/message_dumper.h"
 #endif
 

 using base::ThreadRestrictions;
 using blink::WebDocument;
 using blink::WebFrame;
@@ -735,7 +744,7 @@ void RenderThreadImpl::Init() {
   DCHECK(parsed_num_raster_threads) << string_value;
   DCHECK_GT(num_raster_threads, 0);
 

   categorized_worker_pool_->SetBackgroundingCallback(
       main_thread_scheduler_->DefaultTaskRunner(),
       base::BindOnce(
@@ -758,7 +767,7 @@ void RenderThreadImpl::Init() {
   base::DiscardableMemoryAllocator::SetInstance(
       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(
@@ -1128,7 +1137,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
 #else
       cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);




--- content/renderer/renderer_blink_platform_impl.cc.orig	2020-03-03 18:53:54 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -99,7 +99,7 @@
 
 #if defined(OS_MACOSX)
 #include "content/child/child_process_sandbox_support_impl_mac.h"

 #include "content/child/child_process_sandbox_support_impl_linux.h"
 #endif
 
@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
   if (RenderThreadImpl::current()) {
     io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
     thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();

     mojo::PendingRemote<font_service::mojom::FontService> font_service;
     RenderThreadImpl::current()->BindHostReceiver(
         font_service.InitWithNewPipeAndPassReceiver());
@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
 #endif
   }
 

   if (sandboxEnabled()) {
 #if defined(OS_MACOSX)
     sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
@@ -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)

   if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
     render_thread->render_message_filter()->SetThreadPriority(
         thread_id, base::ThreadPriority::DISPLAY);
@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
 }
 
 blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_shell_BUILD.gn (-2 / +2 lines)
1	--- content/shell/BUILD.gn.orig 2019-12-16 21:51:26 UTC	1	--- content/shell/BUILD.gn.orig 2020-03-03 18:53:54 UTC
2	+++ content/shell/BUILD.gn	2	+++ content/shell/BUILD.gn
3	@@ -971,7 +971,7 @@ group("content_shell_crash_test") {	3	@@ -995,7 +995,7 @@ group("content_shell_crash_test") {
4	if (is_win) {	4	if (is_win) {
5	data_deps += [ "//build/win:copy_cdb_to_output" ]	5	data_deps += [ "//build/win:copy_cdb_to_output" ]
6	}	6	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc (-2 / +2 lines)
1	--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2019-10-21 19:06:33 UTC	1	--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-03-03 18:53:08 UTC
2	+++ content/shell/browser/web_test/web_test_browser_context.cc	2	+++ content/shell/browser/web_test/web_test_browser_context.cc
3	@@ -26,7 +26,7 @@	3	@@ -27,7 +27,7 @@
4		4
5	#if defined(OS_WIN)	5	#if defined(OS_WIN)
6	#include "base/base_paths_win.h"	6	#include "base/base_paths_win.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_shell_test__runner_test__runner.cc (-3 / +3 lines)
1	--- content/shell/test_runner/test_runner.cc.orig 2019-12-16 21:51:26 UTC	1	--- content/shell/test_runner/test_runner.cc.orig 2020-03-03 18:53:54 UTC
2	+++ content/shell/test_runner/test_runner.cc	2	+++ content/shell/test_runner/test_runner.cc
3	@@ -64,7 +64,7 @@	3	@@ -64,7 +64,7 @@
4	#include "ui/gfx/geometry/size.h"	4	#include "ui/gfx/geometry/size.h"
Lines 9-15 Link Here
9	#include "third_party/blink/public/platform/web_font_render_style.h"	9	#include "third_party/blink/public/platform/web_font_render_style.h"
10	#endif	10	#endif
11		11
12	@@ -1514,7 +1514,7 @@ void TestRunner::Reset() {	12	@@ -1507,7 +1507,7 @@ void TestRunner::Reset() {
13	drag_image_.reset();	13	drag_image_.reset();
14		14
15	blink::WebSecurityPolicy::ClearOriginAccessList();	15	blink::WebSecurityPolicy::ClearOriginAccessList();
Lines 18-24 Link Here
18	blink::WebFontRenderStyle::SetSubpixelPositioning(false);	18	blink::WebFontRenderStyle::SetSubpixelPositioning(false);
19	#endif	19	#endif
20		20
21	@@ -2088,7 +2088,7 @@ void TestRunner::AddOriginAccessAllowListEntry(	21	@@ -2081,7 +2081,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
22	}	22	}
23		23
24	void TestRunner::SetTextSubpixelPositioning(bool value) {	24	void TestRunner::SetTextSubpixelPositioning(bool value) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_gamepad_gamepad__provider.cc (-2 / +2 lines)
1	--- device/gamepad/gamepad_provider.cc.orig 2019-10-21 19:06:34 UTC	1	--- device/gamepad/gamepad_provider.cc.orig 2020-03-03 18:53:55 UTC
2	+++ device/gamepad/gamepad_provider.cc	2	+++ device/gamepad/gamepad_provider.cc
3	@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep	3	@@ -157,7 +157,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
4		4
5	if (!polling_thread_)	5	if (!polling_thread_)
6	polling_thread_.reset(new base::Thread("Gamepad polling thread"));	6	polling_thread_.reset(new base::Thread("Gamepad polling thread"));

Lines 1-9 Link Here

(-)www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc (-5 / +5 lines)
1	--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-04-30 22:22:49 UTC	1	--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-03-03 18:53:08 UTC
2	+++ extensions/browser/browser_context_keyed_service_factories.cc	2	+++ extensions/browser/browser_context_keyed_service_factories.cc
3	@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()	3	@@ -71,7 +71,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
4	#if defined(OS_CHROMEOS)	4	HidDeviceManager::GetFactoryInstance();
5	NetworkingConfigServiceFactory::GetInstance();	5	IdleManagerFactory::GetInstance();
6	#endif	6	ManagementAPI::GetFactoryInstance();
7	-#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)	7	-#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)
8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
9	NetworkingPrivateEventRouterFactory::GetInstance();	9	NetworkingPrivateEventRouterFactory::GetInstance();

Lines 1-4 Link Here

(-)www/chromium/files/patch-extensions_common_api___permission__features.json (-3 / +3 lines)
1	--- extensions/common/api/_permission_features.json.orig 2019-10-21 19:06:34 UTC	1	--- extensions/common/api/_permission_features.json.orig 2020-03-03 18:53:55 UTC
2	+++ extensions/common/api/_permission_features.json	2	+++ extensions/common/api/_permission_features.json
3	@@ -135,7 +135,7 @@	3	@@ -135,7 +135,7 @@
4	{	4	{
Lines 9-15 Link Here
9	"whitelist": [	9	"whitelist": [
10	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169	10	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
11	"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169	11	"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
12	@@ -461,7 +461,7 @@	12	@@ -468,7 +468,7 @@
13	}, {	13	}, {
14	"channel": "stable",	14	"channel": "stable",
15	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],	15	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
Lines 18-24 Link Here
18	"whitelist": [	18	"whitelist": [
19	"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651	19	"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
20	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683	20	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
21	@@ -492,7 +492,7 @@	21	@@ -499,7 +499,7 @@
22	"networkingPrivate": {	22	"networkingPrivate": {
23	"channel": "stable",	23	"channel": "stable",
24	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],	24	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],

Lines 1-6 Link Here

(-)www/chromium/files/patch-extensions_common_api_runtime.json (-2 / +2 lines)
1	--- extensions/common/api/runtime.json.orig 2019-04-30 22:22:49 UTC	1	--- extensions/common/api/runtime.json.orig 2020-03-03 18:53:55 UTC
2	+++ extensions/common/api/runtime.json	2	+++ extensions/common/api/runtime.json
3	@@ -67,7 +67,7 @@	3	@@ -68,7 +68,7 @@
4	"id": "PlatformOs",	4	"id": "PlatformOs",
5	"type": "string",	5	"type": "string",
6	"description": "The operating system chrome is running on.",	6	"description": "The operating system chrome is running on.",

Lines 1-6 Link Here

(-)www/chromium/files/patch-extensions_common_image__util.cc (-2 / +2 lines)
1	--- extensions/common/image_util.cc.orig 2019-12-16 21:51:26 UTC	1	--- extensions/common/image_util.cc.orig 2020-03-03 18:53:08 UTC
2	+++ extensions/common/image_util.cc	2	+++ extensions/common/image_util.cc
3	@@ -19,7 +19,11 @@	3	@@ -18,7 +18,11 @@
4	#include "base/strings/stringprintf.h"	4	#include "base/strings/stringprintf.h"
5	#include "base/time/time.h"	5	#include "base/time/time.h"
6	#include "base/timer/elapsed_timer.h"	6	#include "base/timer/elapsed_timer.h"




--- 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"

 #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
 #endif
 
@@ -535,7 +535,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
 ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
                                     MemoryTypeTracker* tracker,
                                     WGPUDevice wgpuDevice) {
-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
   if (!wgpu_format_) {
     DLOG(ERROR) << "Format not supported for Dawn";
     return nullptr;
@@ -558,14 +558,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
   return std::make_unique<ExternalVkImageDawnRepresentation>(
       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
 }
 
 GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   GrVkImageInfo image_info;
   bool result = backend_texture_.getVkImageInfo(&image_info);
   DCHECK(result);
@@ -629,7 +629,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
     return nullptr;
   }
 
-#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);
 }
 

Lines 1-7 Link Here

(-)www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h (-3 / +3 lines)
1	--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2019-12-16 21:51:26 UTC	1	--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-03 18:53:55 UTC
2	+++ gpu/command_buffer/service/external_vk_image_backing.h	2	+++ gpu/command_buffer/service/external_vk_image_backing.h
3	@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag	3	@@ -135,7 +135,7 @@ class ExternalVkImageBacking final : public SharedImag
4	base::Optional<DawnTextureFormat> dawn_format,	4	base::Optional<WGPUTextureFormat> wgpu_format,
5	base::Optional<uint32_t> memory_type_index);	5	base::Optional<uint32_t> memory_type_index);
6		6
7	-#ifdef OS_LINUX	7	-#ifdef OS_LINUX

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc (-3 / +3 lines)
1	--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-12-16 21:51:26 UTC	1	--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-03-03 18:53:55 UTC
2	+++ gpu/command_buffer/service/external_vk_image_gl_representation.cc	2	+++ gpu/command_buffer/service/external_vk_image_gl_representation.cc
3	@@ -189,7 +189,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph	3	@@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
4	#if defined(OS_FUCHSIA)	4	#if defined(OS_FUCHSIA)
5	NOTIMPLEMENTED_LOG_ONCE();	5	NOTIMPLEMENTED_LOG_ONCE();
6	return 0;	6	return 0;
Lines 9-15 Link Here
9	if (handle.vk_handle_type() !=	9	if (handle.vk_handle_type() !=
10	VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {	10	VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
11	DLOG(ERROR) << "Importing semaphore handle of unexpected type:"	11	DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
12	@@ -204,7 +204,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph	12	@@ -194,7 +194,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
13	fd.release());	13	fd.release());
14		14
15	return gl_semaphore;	15	return gl_semaphore;

Lines 1-4 Link Here

(-)www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc (-2 / +2 lines)
1	--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-10-21 19:06:35 UTC	1	--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-03 18:53:55 UTC
2	+++ gpu/command_buffer/tests/gl_test_utils.cc	2	+++ gpu/command_buffer/tests/gl_test_utils.cc
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@
4	#include "ui/gl/gl_version_info.h"	4	#include "ui/gl/gl_version_info.h"
Lines 9-15 Link Here
9	#include "ui/gl/gl_image_native_pixmap.h"	9	#include "ui/gl/gl_image_native_pixmap.h"
10	#endif	10	#endif
11		11
12	@@ -443,7 +443,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {	12	@@ -446,7 +446,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
13	window_system_binding_info_ = gl::GLWindowSystemBindingInfo();	13	window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
14	}	14	}
15		15

Lines 1-4 Link Here

(-)www/chromium/files/patch-gpu_config_gpu__control__list.cc (-2 / +2 lines)
1	--- gpu/config/gpu_control_list.cc.orig 2019-10-21 19:06:35 UTC	1	--- gpu/config/gpu_control_list.cc.orig 2020-03-03 18:53:55 UTC
2	+++ gpu/config/gpu_control_list.cc	2	+++ gpu/config/gpu_control_list.cc
3	@@ -16,7 +16,11 @@	3	@@ -16,7 +16,11 @@
4	#include "base/values.h"	4	#include "base/values.h"
Lines 21-27 Link Here
21	return kGLTypeGL;	21	return kGLTypeGL;
22	#elif defined(OS_MACOSX)	22	#elif defined(OS_MACOSX)
23	return kGLTypeGL;	23	return kGLTypeGL;
24	@@ -707,7 +711,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {	24	@@ -713,7 +717,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
25	return kOsAndroid;	25	return kOsAndroid;
26	#elif defined(OS_FUCHSIA)	26	#elif defined(OS_FUCHSIA)
27	return kOsFuchsia;	27	return kOsFuchsia;




--- 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

 
 class GpuWatchdogInit {
  public:
@@ -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;
@@ -254,7 +254,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   }
 
   bool attempted_startsandbox = false;
-#if defined(OS_LINUX)

   // 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.
@@ -263,7 +263,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
         watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
     attempted_startsandbox = true;
   }

 
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
 
@@ -288,14 +288,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   }
   if (gl_initialized && use_swiftshader &&
       gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {

-#endif  // OS_LINUX
+#endif  // OS_LINUX || OS_BSD
   }
 
   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) {

         VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                 << "on Linux";
         return false;
@@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
               << "failed";
           return false;
         }

       }
     } else {  // use_swiftshader == true
       switch (gpu_preferences_.use_vulkan) {
@@ -410,7 +410,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
 
   InitializePlatformOverlaySettings(&gpu_info_);
 

   // 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.
@@ -429,7 +429,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
       return false;
     }
   }

 
   if (use_swiftshader) {
     AdjustInfoToSwiftShader();
@@ -608,7 +608,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
 
   InitializePlatformOverlaySettings(&gpu_info_);
 

   // 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.
@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
       }
     }
   }




--- gpu/ipc/service/gpu_watchdog_thread.cc.orig	2020-03-03 18:53:55 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.cc
@@ -41,7 +41,7 @@ const int kGpuTimeout = 15000;
 const int kGpuTimeout = 10000;
 #endif
 

 const base::FilePath::CharType kTtyFilePath[] =
     FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
 #endif
@@ -60,7 +60,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
       arm_cpu_time_(),
 #endif
       suspension_counter_(this)

       ,
       host_tty_(-1)
 #endif
@@ -77,7 +77,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
   DCHECK(result);
 #endif
 

   tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
   host_tty_ = GetActiveTTY();
 #endif
@@ -223,7 +223,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
 
   base::PowerMonitor::RemoveObserver(this);
 

   if (tty_file_)
     fclose(tty_file_);
 #endif
@@ -380,7 +380,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
     return;
 #endif
 

   // 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) {
@@ -538,7 +538,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
 }
 #endif
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (-5 / +5 lines)
1	--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-12-16 21:51:26 UTC	1	--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-03 18:53:55 UTC
2	+++ gpu/ipc/service/gpu_watchdog_thread.h	2	+++ gpu/ipc/service/gpu_watchdog_thread.h
3	@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1	3	@@ -181,7 +181,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
4	base::ThreadTicks GetWatchedThreadTime();	4	base::ThreadTicks GetWatchedThreadTime();
5	#endif	5	#endif
6		6
Lines 9-17 Link Here
9	int GetActiveTTY() const;	9	int GetActiveTTY() const;
10	#endif	10	#endif
11		11
12	@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1	12	@@ -232,7 +232,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
13	base::Time check_time_;	13	// whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded.
14	base::TimeTicks check_timeticks_;	14	bool is_watchdog_start_histogram_recorded = false;
15		15
16	-#if defined(USE_X11)	16	-#if defined(USE_X11)
17	+#if defined(USE_X11) && !defined(OS_BSD)	17	+#if defined(USE_X11) && !defined(OS_BSD)

Lines 1-6 Link Here

(-)www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (-3 / +3 lines)
1	--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-12-16 21:51:26 UTC	1	--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-03-03 18:53:55 UTC
2	+++ headless/lib/browser/headless_content_browser_client.cc	2	+++ headless/lib/browser/headless_content_browser_client.cc
3	@@ -166,7 +166,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet	3	@@ -167,7 +167,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
4	return content::GeneratedCodeCacheSettings(true, 0, context->GetPath());	4	return content::GeneratedCodeCacheSettings(true, 0, context->GetPath());
5	}	5	}
6		6
Lines 9-15 Link Here
9	void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(	9	void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
10	const base::CommandLine& command_line,	10	const base::CommandLine& command_line,
11	int child_process_id,	11	int child_process_id,
12	@@ -177,7 +177,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped	12	@@ -178,7 +178,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
13	mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);	13	mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
14	#endif // defined(HEADLESS_USE_BREAKPAD)	14	#endif // defined(HEADLESS_USE_BREAKPAD)
15	}	15	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc (-3 / +3 lines)
1	--- headless/lib/headless_content_main_delegate.cc.orig 2019-10-21 19:06:35 UTC	1	--- headless/lib/headless_content_main_delegate.cc.orig 2020-03-03 18:53:55 UTC
2	+++ headless/lib/headless_content_main_delegate.cc	2	+++ headless/lib/headless_content_main_delegate.cc
3	@@ -328,7 +328,7 @@ int HeadlessContentMainDelegate::RunProcess(	3	@@ -401,7 +401,7 @@ int HeadlessContentMainDelegate::RunProcess(
4	}	4	}
5	#endif // !defined(CHROME_MULTIPLE_DLL_CHILD)	5	#endif // !defined(CHROME_MULTIPLE_DLL_CHILD)
6		6
Lines 9-15 Link Here
9	void SIGTERMProfilingShutdown(int signal) {	9	void SIGTERMProfilingShutdown(int signal) {
10	content::Profiling::Stop();	10	content::Profiling::Stop();
11	struct sigaction sigact;	11	struct sigaction sigact;
12	@@ -363,7 +363,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {	12	@@ -436,7 +436,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {
13	breakpad::InitCrashReporter(process_type);	13	breakpad::InitCrashReporter(process_type);
14	#endif	14	#endif
15	}	15	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__channel.h (-2 / +2 lines)
1	--- ipc/ipc_channel.h.orig 2019-12-16 21:51:27 UTC	1	--- ipc/ipc_channel.h.orig 2020-03-03 18:53:55 UTC
2	+++ ipc/ipc_channel.h	2	+++ ipc/ipc_channel.h
3	@@ -280,7 +280,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {	3	@@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
4	static std::string GenerateUniqueRandomChannelID();	4	static std::string GenerateUniqueRandomChannelID();
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__channel__common.cc (-3 / +3 lines)
1	--- ipc/ipc_channel_common.cc.orig 2019-06-04 18:55:25 UTC	1	--- ipc/ipc_channel_common.cc.orig 2020-03-03 18:53:09 UTC
2	+++ ipc/ipc_channel_common.cc	2	+++ ipc/ipc_channel_common.cc
3	@@ -9,7 +9,7 @@	3	@@ -10,7 +10,7 @@
4		4
5	namespace IPC {	5	namespace IPC {
6		6
Lines 9-15 Link Here
9		9
10	namespace {	10	namespace {
11	int g_global_pid = 0;	11	int g_global_pid = 0;
12	@@ -25,7 +25,7 @@ int Channel::GetGlobalPid() {	12	@@ -26,7 +26,7 @@ int Channel::GetGlobalPid() {
13	return g_global_pid;	13	return g_global_pid;
14	}	14	}
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__channel__mojo.cc (-2 / +2 lines)
1	--- ipc/ipc_channel_mojo.cc.orig 2019-12-16 21:51:27 UTC	1	--- ipc/ipc_channel_mojo.cc.orig 2020-03-03 18:53:09 UTC
2	+++ ipc/ipc_channel_mojo.cc	2	+++ ipc/ipc_channel_mojo.cc
3	@@ -65,10 +65,10 @@ class MojoChannelFactory : public ChannelFactory {	3	@@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory {
4	};	4	};
5		5
6	base::ProcessId GetSelfPID() {	6	base::ProcessId GetSelfPID() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__message__utils.h (-2 / +2 lines)
1	--- ipc/ipc_message_utils.h.orig 2019-10-21 19:06:36 UTC	1	--- ipc/ipc_message_utils.h.orig 2020-03-03 18:53:55 UTC
2	+++ ipc/ipc_message_utils.h	2	+++ ipc/ipc_message_utils.h
3	@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {	3	@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> {
4	// 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long.	4	// 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long.
5	// Since we want to support Android 32<>64 bit IPC, as long as we don't have	5	// Since we want to support Android 32<>64 bit IPC, as long as we don't have
6	// these traits for 32 bit ARM then that'll catch any errors.	6	// these traits for 32 bit ARM then that'll catch any errors.

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_audio_BUILD.gn (-2 / +2 lines)
1	--- media/audio/BUILD.gn.orig 2019-12-16 21:51:27 UTC	1	--- media/audio/BUILD.gn.orig 2020-03-03 18:53:55 UTC
2	+++ media/audio/BUILD.gn	2	+++ media/audio/BUILD.gn
3	@@ -250,8 +250,18 @@ source_set("audio") {	3	@@ -238,8 +238,18 @@ source_set("audio") {
4	]	4	]
5	}	5	}
6		6




--- 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) {




--- media/gpu/libyuv_image_processor.cc.orig	2019-12-16 21:51:27 UTC
+++ media/gpu/libyuv_image_processor.cc
@@ -78,7 +78,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
   // LibYUVImageProcessor supports only memory-based video frame for input.
   VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
   for (auto input_type : input_config.preferred_storage_types) {
-#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(), true);
@@ -87,7 +87,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;
@@ -186,7 +186,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));
@@ -196,7 +196,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) {




--- media/gpu/linux/platform_video_frame_utils.cc.orig	2020-03-03 18:53:55 UTC
+++ media/gpu/linux/platform_video_frame_utils.cc
@@ -20,16 +20,16 @@
 #include "ui/gfx/linux/native_pixmap_dmabuf.h"
 #include "ui/gfx/native_pixmap.h"
 

 
 scoped_refptr<VideoFrame> CreateVideoFrameGpu(
     gpu::GpuMemoryBufferFactory* factory,
@@ -93,7 +93,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu(
                      gpu::kPlatformVideoFramePoolClientId));
   return frame;
 }

 
 }  // namespace
 
@@ -105,11 +105,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame(
     const gfx::Size& natural_size,
     base::TimeDelta timestamp,
     gfx::BufferUsage buffer_usage) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_media__options.gni (-2 / +2 lines)
1	--- media/media_options.gni.orig 2019-12-16 21:51:27 UTC	1	--- media/media_options.gni.orig 2020-03-03 18:53:55 UTC
2	+++ media/media_options.gni	2	+++ media/media_options.gni
3	@@ -117,6 +117,9 @@ declare_args() {	3	@@ -114,6 +114,9 @@ declare_args() {
4	# Enables runtime selection of ALSA library for audio.	4	# Enables runtime selection of ALSA library for audio.
5	use_alsa = false	5	use_alsa = false
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc (-2 / +2 lines)
1	--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-12-16 21:51:27 UTC	1	--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-03 18:53:55 UTC
2	+++ media/mojo/clients/mojo_video_encode_accelerator.cc	2	+++ media/mojo/clients/mojo_video_encode_accelerator.cc
3	@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<	3	@@ -125,7 +125,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
4	frame->layout().num_planes());	4	frame->layout().num_planes());
5	DCHECK(vea_.is_bound());	5	DCHECK(vea_.is_bound());
6		6




--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2020-03-03 18:53:55 UTC
+++ media/mojo/mojom/video_frame_mojom_traits.cc
@@ -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)));
   }
 

   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
     std::vector<mojo::ScopedHandle> dmabuf_fds;
 
@@ -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);

Lines 1-4 Link Here

(-)www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (-2 / +2 lines)
1	--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-12-16 21:51:27 UTC	1	--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-03-03 18:53:55 UTC
2	+++ media/mojo/services/gpu_mojo_media_client.cc	2	+++ media/mojo/services/gpu_mojo_media_client.cc
3	@@ -65,7 +65,7 @@ namespace media {	3	@@ -65,7 +65,7 @@ namespace media {
4	namespace {	4	namespace {
Lines 9-15 Link Here
9	gpu::CommandBufferStub* GetCommandBufferStub(	9	gpu::CommandBufferStub* GetCommandBufferStub(
10	scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,	10	scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
11	base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,	11	base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
12	@@ -265,7 +265,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea	12	@@ -266,7 +266,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
13	command_buffer_id->route_id));	13	command_buffer_id->route_id));
14	}	14	}
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc (-2 / +2 lines)
1	--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-12-16 21:51:27 UTC	1	--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-03-03 18:53:55 UTC
2	+++ media/video/gpu_memory_buffer_video_frame_pool.cc	2	+++ media/video/gpu_memory_buffer_video_frame_pool.cc
3	@@ -557,7 +557,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa	3	@@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
4	}	4	}
5		5
6	bool is_software_backed_video_frame = !video_frame->HasTextures();	6	bool is_software_backed_video_frame = !video_frame->HasTextures();




--- media/webrtc/webrtc_switches.cc.orig	2020-03-03 18:53:10 UTC
+++ media/webrtc/webrtc_switches.cc
@@ -50,7 +50,7 @@ namespace media {
 
 bool IsWebRtcApmInAudioServiceEnabled() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || \

   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




--- mojo/public/c/system/thunks.cc.orig	2020-03-03 18:53:10 UTC
+++ mojo/public/c/system/thunks.cc
@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "mojo/public/c/system/core.h"
 

 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/optional.h"
@@ -58,7 +58,7 @@ namespace mojo {
 
 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 {
 class CoreLibraryInitializer {
  public:
   CoreLibraryInitializer(const MojoInitializeOptions* options) {

     bool application_provided_path = false;
     base::Optional<base::FilePath> library_path;
     if (options && options->struct_size >= sizeof(*options) &&
@@ -77,7 +77,7 @@ class CoreLibraryInitializer {
 
     if (!library_path) {
       // Default to looking for the library in the current working directory.

       const base::FilePath::CharType kDefaultLibraryPathValue[] =
           FILE_PATH_LITERAL("./libmojo_core.so");
 #elif defined(OS_WIN)
@@ -127,16 +127,16 @@ class CoreLibraryInitializer {
 
     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)




--- net/BUILD.gn.orig	2020-03-03 18:53:55 UTC
+++ net/BUILD.gn
@@ -103,7 +103,7 @@ net_configs = [
   "//build/config/compiler:wexit_time_destructors",
 ]
 

   net_configs += [ "//build/config/linux:libresolv" ]
 }
 
@@ -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") {
       }
     }
 

       sources += [
         "base/network_change_notifier_posix.cc",
         "base/network_change_notifier_posix.h",
@@ -1991,7 +2002,7 @@ component("net") {
     }
 
     # Use getifaddrs() on POSIX platforms, except Linux and Android.

       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) {




--- net/base/address_tracker_linux.cc.orig	2020-03-03 18:53:55 UTC
+++ net/base/address_tracker_linux.cc
@@ -5,7 +5,9 @@
 #include "net/base/address_tracker_linux.h"
 namespace internal {
 
 #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(
-  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(
 AddressTrackerLinux::~AddressTrackerLinux() = default;
 
 void AddressTrackerLinux::Init() {

   netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
   if (!netlink_fd_.is_valid()) {
     PLOG(ERROR) << "Could not create NETLINK socket";
@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
   connection_type_initialized_cv_.Broadcast();
 }
 

 AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
   AddressTrackerAutoLock lock(*this, address_map_lock_);
   return address_map_;
@@ -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();
 }

 
 NetworkChangeNotifier::ConnectionType
 AddressTrackerLinux::GetCurrentConnectionType() {
@@ -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);
   // 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;
     }
   }

 }
 
 void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
 }
 
 void AddressTrackerLinux::UpdateCurrentConnectionType() {

+  NOTIMPLEMENTED();
 }
 
 int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() {

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_base_network__change__notifier.cc (-3 / +3 lines)
1	--- net/base/network_change_notifier.cc.orig 2019-12-16 21:51:27 UTC	1	--- net/base/network_change_notifier.cc.orig 2020-03-03 18:53:10 UTC
2	+++ net/base/network_change_notifier.cc	2	+++ net/base/network_change_notifier.cc
3	@@ -35,7 +35,7 @@	3	@@ -35,7 +35,7 @@
4	#include "net/base/network_change_notifier_linux.h"	4	#include "net/base/network_change_notifier_linux.h"
Lines 9-15 Link Here
9	#include "net/base/network_change_notifier_posix.h"	9	#include "net/base/network_change_notifier_posix.h"
10	#elif defined(OS_FUCHSIA)	10	#elif defined(OS_FUCHSIA)
11	#include "net/base/network_change_notifier_fuchsia.h"	11	#include "net/base/network_change_notifier_fuchsia.h"
12	@@ -240,7 +240,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo	12	@@ -229,7 +229,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
13	// service in a separate process.	13	// service in a separate process.
14	return std::make_unique<NetworkChangeNotifierPosix>(initial_type,	14	return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
15	initial_subtype);	15	initial_subtype);
Lines 18-24 Link Here
18	return std::make_unique<NetworkChangeNotifierPosix>(initial_type,	18	return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
19	initial_subtype);	19	initial_subtype);
20	#elif defined(OS_LINUX)	20	#elif defined(OS_LINUX)
21	@@ -252,7 +252,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo	21	@@ -241,7 +241,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
22	return std::make_unique<NetworkChangeNotifierFuchsia>(	22	return std::make_unique<NetworkChangeNotifierFuchsia>(
23	0 /* required_features */);	23	0 /* required_features */);
24	#else	24	#else

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_dns_host__resolver__proc.cc (-2 / +2 lines)
1	--- net/dns/host_resolver_proc.cc.orig 2019-04-30 22:22:54 UTC	1	--- net/dns/host_resolver_proc.cc.orig 2020-03-03 18:53:11 UTC
2	+++ net/dns/host_resolver_proc.cc	2	+++ net/dns/host_resolver_proc.cc
3	@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,	3	@@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host,
4	base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,	4	base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
5	base::BlockingType::WILL_BLOCK);	5	base::BlockingType::WILL_BLOCK);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (-2 / +2 lines)
1	--- net/http/http_auth_gssapi_posix.cc.orig 2019-10-21 19:06:38 UTC	1	--- net/http/http_auth_gssapi_posix.cc.orig 2020-03-03 18:53:11 UTC
2	+++ net/http/http_auth_gssapi_posix.cc	2	+++ net/http/http_auth_gssapi_posix.cc
3	@@ -366,8 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib	3	@@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
4	static const char* const kDefaultLibraryNames[] = {	4	static const char* const kDefaultLibraryNames[] = {
5	#if defined(OS_MACOSX)	5	#if defined(OS_MACOSX)
6	"/System/Library/Frameworks/GSS.framework/GSS"	6	"/System/Library/Frameworks/GSS.framework/GSS"

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc (-2 / +2 lines)
1	--- net/nqe/network_quality_estimator_unittest.cc.orig 2019-10-21 19:06:38 UTC	1	--- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-03 18:53:55 UTC
2	+++ net/nqe/network_quality_estimator_unittest.cc	2	+++ net/nqe/network_quality_estimator_unittest.cc
3	@@ -2144,7 +2144,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa	3	@@ -2146,7 +2146,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
4	// TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is	4	// TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
5	// enabled only on certain platforms.	5	// enabled only on certain platforms.
6	// ChromeOS is disabled due to crbug.com/986904	6	// ChromeOS is disabled due to crbug.com/986904




--- net/proxy_resolution/proxy_resolution_service.cc.orig	2020-03-03 18:53:55 UTC
+++ net/proxy_resolution/proxy_resolution_service.cc
@@ -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"

 #include "net/proxy_resolution/proxy_config_service_linux.h"
 #elif defined(OS_ANDROID)
 #include "net/proxy_resolution/proxy_config_service_android.h"
@@ -63,7 +63,7 @@ namespace net {
 namespace {
 
 #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \

 constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
     net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
       semantics {
@@ -1556,7 +1556,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
              << "profile_io_data.cc::CreateProxyConfigService and this should "
              << "be used only for examples.";
   return std::make_unique<UnsetProxyConfigService>();

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_url__request_url__request__context.cc (-2 / +2 lines)
1	--- net/url_request/url_request_context.cc.orig 2019-10-30 16:19:57 UTC	1	--- net/url_request/url_request_context.cc.orig 2020-03-03 18:53:55 UTC
2	+++ net/url_request/url_request_context.cc	2	+++ net/url_request/url_request_context.cc
3	@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext::	3	@@ -90,7 +90,7 @@ const HttpNetworkSession::Context* URLRequestContext::
4	return &network_session->context();	4	return &network_session->context();
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_url__request_url__request__context.h (-2 / +2 lines)
1	--- net/url_request/url_request_context.h.orig 2019-10-30 16:20:11 UTC	1	--- net/url_request/url_request_context.h.orig 2020-03-03 18:53:55 UTC
2	+++ net/url_request/url_request_context.h	2	+++ net/url_request/url_request_context.h
3	@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext	3	@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext
4	// session.	4	// session.
5	const HttpNetworkSession::Context* GetNetworkSessionContext() const;	5	const HttpNetworkSession::Context* GetNetworkSessionContext() const;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_url__request_url__request__context__builder.cc (-3 / +3 lines)
1	--- net/url_request/url_request_context_builder.cc.orig 2019-12-16 21:51:27 UTC	1	--- net/url_request/url_request_context_builder.cc.orig 2020-03-03 18:53:55 UTC
2	+++ net/url_request/url_request_context_builder.cc	2	+++ net/url_request/url_request_context_builder.cc
3	@@ -496,7 +496,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu	3	@@ -508,7 +508,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
4	}	4	}
5		5
6	if (!proxy_resolution_service_) {	6	if (!proxy_resolution_service_) {
Lines 9-15 Link Here
9	// TODO(willchan): Switch to using this code when	9	// TODO(willchan): Switch to using this code when
10	// ProxyResolutionService::CreateSystemProxyConfigService()'s signature	10	// ProxyResolutionService::CreateSystemProxyConfigService()'s signature
11	// doesn't suck.	11	// doesn't suck.
12	@@ -505,7 +505,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu	12	@@ -517,7 +517,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
13	ProxyResolutionService::CreateSystemProxyConfigService(	13	ProxyResolutionService::CreateSystemProxyConfigService(
14	base::ThreadTaskRunnerHandle::Get().get());	14	base::ThreadTaskRunnerHandle::Get().get());
15	}	15	}




--- 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"

   // PreviewModeClient does not know its pp::Instance.
   SetLastInstance(client_->GetPluginInstance());
 #endif
@@ -878,7 +878,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
 
   KillFormFocus();
 

   SetLastInstance(client_->GetPluginInstance());
 #endif
 
@@ -2832,7 +2832,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
   DCHECK(image_data);
 
   last_progressive_start_time_ = base::Time::Now();

   SetLastInstance(client_->GetPluginInstance());
 #endif
 
@@ -3326,7 +3326,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
     FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
   }
   most_visible_page_ = index;




--- 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
@@ -29,12 +29,12 @@
 #include "remoting/host/switches.h"
 #include "remoting/host/usage_stats_consent.h"
 
-#if defined(OS_LINUX)

+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
 
   remoting::LoadResources("");
 

   // Required in order for us to run multiple X11 threads.
   XInitThreads();
 
@@ -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();




--- remoting/host/remoting_me2me_host.cc.orig	2020-03-03 18:53:55 UTC
+++ remoting/host/remoting_me2me_host.cc
@@ -118,13 +118,13 @@
 #include "remoting/host/mac/permission_utils.h"
 #endif  // defined(OS_MACOSX)
 

 
 #if defined(OS_WIN)
 #include <commctrl.h>
@@ -159,11 +159,11 @@ const char kApplicationName[] = "chromoting";
 const char kStdinConfigPath[] = "-";
 #endif  // !defined(REMOTING_MULTI_PROCESS)
 

 
 #if defined(OS_POSIX)
 // The command line switch used to pass name of the unix domain socket used to
@@ -356,7 +356,7 @@ class HostProcess : public ConfigWatcher::Delegate,
 
   std::unique_ptr<ChromotingHostContext> context_;
 

   // Watch for certificate changes and kill the host when changes occur
   std::unique_ptr<CertificateWatcher> cert_watcher_;
 #endif
@@ -586,10 +586,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
   enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
   if (enable_window_capture_) {
 

 
     // uint32_t is large enough to hold window IDs on all platforms.
     uint32_t window_id;
@@ -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());
 

     if (!cert_watcher_) {
       cert_watcher_.reset(new CertificateWatcher(
           base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode),
@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() {
       base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
       base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));
 

   // 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()->
@@ -879,7 +879,7 @@ void HostProcess::StartOnUiThread() {
     remoting::AudioCapturerLinux::InitializePipeReader(
         context_->audio_task_runner(), audio_pipe_name);
   }

 
 #if defined(OS_POSIX)
   base::FilePath security_key_socket_name =
@@ -934,7 +934,7 @@ void HostProcess::ShutdownOnUiThread() {
   // It is now safe for the HostProcess to be deleted.
   self_ = nullptr;
 

   // 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.
@@ -1538,7 +1538,7 @@ void HostProcess::StartHost() {
   host_->AddExtension(std::make_unique<TestEchoExtension>());
 
   // TODO(simonmorris): Get the maximum session duration from a policy.

   host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
 #endif
 
@@ -1708,7 +1708,7 @@ void HostProcess::OnCrash(const std::string& function_
 int HostProcessMain() {
   HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-remoting_resources_remoting__strings.grd (-3 / +3 lines)
1	--- remoting/resources/remoting_strings.grd.orig 2019-12-16 21:51:27 UTC	1	--- remoting/resources/remoting_strings.grd.orig 2020-03-03 18:53:55 UTC
2	+++ remoting/resources/remoting_strings.grd	2	+++ remoting/resources/remoting_strings.grd
3	@@ -1366,7 +1366,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.	3	@@ -1393,7 +1393,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
4	Open Screen Recording Preferences	4	Open Screen Recording Preferences
5	</message>	5	</message>
6	</if>	6	</if>
Lines 9-15 Link Here
9	<message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">	9	<message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
10	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.)	10	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.)
11	</message>	11	</message>
12	@@ -1382,7 +1382,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.	12	@@ -1409,7 +1409,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
13	<message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">	13	<message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
14	Launch the default XSession	14	Launch the default XSession
15	</message>	15	</message>




--- remoting/webapp/base/js/platform.js.orig	2019-03-11 22:01:01 UTC
+++ remoting/webapp/base/js/platform.js
@@ -107,6 +107,14 @@ remoting.getSystemInfo = function() {
     return result;
   }
 
+  match = new RegExp('FreeBSD ([a-zA-Z0-9_]*)').exec(userAgent);
+  if (match && (match.length >= 2)) {
+    result.osName = remoting.Os.LINUX;
+    result.osVersion = '';
+    result.cpu = match[1];
+    return result;
+  }
+
   match = new RegExp('([a-zA-Z]*) Mac OS X ([0-9_]*)').exec(userAgent);
   if (match && (match.length >= 3)) {
     result.osName = remoting.Os.MAC;

Lines 1-4 Link Here

(-)www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc (-2 / +2 lines)
1	--- sandbox/linux/services/libc_interceptor.cc.orig 2019-03-11 22:01:01 UTC	1	--- sandbox/linux/services/libc_interceptor.cc.orig 2020-03-03 18:53:55 UTC
2	+++ sandbox/linux/services/libc_interceptor.cc	2	+++ sandbox/linux/services/libc_interceptor.cc
3	@@ -11,7 +11,9 @@	3	@@ -11,7 +11,9 @@
4	#include <stddef.h>	4	#include <stddef.h>
Lines 10-16 Link Here
10	#include <sys/socket.h>	10	#include <sys/socket.h>
11	#include <sys/types.h>	11	#include <sys/types.h>
12	#include <time.h>	12	#include <time.h>
13	@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,	13	@@ -93,7 +95,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
14	} else {	14	} else {
15	base::AutoLock lock(g_timezones_lock.Get());	15	base::AutoLock lock(g_timezones_lock.Get());
16	auto ret_pair = g_timezones.Get().insert(timezone);	16	auto ret_pair = g_timezones.Get().insert(timezone);

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (-2 / +2 lines)
1	--- services/device/geolocation/location_arbitrator.cc.orig 2019-12-16 21:51:27 UTC	1	--- services/device/geolocation/location_arbitrator.cc.orig 2020-03-03 18:53:55 UTC
2	+++ services/device/geolocation/location_arbitrator.cc	2	+++ services/device/geolocation/location_arbitrator.cc
3	@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider(	3	@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider(
4		4
5	std::unique_ptr<LocationProvider>	5	std::unique_ptr<LocationProvider>
6	LocationArbitrator::NewSystemLocationProvider() {	6	LocationArbitrator::NewSystemLocationProvider() {




--- services/device/time_zone_monitor/time_zone_monitor.cc.orig	2019-12-16 21:51:27 UTC
+++ services/device/time_zone_monitor/time_zone_monitor.cc
@@ -30,7 +30,7 @@ void TimeZoneMonitor::Bind(
 
 void TimeZoneMonitor::NotifyClients() {
   DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(IS_CHROMECAST))
+#if defined(OS_CHROMEOS) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(IS_CHROMECAST))
   // On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No
   // need to redetect it with detectHostTimeZone().
   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
@@ -42,7 +42,7 @@ void TimeZoneMonitor::NotifyClients() {
 #else
   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
 #endif
-#if defined(OS_LINUX) && !defined(IS_CHROMECAST)
+#if (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
   // We get here multiple times on Linux per a single tz change, but
   // want to update the ICU default zone and notify renderer only once.
   std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc (-2 / +2 lines)
1	--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-03-11 22:01:01 UTC	1	--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-03-03 18:53:55 UTC
2	+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc	2	+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
3	@@ -104,7 +104,11 @@ class TimeZoneMonitorLinuxImpl	3	@@ -126,7 +126,11 @@ class TimeZoneMonitorLinuxImpl
4	// false positives are harmless, assuming the false positive rate is	4	// false positives are harmless, assuming the false positive rate is
5	// reasonable.	5	// reasonable.
6	const char* const kFilesToWatch[] = {	6	const char* const kFilesToWatch[] = {

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_network_BUILD.gn (-2 / +2 lines)
1	--- services/network/BUILD.gn.orig 2019-12-16 21:51:27 UTC	1	--- services/network/BUILD.gn.orig 2020-03-03 18:53:56 UTC
2	+++ services/network/BUILD.gn	2	+++ services/network/BUILD.gn
3	@@ -259,7 +259,6 @@ jumbo_component("network_service") {	3	@@ -256,7 +256,6 @@ jumbo_component("network_service") {
4		4
5	if (is_linux) {	5	if (is_linux) {
6	deps += [	6	deps += [

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_network_network__context.cc (-2 / +2 lines)
1	--- services/network/network_context.cc.orig 2019-12-16 21:51:27 UTC	1	--- services/network/network_context.cc.orig 2020-03-03 18:53:56 UTC
2	+++ services/network/network_context.cc	2	+++ services/network/network_context.cc
3	@@ -1638,7 +1638,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC	3	@@ -1738,7 +1738,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC
4		4
5	net::CookieCryptoDelegate* crypto_delegate = nullptr;	5	net::CookieCryptoDelegate* crypto_delegate = nullptr;
6	if (params_->enable_encrypted_cookies) {	6	if (params_->enable_encrypted_cookies) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_network_network__service.cc (-3 / +3 lines)
1	--- services/network/network_service.cc.orig 2019-12-16 21:51:27 UTC	1	--- services/network/network_service.cc.orig 2020-03-03 18:53:56 UTC
2	+++ services/network/network_service.cc	2	+++ services/network/network_service.cc
3	@@ -62,7 +62,7 @@	3	@@ -61,7 +61,7 @@
4	#include "third_party/boringssl/src/include/openssl/cpu.h"	4	#include "third_party/boringssl/src/include/openssl/cpu.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	#include "components/os_crypt/key_storage_config_linux.h"	9	#include "components/os_crypt/key_storage_config_linux.h"
10	#endif	10	#endif
11		11
12	@@ -572,7 +572,7 @@ void NetworkService::OnCertDBChanged() {	12	@@ -613,7 +613,7 @@ void NetworkService::OnCertDBChanged() {
13	net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();	13	net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
14	}	14	}
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_network_network__service.h (-3 / +3 lines)
1	--- services/network/network_service.h.orig 2019-12-16 21:51:27 UTC	1	--- services/network/network_service.h.orig 2020-03-03 18:53:56 UTC
2	+++ services/network/network_service.h	2	+++ services/network/network_service.h
3	@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService	3	@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
4	mojom::NetworkService::GetNetworkListCallback callback) override;	4	mojom::NetworkService::GetNetworkListCallback callback) override;
5	void UpdateCRLSet(base::span<const uint8_t> crl_set) override;	5	void UpdateCRLSet(base::span<const uint8_t> crl_set) override;
6	void OnCertDBChanged() override;	6	void OnCertDBChanged() override;
Lines 8-11 Link Here
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)	8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override;	9	void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override;
10	#endif	10	#endif
11	#if defined(OS_MACOSX) && !defined(OS_IOS)	11	#if defined(OS_WIN) \|\| (defined(OS_MACOSX) && !defined(OS_IOS))




--- 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>

 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -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) {

   DCHECK(setuid_sandbox);
   DCHECK(setuid_sandbox->IsSuidSandboxChild());
 
@@ -131,6 +134,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli
 
   CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers());
   return true;

 }
 
 static void DropAllCapabilities(int proc_fd) {
@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(service_manager::Sand
 
 bool ZygoteMain(
     std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {

   sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
 
   auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
@@ -238,6 +245,9 @@ bool ZygoteMain(
 
   // This function call can return multiple times, once per fork().
   return zygote.ProcessRequests();

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc (-2 / +2 lines)
1	--- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2019-12-17 19:52:52 UTC	1	--- services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2020-03-03 18:53:56 UTC
2	+++ services/tracing/public/cpp/perfetto/trace_event_data_source.cc	2	+++ services/tracing/public/cpp/perfetto/trace_event_data_source.cc
3	@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata	3	@@ -101,7 +101,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata
4	#endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD)	4	#endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_angle_BUILD.gn (-3 / +3 lines)
1	--- third_party/angle/BUILD.gn.orig 2019-12-16 21:56:11 UTC	1	--- third_party/angle/BUILD.gn.orig 2020-03-03 18:55:22 UTC
2	+++ third_party/angle/BUILD.gn	2	+++ third_party/angle/BUILD.gn
3	@@ -371,6 +371,7 @@ angle_static_library("angle_gpu_info_util") {	3	@@ -389,6 +389,7 @@ angle_static_library("angle_gpu_info_util") {
4	"X11",	4	"X11",
5	"Xi",	5	"Xi",
6	"Xext",	6	"Xext",
Lines 8-14 Link Here
8	]	8	]
9	}	9	}
10	}	10	}
11	@@ -1055,10 +1056,6 @@ foreach(is_shared_library,	11	@@ -1107,10 +1108,6 @@ foreach(is_shared_library,
12		12
13	if (is_linux) {	13	if (is_linux) {
14	sources += util_linux_sources	14	sources += util_linux_sources




--- third_party/angle/src/libANGLE/Display.cpp.orig	2020-03-03 18:55:22 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
             {
                 impl = rx::CreateVulkanWin32Display(state);
             }
-#    elif defined(ANGLE_PLATFORM_LINUX)
+#    elif defined(ANGLE_PLATFORM_POSIX)
             if (rx::IsVulkanXcbDisplayAvailable())
             {
                 impl = rx::CreateVulkanXcbDisplay(state);
@@ -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);

Line 0 Link Here

(-)www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h (+11 lines)
	1	--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-03-03 18:55:22 UTC
	2	+++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
	3	@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable();
	4	DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
	5	#endif // defined(ANGLE_PLATFORM_WINDOWS)
	6
	7	-#if defined(ANGLE_PLATFORM_LINUX)
	8	+#if defined(ANGLE_PLATFORM_POSIX)
	9	bool IsVulkanXcbDisplayAvailable();
	10	DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
	11	#endif // defined(ANGLE_PLATFORM_LINUX)

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (-2 / +2 lines)
1	--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-12-16 21:56:20 UTC	1	--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-03-03 18:55:32 UTC
2	+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c	2	+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
3	@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d	3	@@ -238,7 +238,7 @@ void *loader_device_heap_realloc(const struct loader_d
4	}	4	}
5		5
6	// Environment variables	6	// Environment variables

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc (-2 / +2 lines)
1	--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-09-09 21:55:24 UTC	1	--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-03-03 18:53:56 UTC
2	+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc	2	+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
3	@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin	3	@@ -41,7 +41,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
4	base::TimeDelta::FromMicroseconds(100);	4	base::TimeDelta::FromMicroseconds(100);
5		5
6	/* The value is based on user statistics on Nov 2017. */	6	/* The value is based on user statistics on Nov 2017. */

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc (-2 / +2 lines)
1	--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-10-21 19:06:43 UTC	1	--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-03-03 18:53:56 UTC
2	+++ third_party/blink/renderer/core/paint/paint_layer.cc	2	+++ third_party/blink/renderer/core/paint/paint_layer.cc
3	@@ -104,7 +104,7 @@ namespace {	3	@@ -105,7 +105,7 @@ namespace {
4	static CompositingQueryMode g_compositing_query_mode =	4	static CompositingQueryMode g_compositing_query_mode =
5	kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;	5	kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc (-3 / +3 lines)
1	--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-12-16 21:51:28 UTC	1	--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-03 18:53:56 UTC
2	+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc	2	+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
3	@@ -152,7 +152,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const	3	@@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const
4	// Disable snapback on desktop Linux to better integrate with the desktop	4	// Disable snapback on desktop Linux to better integrate with the desktop
5	// behavior. Typically, Linux apps do not implement scrollbar snapback (this	5	// behavior. Typically, Linux apps do not implement scrollbar snapback (this
6	// is true for at least GTK and QT apps).	6	// is true for at least GTK and QT apps).
Lines 9-15 Link Here
9	return false;	9	return false;
10	#endif	10	#endif
11		11
12	@@ -335,7 +335,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT	12	@@ -312,7 +312,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT
13		13
14	bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,	14	bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
15	const WebMouseEvent& event) {	15	const WebMouseEvent& event) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc (-3 / +3 lines)
1	--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-09-09 21:55:26 UTC	1	--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-03-03 18:53:14 UTC
2	+++ third_party/blink/renderer/platform/fonts/font_cache.cc	2	+++ third_party/blink/renderer/platform/fonts/font_cache.cc
3	@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";	3	@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
4		4
Lines 13-20 Link Here
13	FontPlatformData* FontCache::SystemFontPlatformData(	13	FontPlatformData* FontCache::SystemFontPlatformData(
14	const FontDescription& font_description) {	14	const FontDescription& font_description) {
15	const AtomicString& family = FontCache::SystemFontFamily();	15	const AtomicString& family = FontCache::SystemFontFamily();
16	-#if defined(OS_LINUX)	16	-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	17	+#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
18	if (family.IsEmpty() \|\| family == font_family_names::kSystemUi)	18	if (family.IsEmpty() \|\| family == font_family_names::kSystemUi)
19	return nullptr;	19	return nullptr;
20	#else	20	#else




--- 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
@@ -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>);
 

   // These are needed for calling QueryRenderStyleForStrike, since
   // gfx::GetFontRenderParams makes distinctions based on DSF.
   static float DeviceScaleFactor() { return device_scale_factor_; }
@@ -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)
   static bool GetFontForCharacter(UChar32,
     String name;
     std::string filename;
@@ -249,7 +249,7 @@ class PLATFORM_EXPORT FontCache {
   static void GetFontForCharacter(UChar32,
                                   const char* preferred_locale,
                                   gfx::FallbackFontData*);
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
       const FontPlatformData*,
@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
                                    const FontFaceCreationParams&,
                                    std::string& name);
 

 
   scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
       const FontDescription&,
@@ -356,7 +356,7 @@ class PLATFORM_EXPORT FontCache {
   std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
 #endif  // defined(OS_WIN)
 

Lines 1-8 Link Here

(-)www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni (-3 / +3 lines)
1	--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2019-03-11 22:01:15 UTC	1	--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-03-03 18:54:05 UTC
2	+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni	2	+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
3	@@ -38,7 +38,7 @@ crashpad_is_standalone = crashpad_dependencies == "sta	3	@@ -38,7 +38,7 @@ if (crashpad_is_in_chromium) {
4	if (crashpad_is_in_chromium) {
5	crashpad_is_mac = is_mac	4	crashpad_is_mac = is_mac
		5	crashpad_is_ios = is_ios
6	crashpad_is_win = is_win	6	crashpad_is_win = is_win
7	- crashpad_is_linux = is_linux	7	- crashpad_is_linux = is_linux
8	+ crashpad_is_linux = is_linux && !is_bsd	8	+ crashpad_is_linux = is_linux && !is_bsd




--- 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 */

Lines 1-8 Link Here

(-)www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (-3 / +3 lines)
1	--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC	1	--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-03 18:55:28 UTC
2	+++ third_party/perfetto/src/base/unix_socket.cc	2	+++ third_party/perfetto/src/base/unix_socket.cc
3	@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n	3	@@ -593,7 +593,8 @@ void UnixSocket::ReadPeerCredentials() {
		4	return;
4		5
5	void UnixSocket::ReadPeerCredentials() {
6	#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \	6	#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
7	- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)	7	- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
8	+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) \|\| \	8	+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) \|\| \

Lines 1-7 Link Here

(-)www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (-4 / +4 lines)
1	--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-10-21 19:09:15 UTC	1	--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-03-03 18:55:28 UTC
2	+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc	2	+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
3	@@ -2180,7 +2180,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr	3	@@ -2193,7 +2193,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
4	protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();	4	auto* clock_snapshot = packet->set_clock_snapshot();
5		5
6	#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \	6	#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
7	- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)	7	- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
Lines 9-12 Link Here
9	+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)	9	+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
10	struct {	10	struct {
11	clockid_t id;	11	clockid_t id;
12	protos::ClockSnapshot::Clock::BuiltinClocks type;	12	protos::pbzero::ClockSnapshot::Clock::BuiltinClocks type;

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp (-2 / +2 lines)
1	--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2019-03-11 22:08:28 UTC	1	--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-03-03 18:55:29 UTC
2	+++ third_party/skia/src/ports/SkOSFile_stdio.cpp	2	+++ third_party/skia/src/ports/SkOSFile_stdio.cpp
3	@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) {	3	@@ -132,7 +132,7 @@ void sk_fflush(FILE* f) {
4		4
5	void sk_fsync(FILE* f) {	5	void sk_fsync(FILE* f) {
6	#if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \	6	#if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_swiftshader_BUILD.gn (-3 / +3 lines)
1	--- third_party/swiftshader/BUILD.gn.orig 2019-12-16 21:56:18 UTC	1	--- third_party/swiftshader/BUILD.gn.orig 2020-03-03 18:55:29 UTC
2	+++ third_party/swiftshader/BUILD.gn	2	+++ third_party/swiftshader/BUILD.gn
3	@@ -142,9 +142,6 @@ config("swiftshader_config") {	3	@@ -135,9 +135,6 @@ config("swiftshader_config") {
4	ldflags = [ "-Wl,--gc-sections" ]	4	ldflags = [ "-Wl,--gc-sections" ]
5		5
6	if (target_cpu == "mipsel") {	6	if (target_cpu == "mipsel") {
Lines 10-16 Link Here
10	if (mips_arch_variant == "r1") {	10	if (mips_arch_variant == "r1") {
11	ldflags += [	11	ldflags += [
12	"-mips32",	12	"-mips32",
13	@@ -156,11 +153,8 @@ config("swiftshader_config") {	13	@@ -149,11 +146,8 @@ config("swiftshader_config") {
14	}	14	}
15	} else if (target_cpu == "mips64el") {	15	} else if (target_cpu == "mips64el") {
16	ldflags += [	16	ldflags += [




--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2020-03-03 18:55:29 UTC
+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
@@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType
 		// FIXME: Check if display_id is the default display
 	}
 

 		#if defined(USE_X11)
 		if(!libX11)
 		#endif  // Non X11 linux is headless only
@@ -216,7 +216,7 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EG
 	{
 		return success(
 			"EGL_KHR_client_get_all_proc_addresses "

 			"EGL_KHR_platform_gbm "
 #endif
 #if defined(USE_X11)
@@ -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);
 




--- 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

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_webrtc_BUILD.gn (-2 / +2 lines)
1	--- third_party/webrtc/BUILD.gn.orig 2019-09-09 21:57:03 UTC	1	--- third_party/webrtc/BUILD.gn.orig 2020-03-03 18:55:30 UTC
2	+++ third_party/webrtc/BUILD.gn	2	+++ third_party/webrtc/BUILD.gn
3	@@ -160,6 +160,9 @@ config("common_inherited_config") {	3	@@ -170,6 +170,9 @@ config("common_inherited_config") {
4	if (is_linux) {	4	if (is_linux) {
5	defines += [ "WEBRTC_LINUX" ]	5	defines += [ "WEBRTC_LINUX" ]
6	}	6	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py (-2 / +2 lines)
1	--- tools/json_schema_compiler/feature_compiler.py.orig 2019-12-16 21:51:33 UTC	1	--- tools/json_schema_compiler/feature_compiler.py.orig 2020-03-03 18:54:06 UTC
2	+++ tools/json_schema_compiler/feature_compiler.py	2	+++ tools/json_schema_compiler/feature_compiler.py
3	@@ -217,6 +217,7 @@ FEATURE_GRAMMAR = (	3	@@ -218,6 +218,7 @@ FEATURE_GRAMMAR = (
4	'enum_map': {	4	'enum_map': {
5	'chromeos': 'Feature::CHROMEOS_PLATFORM',	5	'chromeos': 'Feature::CHROMEOS_PLATFORM',
6	'linux': 'Feature::LINUX_PLATFORM',	6	'linux': 'Feature::LINUX_PLATFORM',

Lines 1-6 Link Here

(-)www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn (-2 / +2 lines)
1	--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-06-04 18:55:49 UTC	1	--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-03-03 18:54:06 UTC
2	+++ tools/perf/chrome_telemetry_build/BUILD.gn	2	+++ tools/perf/chrome_telemetry_build/BUILD.gn
3	@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {	3	@@ -44,7 +44,7 @@ group("telemetry_chrome_test") {
4	data_deps += [ "//chrome:reorder_imports" ]	4	data_deps += [ "//chrome:reorder_imports" ]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_resource_resource__bundle.cc (-3 / +3 lines)
1	--- ui/base/resource/resource_bundle.cc.orig 2019-12-16 21:51:33 UTC	1	--- ui/base/resource/resource_bundle.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/base/resource/resource_bundle.cc	2	+++ ui/base/resource/resource_bundle.cc
3	@@ -818,7 +818,7 @@ void ResourceBundle::ReloadFonts() {	3	@@ -819,7 +819,7 @@ void ResourceBundle::ReloadFonts() {
4	}	4	}
5		5
6	ScaleFactor ResourceBundle::GetMaxScaleFactor() const {	6	ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
Lines 9-15 Link Here
9	return max_scale_factor_;	9	return max_scale_factor_;
10	#else	10	#else
11	return GetSupportedScaleFactors().back();	11	return GetSupportedScaleFactors().back();
12	@@ -871,7 +871,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele	12	@@ -872,7 +872,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
13	// On platforms other than iOS, 100P is always a supported scale factor.	13	// On platforms other than iOS, 100P is always a supported scale factor.
14	// For Windows we have a separate case in this function.	14	// For Windows we have a separate case in this function.
15	supported_scale_factors.push_back(SCALE_FACTOR_100P);	15	supported_scale_factors.push_back(SCALE_FACTOR_100P);

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_ui__base__features.cc (-3 / +3 lines)
1	--- ui/base/ui_base_features.cc.orig 2019-12-16 21:51:33 UTC	1	--- ui/base/ui_base_features.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/base/ui_base_features.cc	2	+++ ui/base/ui_base_features.cc
3	@@ -117,7 +117,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo	3	@@ -122,7 +122,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
4	"EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};	4	"EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
5	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)	5	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)
6		6
Lines 9-15 Link Here
9	// Enables stylus appearing as touch when in contact with digitizer.	9	// Enables stylus appearing as touch when in contact with digitizer.
10	const base::Feature kDirectManipulationStylus = {	10	const base::Feature kDirectManipulationStylus = {
11	"DirectManipulationStylus",	11	"DirectManipulationStylus",
12	@@ -127,7 +127,7 @@ const base::Feature kDirectManipulationStylus = {	12	@@ -132,7 +132,7 @@ const base::Feature kDirectManipulationStylus = {
13	base::FEATURE_DISABLED_BY_DEFAULT	13	base::FEATURE_DISABLED_BY_DEFAULT
14	#endif	14	#endif
15	};	15	};

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_ui__base__features.h (-2 / +2 lines)
1	--- ui/base/ui_base_features.h.orig 2019-12-16 21:51:33 UTC	1	--- ui/base/ui_base_features.h.orig 2020-03-03 18:54:06 UTC
2	+++ ui/base/ui_base_features.h	2	+++ ui/base/ui_base_features.h
3	@@ -63,10 +63,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)	3	@@ -65,10 +65,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
4	extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;	4	extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
5	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)	5	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_webui_web__ui__util.cc (-2 / +2 lines)
1	--- ui/base/webui/web_ui_util.cc.orig 2019-12-16 21:51:33 UTC	1	--- ui/base/webui/web_ui_util.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/base/webui/web_ui_util.cc	2	+++ ui/base/webui/web_ui_util.cc
3	@@ -227,7 +227,7 @@ std::string GetFontFamily() {	3	@@ -237,7 +237,7 @@ std::string GetFontFamily() {
4		4
5	// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced	5	// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
6	// into Ozone: crbug.com/320050	6	// into Ozone: crbug.com/320050




--- 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
@@ -16,6 +16,7 @@
 #include "base/environment.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/command_line.h"
+#include "base/environment.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
+#include "base/system/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
@@ -43,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/x/x11_switches.h"
 
 namespace ui {
 
@@ -39,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
     1.0f / (kShmResizeThreshold * kShmResizeThreshold);
 
 std::size_t MaxShmSegmentSizeImpl() {

 }
 
 std::size_t MaxShmSegmentSize() {
@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
         shmctl(state.shminfo_.shmid, IPC_RMID, 0);
         return false;
       }

       // 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.
@@ -182,7 +187,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
       if (!XShmAttach(display_, &state.shminfo_))
         return false;
       state.shmem_attached_to_server_ = true;

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_compositor_compositor.cc (-2 / +2 lines)
1	--- ui/compositor/compositor.cc.orig 2019-12-17 19:57:24 UTC	1	--- ui/compositor/compositor.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/compositor/compositor.cc	2	+++ ui/compositor/compositor.cc
3	@@ -681,7 +681,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to	3	@@ -677,7 +677,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
4	NOTREACHED();	4	NOTREACHED();
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_compositor_compositor.h (-2 / +2 lines)
1	--- ui/compositor/compositor.h.orig 2019-12-17 19:57:38 UTC	1	--- ui/compositor/compositor.h.orig 2020-03-03 18:54:06 UTC
2	+++ ui/compositor/compositor.h	2	+++ ui/compositor/compositor.h
3	@@ -412,7 +412,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT	3	@@ -417,7 +417,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
4	void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;	4	void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
5	void OnFrameTokenChanged(uint32_t frame_token) override;	5	void OnFrameTokenChanged(uint32_t frame_token) override;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc (-2 / +2 lines)
1	--- ui/compositor/host/host_context_factory_private.cc.orig 2019-12-17 19:57:59 UTC	1	--- ui/compositor/host/host_context_factory_private.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/compositor/host/host_context_factory_private.cc	2	+++ ui/compositor/host/host_context_factory_private.cc
3	@@ -31,7 +31,7 @@ namespace {	3	@@ -30,7 +30,7 @@ namespace {
4		4
5	static const char* kBrowser = "Browser";	5	static const char* kBrowser = "Browser";
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_BUILD.gn (-2 / +2 lines)
1	--- ui/gfx/BUILD.gn.orig 2019-10-21 19:07:29 UTC	1	--- ui/gfx/BUILD.gn.orig 2020-03-03 18:54:06 UTC
2	+++ ui/gfx/BUILD.gn	2	+++ ui/gfx/BUILD.gn
3	@@ -573,7 +573,7 @@ jumbo_source_set("memory_buffer_sources") {	3	@@ -597,7 +597,7 @@ jumbo_source_set("memory_buffer_sources") {
4	deps += [ "//build/config/linux/libdrm" ]	4	deps += [ "//build/config/linux/libdrm" ]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_canvas__skia.cc (-2 / +2 lines)
1	--- ui/gfx/canvas_skia.cc.orig 2019-03-11 22:01:19 UTC	1	--- ui/gfx/canvas_skia.cc.orig 2020-03-03 18:53:32 UTC
2	+++ ui/gfx/canvas_skia.cc	2	+++ ui/gfx/canvas_skia.cc
3	@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin	3	@@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
4	Range range = StripAcceleratorChars(flags, &adjusted_text);	4	Range range = StripAcceleratorChars(flags, &adjusted_text);
5	bool elide_text = ((flags & NO_ELLIPSIS) == 0);	5	bool elide_text = ((flags & NO_ELLIPSIS) == 0);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h (-3 / +3 lines)
1	--- ui/gfx/gpu_memory_buffer.h.orig 2019-12-16 21:51:34 UTC	1	--- ui/gfx/gpu_memory_buffer.h.orig 2020-03-03 18:54:06 UTC
2	+++ ui/gfx/gpu_memory_buffer.h	2	+++ ui/gfx/gpu_memory_buffer.h
3	@@ -16,7 +16,7 @@	3	@@ -15,7 +15,7 @@
4	#include "ui/gfx/geometry/rect.h"	4	#include "ui/gfx/geometry/rect.h"
5	#include "ui/gfx/gfx_export.h"	5	#include "ui/gfx/gfx_export.h"
6		6
Lines 9-15 Link Here
9	#include "ui/gfx/native_pixmap_handle.h"	9	#include "ui/gfx/native_pixmap_handle.h"
10	#elif defined(OS_MACOSX) && !defined(OS_IOS)	10	#elif defined(OS_MACOSX) && !defined(OS_IOS)
11	#include "ui/gfx/mac/io_surface.h"	11	#include "ui/gfx/mac/io_surface.h"
12	@@ -66,7 +66,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {	12	@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
13	base::UnsafeSharedMemoryRegion region;	13	base::UnsafeSharedMemoryRegion region;
14	uint32_t offset;	14	uint32_t offset;
15	int32_t stride;	15	int32_t stride;




--- ui/gfx/native_pixmap_handle.cc.orig	2020-03-03 18:53:32 UTC
+++ ui/gfx/native_pixmap_handle.cc
@@ -8,11 +8,15 @@
 
 #include "build/build_config.h"
 

 #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)

 static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID,
               "gfx::NativePixmapHandle::kNoModifier should be an alias for"
               "DRM_FORMAT_MOD_INVALID");
@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
 NativePixmapPlane::NativePixmapPlane(int stride,
                                      int offset,
                                      uint64_t size

                                      ,
                                      base::ScopedFD fd
 #elif defined(OS_FUCHSIA)
@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
     : stride(stride),
       offset(offset),
       size(size)

       ,
       fd(std::move(fd))
 #elif defined(OS_FUCHSIA)
@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
 NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
   NativePixmapHandle clone;
   for (auto& plane : handle.planes) {

     DCHECK(plane.fd.is_valid());
     base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
     if (!fd_dup.is_valid()) {
@@ -96,7 +100,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
 #endif
   }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_render__text.cc (-2 / +2 lines)
1	--- ui/gfx/render_text.cc.orig 2019-09-09 21:55:46 UTC	1	--- ui/gfx/render_text.cc.orig 2020-03-03 18:54:06 UTC
2	+++ ui/gfx/render_text.cc	2	+++ ui/gfx/render_text.cc
3	@@ -983,32 +983,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse	3	@@ -1147,32 +1147,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
4	const int extra_content = GetContentWidth() - display_rect_.width();	4	const int extra_content = GetContentWidth() - display_rect_.width();
5	const int cursor_width = cursor_enabled_ ? 1 : 0;	5	const int cursor_width = cursor_enabled_ ? 1 : 0;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gl_BUILD.gn (-2 / +2 lines)
1	--- ui/gl/BUILD.gn.orig 2019-12-16 21:51:34 UTC	1	--- ui/gl/BUILD.gn.orig 2020-03-03 18:54:06 UTC
2	+++ ui/gl/BUILD.gn	2	+++ ui/gl/BUILD.gn
3	@@ -221,7 +221,7 @@ jumbo_component("gl") {	3	@@ -232,7 +232,7 @@ jumbo_component("gl") {
4	]	4	]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gl_generate__bindings.py (-2 / +2 lines)
1	--- ui/gl/generate_bindings.py.orig 2019-12-16 21:51:34 UTC	1	--- ui/gl/generate_bindings.py.orig 2020-03-03 18:54:06 UTC
2	+++ ui/gl/generate_bindings.py	2	+++ ui/gl/generate_bindings.py
3	@@ -2738,6 +2738,9 @@ GLX_FUNCTIONS = [	3	@@ -2766,6 +2766,9 @@ GLX_FUNCTIONS = [
4	'arguments':	4	'arguments':
5	'Display* dpy, GLXDrawable drawable, int32_t* numerator, '	5	'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
6	'int32_t* denominator' },	6	'int32_t* denominator' },




--- 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() {
 

 void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
                                        GLXDrawable drawable,
                                        unsigned long* mask) {
@@ -647,6 +658,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
   return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
 }
 

 void TraceGLXApi::glXGetSelectedEventFn(Display* dpy,
                                         GLXDrawable drawable,
                                         unsigned long* mask) {
@@ -1068,6 +1084,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy,
                  << static_cast<const void*>(denominator) << ")");
   bool result =
       glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);

+  return result;
+}
+
+__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
+  GL_SERVICE_LOG("glXGetProcAddressARB"
+                 << "(" << static_cast<const void*>(procName) << ")");
+  __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);




--- ui/gl/gl_surface_glx.cc.orig	2019-12-16 21:51:34 UTC
+++ ui/gl/gl_surface_glx.cc
@@ -459,7 +459,10 @@ bool GLSurfaceGLX::InitializeOneOff() {
     return false;
   }
 
-  const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual();
+  const auto& visual_info = 
+    ui::IsCompositingManagerPresent()
+      ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual()
+      : gl::GLVisualPickerGLX::GetInstance()->system_visual();
   g_visual = visual_info.visual;
   g_depth = visual_info.depth;
   g_colormap =

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_native__theme_native__theme__base.cc (-2 / +2 lines)
1	--- ui/native_theme/native_theme_base.cc.orig 2019-12-16 21:51:34 UTC	1	--- ui/native_theme/native_theme_base.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/native_theme/native_theme_base.cc	2	+++ ui/native_theme/native_theme_base.cc
3	@@ -212,7 +212,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,	3	@@ -230,7 +230,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
4	case kCheckbox:	4	case kCheckbox:
5	PaintCheckbox(canvas, state, rect, extra.button, color_scheme);	5	PaintCheckbox(canvas, state, rect, extra.button, color_scheme);
6	break;	6	break;




--- ui/platform_window/platform_window_delegate.h.orig	2019-10-30 16:37:03 UTC
+++ ui/platform_window/platform_window_delegate.h
@@ -9,7 +9,7 @@
 
 // By default, PlatformWindowDelegateBase is used. However, different platforms
 // should specify what delegate they would like to use if needed.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "ui/platform_window/platform_window_delegate_linux.h"
 #else
 #include "ui/platform_window/platform_window_delegate_base.h"
@@ -17,7 +17,7 @@
 
 namespace ui {
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 using PlatformWindowDelegate = PlatformWindowDelegateLinux;
 #else
 using PlatformWindowDelegate = PlatformWindowDelegateBase;




--- ui/platform_window/platform_window_init_properties.h.orig	2020-03-03 18:54:07 UTC
+++ ui/platform_window/platform_window_init_properties.h
@@ -41,7 +41,7 @@ enum class PlatformWindowOpacity {
   bool remove_standard_frame = false;
   std::string workspace;
 
 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)
   bool prefer_dark_theme = false;
   gfx::ImageSkia* icon = nullptr;
   base::Optional<int> background_color;

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (-2 / +2 lines)
1	--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-10-21 19:07:29 UTC	1	--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/bubble/bubble_dialog_delegate_view.cc	2	+++ ui/views/bubble/bubble_dialog_delegate_view.cc
3	@@ -135,7 +135,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(	3	@@ -134,7 +134,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
4	bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());	4	bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
5	Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);	5	Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_controls_label.cc (-3 / +3 lines)
1	--- ui/views/controls/label.cc.orig 2019-12-16 21:51:34 UTC	1	--- ui/views/controls/label.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/controls/label.cc	2	+++ ui/views/controls/label.cc
3	@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event	3	@@ -695,7 +695,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
4	GetFocusManager()->SetFocusedView(this);	4	GetFocusManager()->SetFocusedView(this);
5	}	5	}
6		6
Lines 9-15 Link Here
9	if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)	9	if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
10	GetFocusManager()->SetFocusedView(this);	10	GetFocusManager()->SetFocusedView(this);
11	#endif	11	#endif
12	@@ -874,7 +874,7 @@ bool Label::PasteSelectionClipboard() {	12	@@ -880,7 +880,7 @@ bool Label::PasteSelectionClipboard() {
13	}	13	}
14		14
15	void Label::UpdateSelectionClipboard() {	15	void Label::UpdateSelectionClipboard() {

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (-2 / +2 lines)
1	--- ui/views/controls/textfield/textfield.cc.orig 2019-10-21 19:07:29 UTC	1	--- ui/views/controls/textfield/textfield.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/controls/textfield/textfield.cc	2	+++ ui/views/controls/textfield/textfield.cc
3	@@ -60,7 +60,7 @@	3	@@ -60,7 +60,7 @@
4	#include "base/win/win_util.h"	4	#include "base/win/win_util.h"
Lines 62-68 Link Here
62	// Skip any accelerator handling that conflicts with custom keybindings.	62	// Skip any accelerator handling that conflicts with custom keybindings.
63	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =	63	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
64	ui::GetTextEditKeyBindingsDelegate();	64	ui::GetTextEditKeyBindingsDelegate();
65	@@ -2170,7 +2170,7 @@ bool Textfield::PasteSelectionClipboard() {	65	@@ -2173,7 +2173,7 @@ bool Textfield::PasteSelectionClipboard() {
66	}	66	}
67		67
68	void Textfield::UpdateSelectionClipboard() {	68	void Textfield::UpdateSelectionClipboard() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_examples_widget__example.cc (-2 / +2 lines)
1	--- ui/views/examples/widget_example.cc.orig 2019-09-09 21:55:47 UTC	1	--- ui/views/examples/widget_example.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/examples/widget_example.cc	2	+++ ui/views/examples/widget_example.cc
3	@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container)	3	@@ -70,7 +70,7 @@ void WidgetExample::CreateExampleView(View* container)
4	BuildButton(container, "Popup widget", POPUP);	4	BuildButton(container, "Popup widget", POPUP);
5	BuildButton(container, "Dialog widget", DIALOG);	5	BuildButton(container, "Dialog widget", DIALOG);
6	BuildButton(container, "Modal Dialog", MODAL_DIALOG);	6	BuildButton(container, "Modal Dialog", MODAL_DIALOG);




--- ui/views/style/platform_style.cc.orig	2020-03-03 18:54:07 UTC
+++ ui/views/style/platform_style.cc
@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const
 
 #endif  // OS_MACOSX
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #define DESKTOP_LINUX
 #endif
 
-#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) {

Lines 1-11 Link Here

(-)www/chromium/files/patch-ui_views_views__delegate.cc (-3 / +3 lines)
1	--- ui/views/views_delegate.cc.orig 2019-03-11 22:01:19 UTC	1	--- ui/views/views_delegate.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/views_delegate.cc	2	+++ ui/views/views_delegate.cc
3	@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {	3	@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {	4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
5	return false;	5	return false;
6	}	6	}
7	-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_FREEBSD)	8	+#elif (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {	9	gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
10	return nullptr;	10	return nullptr;
11	}	11	}

Lines 1-11 Link Here

(-)www/chromium/files/patch-ui_views_views__delegate.h (-4 / +4 lines)
1	--- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC	1	--- ui/views/views_delegate.h.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/views_delegate.h	2	+++ ui/views/views_delegate.h
3	@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate {	3	@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate {
4	// Returns true if the window passed in is in the Windows 8 metro	4	// Returns true if the window passed in is in the Windows 8 metro
5	// environment.	5	// environment.
6	virtual bool IsWindowInMetro(gfx::NativeWindow window) const;	6	virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
7	-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) \|\| defined(OS_FREEBSD)	8	+#elif (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	virtual gfx::ImageSkia* GetDefaultWindowIcon() const;	9	virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
10	#endif	10	#endif
11		11

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc (-2 / +2 lines)
1	--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-12-16 21:51:34 UTC	1	--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc	2	+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
3	@@ -732,7 +732,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP	3	@@ -751,7 +751,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
4	// DesktopWindowTreeHost:	4	// DesktopWindowTreeHost:
5		5
6	// Linux subclasses this host and adds some Linux specific bits.	6	// Linux subclasses this host and adds some Linux specific bits.




--- ui/views/widget/native_widget_aura.cc.orig	2020-03-03 18:54:07 UTC
+++ ui/views/widget/native_widget_aura.cc
@@ -64,7 +64,7 @@
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 #endif
 
-#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_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 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 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 =

Lines 1-11 Link Here

(-)www/chromium/files/patch-ui_views_window_dialog__delegate.cc (-4 / +4 lines)
1	--- ui/views/window/dialog_delegate.cc.orig 2019-12-16 21:51:34 UTC	1	--- ui/views/window/dialog_delegate.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/window/dialog_delegate.cc	2	+++ ui/views/window/dialog_delegate.cc
3	@@ -58,7 +58,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg	3	@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
4		4
5	// static	5	// static
6	bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {	6	bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)	8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	// The new style doesn't support unparented dialogs on Linux desktop.	9	// The new style doesn't support unparented dialogs on Linux desktop.
10	return parent != nullptr;	10	return parent != nullptr;
11	#elif defined(OS_WIN)	11	#elif defined(OS_WIN)

Lines 1-11 Link Here

(-)www/chromium/files/patch-ui_views_window_frame__background.cc (-4 / +4 lines)
1	--- ui/views/window/frame_background.cc.orig 2019-06-04 18:55:50 UTC	1	--- ui/views/window/frame_background.cc.orig 2020-03-03 18:54:07 UTC
2	+++ ui/views/window/frame_background.cc	2	+++ ui/views/window/frame_background.cc
3	@@ -106,7 +106,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv	3	@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
4	const View* view) const {	4	const View* view) const {
5	// Fill the top with the frame color first so we have a constant background	5	// Fill the top with the frame color first so we have a constant background
6	// for areas not covered by the theme image.	6	// for areas not covered by the theme image.
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)	8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	auto* native_theme = view->GetNativeTheme();	9	auto* native_theme = view->GetNativeTheme();
10	ui::NativeTheme::ExtraParams params;	10	ui::NativeTheme::ExtraParams params;
11	params.frame_top_area.use_custom_frame = use_custom_frame_;	11	params.frame_top_area.use_custom_frame = use_custom_frame_;




--- v8/BUILD.gn.orig	2020-03-03 18:55:34 UTC
+++ v8/BUILD.gn
@@ -3561,7 +3561,7 @@ v8_component("v8_libbase") {
     }
   }
 

     sources += [
       "src/base/debug/stack_trace_posix.cc",
       "src/base/platform/platform-linux.cc",
@@ -3581,6 +3581,12 @@ v8_component("v8_libbase") {
       "dl",
       "rt",
     ]

   } else if (is_android) {
     if (current_toolchain == host_toolchain) {
       libs = [
@@ -3840,6 +3846,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
       "src/snapshot/embedded/platform-embedded-file-writer-win.h",
       "src/snapshot/mksnapshot.cc",
       "src/snapshot/snapshot-empty.cc",
     ]
+    libs = ["execinfo"]
 




--- 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))




--- v8/src/api/api.cc.orig	2020-03-03 18:55:34 UTC
+++ v8/src/api/api.cc
@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() {
 #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() {
   return true;
 }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-v8_src_base_platform_platform-posix.cc (-3 / +3 lines)
1	--- v8/src/base/platform/platform-posix.cc.orig 2019-12-16 21:56:22 UTC	1	--- v8/src/base/platform/platform-posix.cc.orig 2020-03-03 18:55:34 UTC
2	+++ v8/src/base/platform/platform-posix.cc	2	+++ v8/src/base/platform/platform-posix.cc
3	@@ -383,7 +383,7 @@ bool OS::DiscardSystemPages(void* address, size_t size	3	@@ -427,7 +427,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
4		4
5	// static	5	// static
6	bool OS::HasLazyCommits() {	6	bool OS::HasLazyCommits() {
Lines 9-15 Link Here
9	return true;	9	return true;
10	#else	10	#else
11	// TODO(bbudge) Return true for all POSIX platforms.	11	// TODO(bbudge) Return true for all POSIX platforms.
12	@@ -514,6 +514,12 @@ int OS::GetCurrentThreadId() {	12	@@ -558,6 +558,12 @@ int OS::GetCurrentThreadId() {
13	return static_cast<int>(syscall(__NR_gettid));	13	return static_cast<int>(syscall(__NR_gettid));
14	#elif V8_OS_ANDROID	14	#elif V8_OS_ANDROID
15	return static_cast<int>(gettid());	15	return static_cast<int>(gettid());




--- v8/src/trap-handler/handler-inside-posix.cc.orig	2019-03-11 22:08:08 UTC
+++ v8/src/trap-handler/handler-inside-posix.cc
@@ -27,7 +27,7 @@
 
 #include <signal.h>
 
-#ifdef V8_OS_LINUX
+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
 #include <ucontext.h>
 #elif V8_OS_MACOSX
 #include <sys/ucontext.h>
@@ -112,6 +112,8 @@ bool TryHandleSignal(int signum, siginfo_t* info, void
     auto* context_rip = &uc->uc_mcontext.gregs[REG_RIP];
 #elif V8_OS_MACOSX
     auto* context_rip = &uc->uc_mcontext->__ss.__rip;
+#elif V8_OS_FREEBSD
+    auto* context_rip = &uc->uc_mcontext.mc_rip;
 #else
 #error Unsupported platform
 #endif

Lines 1-11 Link Here

(-)www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h (-11 lines)
1	--- v8/src/trap-handler/handler-inside-posix.h.orig 2019-03-11 22:08:08 UTC
2	+++ v8/src/trap-handler/handler-inside-posix.h
3	@@ -12,7 +12,7 @@ namespace v8 {
4	namespace internal {
5	namespace trap_handler {
6
7	-#if V8_OS_LINUX
8	+#if defined(V8_OS_LINUX) \|\| defined(V8_OS_FREEBSD)
9	constexpr int kOobSignal = SIGSEGV;
10	#elif V8_OS_MACOSX
11	constexpr int kOobSignal = SIGBUS;

Lines 1-11 Link Here

(-)www/chromium/files/patch-v8_src_trap-handler_trap-handler.h (-11 lines)
1	--- v8/src/trap-handler/trap-handler.h.orig 2019-03-11 22:08:08 UTC
2	+++ v8/src/trap-handler/trap-handler.h
3	@@ -23,6 +23,8 @@ namespace trap_handler {
4	#define V8_TRAP_HANDLER_SUPPORTED true
5	#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
6	#define V8_TRAP_HANDLER_SUPPORTED true
7	+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
8	+#define V8_TRAP_HANDLER_SUPPORTED true
9	#else
10	#define V8_TRAP_HANDLER_SUPPORTED false
11	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc (-3 / +3 lines)
1	--- weblayer/browser/browser_main_parts_impl.cc.orig 2019-12-16 21:51:34 UTC	1	--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-03-03 18:54:07 UTC
2	+++ weblayer/browser/browser_main_parts_impl.cc	2	+++ weblayer/browser/browser_main_parts_impl.cc
3	@@ -37,7 +37,7 @@	3	@@ -39,7 +39,7 @@
4	#if defined(USE_AURA) && defined(USE_X11)	4	#if defined(USE_AURA) && defined(USE_X11)
5	#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck	5	#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
6	#endif	6	#endif
Lines 9-15 Link Here
9	#include "ui/base/ime/init/input_method_initializer.h"	9	#include "ui/base/ime/init/input_method_initializer.h"
10	#endif	10	#endif
11		11
12	@@ -84,7 +84,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {	12	@@ -90,7 +90,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
13	#if defined(USE_X11)	13	#if defined(USE_X11)
14	ui::SetDefaultX11ErrorHandlers();	14	ui::SetDefaultX11ErrorHandlers();
15	#endif	15	#endif




--- weblayer/browser/content_browser_client_impl.cc.orig	2020-03-03 18:54:07 UTC
+++ weblayer/browser/content_browser_client_impl.cc
@@ -65,7 +65,7 @@
 #include "weblayer/browser/safe_browsing/safe_browsing_service.h"
 #endif
 

 #include "content/public/common/content_descriptors.h"
 #endif
 
@@ -232,7 +232,7 @@ ContentBrowserClientImpl::CreateNetworkContext(
 
 void ContentBrowserClientImpl::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {

   network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New();
   content::GetNetworkService()->SetCryptConfig(std::move(config));
 #endif
@@ -371,7 +371,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
 }
 #endif
 

 void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
@@ -405,7 +405,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile
     mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
 #endif  // defined(OS_ANDROID)
 }

Lines 1-4 Link Here

(-)www/chromium/pkg-plist (-35 / +314 lines)
1	bin/chrome	1	bin/chrome
		2	%%DRIVER%%bin/chromedriver
		3	libdata/ldconfig/chromium
		4	man/man1/chrome.1.gz
		5	share/applications/chromium-browser.desktop
2	%%DATADIR%%/chrome	6	%%DATADIR%%/chrome
3	%%DATADIR%%/chrome-wrapper	7	%%DATADIR%%/chrome-wrapper
4	%%DATADIR%%/chrome_100_percent.pak	8	%%DATADIR%%/chrome_100_percent.pak
Lines 8-13 Link Here
8	%%DATADIR%%/libEGL.so	12	%%DATADIR%%/libEGL.so
9	%%DATADIR%%/libGLESv2.so	13	%%DATADIR%%/libGLESv2.so
10	%%DATADIR%%/libVkICD_mock_icd.so	14	%%DATADIR%%/libVkICD_mock_icd.so
		15	%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
11	%%DATADIR%%/locales/am.pak	16	%%DATADIR%%/locales/am.pak
12	%%DATADIR%%/locales/am.pak.info	17	%%DATADIR%%/locales/am.pak.info
13	%%DATADIR%%/locales/ar.pak	18	%%DATADIR%%/locales/ar.pak
Lines 115-121 Link Here
115	%%DATADIR%%/locales/zh-TW.pak	120	%%DATADIR%%/locales/zh-TW.pak
116	%%DATADIR%%/locales/zh-TW.pak.info	121	%%DATADIR%%/locales/zh-TW.pak.info
117	%%DATADIR%%/mksnapshot	122	%%DATADIR%%/mksnapshot
118	%%DATADIR%%/natives_blob.bin
119	%%DATADIR%%/product_logo_48.png	123	%%DATADIR%%/product_logo_48.png
120	%%DATADIR%%/protoc	124	%%DATADIR%%/protoc
121	%%DATADIR%%/resources.pak	125	%%DATADIR%%/resources.pak
Lines 139-144 Link Here
139	%%DATADIR%%/resources/inspector/Images/chromeRight.png	143	%%DATADIR%%/resources/inspector/Images/chromeRight.png
140	%%DATADIR%%/resources/inspector/Images/chromeSelect.png	144	%%DATADIR%%/resources/inspector/Images/chromeSelect.png
141	%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png	145	%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
		146	%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png
142	%%DATADIR%%/resources/inspector/Images/errorWave.svg	147	%%DATADIR%%/resources/inspector/Images/errorWave.svg
143	%%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg	148	%%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
144	%%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg	149	%%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg
Lines 176-189 Link Here
176	%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg	181	%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg
177	%%DATADIR%%/resources/inspector/Images/whatsnew.png	182	%%DATADIR%%/resources/inspector/Images/whatsnew.png
178	%%DATADIR%%/resources/inspector/InspectorBackendCommands.js	183	%%DATADIR%%/resources/inspector/InspectorBackendCommands.js
		184	%%DATADIR%%/resources/inspector/Runtime.js
179	%%DATADIR%%/resources/inspector/SupportedCSSProperties.js	185	%%DATADIR%%/resources/inspector/SupportedCSSProperties.js
180	%%DATADIR%%/resources/inspector/Tests.js	186	%%DATADIR%%/resources/inspector/Tests.js
		187	%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js
		188	%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js
181	%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js	189	%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js
		190	%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js
		191	%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js
		192	%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js
		193	%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js
		194	%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js
		195	%%DATADIR%%/resources/inspector/accessibility/accessibility.js
182	%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js	196	%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
183	%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js	197	%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
		198	%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js
		199	%%DATADIR%%/resources/inspector/animation/AnimationModel.js
		200	%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js
		201	%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js
		202	%%DATADIR%%/resources/inspector/animation/AnimationUI.js
		203	%%DATADIR%%/resources/inspector/animation/animation.js
184	%%DATADIR%%/resources/inspector/animation/animation_module.js	204	%%DATADIR%%/resources/inspector/animation/animation_module.js
185	%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js	205	%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
		206	%%DATADIR%%/resources/inspector/audits/AuditsController.js
		207	%%DATADIR%%/resources/inspector/audits/AuditsPanel.js
		208	%%DATADIR%%/resources/inspector/audits/AuditsProtocolService.js
		209	%%DATADIR%%/resources/inspector/audits/AuditsReportRenderer.js
		210	%%DATADIR%%/resources/inspector/audits/AuditsReportSelector.js
		211	%%DATADIR%%/resources/inspector/audits/AuditsStartView.js
		212	%%DATADIR%%/resources/inspector/audits/AuditsStatusView.js
		213	%%DATADIR%%/resources/inspector/audits/RadioSetting.js
		214	%%DATADIR%%/resources/inspector/audits/audits.js
186	%%DATADIR%%/resources/inspector/audits/audits_module.js	215	%%DATADIR%%/resources/inspector/audits/audits_module.js
		216	%%DATADIR%%/resources/inspector/audits/lighthouse/report-generator.js
		217	%%DATADIR%%/resources/inspector/audits/lighthouse/report.js
187	%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js	218	%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js
188	%%DATADIR%%/resources/inspector/audits_worker.js	219	%%DATADIR%%/resources/inspector/audits_worker.js
189	%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js	220	%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js
Lines 236-248 Link Here
236	%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json	267	%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json
237	%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json	268	%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json
238	%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js	269	%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js
239	%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
240	%%DATADIR%%/resources/inspector/bindings/bindings.js
241	%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js	270	%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js
242	%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js	271	%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js
		272	%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
243	%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js	273	%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js
244	%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js	274	%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js
245	%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
246	%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js	275	%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js
247	%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js	276	%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js
248	%%DATADIR%%/resources/inspector/bindings/FileUtils.js	277	%%DATADIR%%/resources/inspector/bindings/FileUtils.js
Lines 255-272 Link Here
255	%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js	284	%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js
256	%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js	285	%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js
257	%%DATADIR%%/resources/inspector/bindings/TempFile.js	286	%%DATADIR%%/resources/inspector/bindings/TempFile.js
		287	%%DATADIR%%/resources/inspector/bindings/bindings.js
		288	%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
		289	%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js
		290	%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js
		291	%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js
		292	%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js
		293	%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js
258	%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js	294	%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
		295	%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js
259	%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js	296	%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js
260	%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js	297	%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js
		298	%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js
		299	%%DATADIR%%/resources/inspector/changes/ChangesView.js
		300	%%DATADIR%%/resources/inspector/changes/changes.js
261	%%DATADIR%%/resources/inspector/changes/changes_module.js	301	%%DATADIR%%/resources/inspector/changes/changes_module.js
		302	%%DATADIR%%/resources/inspector/cm/active-line.js
		303	%%DATADIR%%/resources/inspector/cm/brace-fold.js
		304	%%DATADIR%%/resources/inspector/cm/closebrackets.js
		305	%%DATADIR%%/resources/inspector/cm/cm.js
262	%%DATADIR%%/resources/inspector/cm/cm_module.js	306	%%DATADIR%%/resources/inspector/cm/cm_module.js
		307	%%DATADIR%%/resources/inspector/cm/codemirror.js
		308	%%DATADIR%%/resources/inspector/cm/comment.js
		309	%%DATADIR%%/resources/inspector/cm/foldcode.js
		310	%%DATADIR%%/resources/inspector/cm/foldgutter.js
		311	%%DATADIR%%/resources/inspector/cm/mark-selection.js
		312	%%DATADIR%%/resources/inspector/cm/matchbrackets.js
		313	%%DATADIR%%/resources/inspector/cm/multiplex.js
		314	%%DATADIR%%/resources/inspector/cm/overlay.js
		315	%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js
		316	%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js
		317	%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js
		318	%%DATADIR%%/resources/inspector/cm_modes/clike.js
		319	%%DATADIR%%/resources/inspector/cm_modes/clojure.js
		320	%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js
263	%%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js	321	%%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
		322	%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js
		323	%%DATADIR%%/resources/inspector/cm_modes/jsx.js
		324	%%DATADIR%%/resources/inspector/cm_modes/livescript.js
		325	%%DATADIR%%/resources/inspector/cm_modes/markdown.js
		326	%%DATADIR%%/resources/inspector/cm_modes/php.js
		327	%%DATADIR%%/resources/inspector/cm_modes/python.js
		328	%%DATADIR%%/resources/inspector/cm_modes/shell.js
		329	%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js
		330	%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js
		331	%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js
		332	%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_module.js
		333	%%DATADIR%%/resources/inspector/cm_web_modes/css.js
		334	%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js
		335	%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js
		336	%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js
		337	%%DATADIR%%/resources/inspector/cm_web_modes/xml.js
		338	%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js
		339	%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js
		340	%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js
		341	%%DATADIR%%/resources/inspector/color_picker/Spectrum.js
		342	%%DATADIR%%/resources/inspector/color_picker/color_picker.js
264	%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js	343	%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
265	%%DATADIR%%/resources/inspector/common/App.js	344	%%DATADIR%%/resources/inspector/common/App.js
266	%%DATADIR%%/resources/inspector/common/AppProvider.js	345	%%DATADIR%%/resources/inspector/common/AppProvider.js
267	%%DATADIR%%/resources/inspector/common/CharacterIdMap.js	346	%%DATADIR%%/resources/inspector/common/CharacterIdMap.js
268	%%DATADIR%%/resources/inspector/common/Color.js	347	%%DATADIR%%/resources/inspector/common/Color.js
269	%%DATADIR%%/resources/inspector/common/common.js
270	%%DATADIR%%/resources/inspector/common/Console.js	348	%%DATADIR%%/resources/inspector/common/Console.js
271	%%DATADIR%%/resources/inspector/common/ContentProvider.js	349	%%DATADIR%%/resources/inspector/common/ContentProvider.js
272	%%DATADIR%%/resources/inspector/common/EventTarget.js	350	%%DATADIR%%/resources/inspector/common/EventTarget.js
Lines 288-294 Link Here
288	%%DATADIR%%/resources/inspector/common/Trie.js	366	%%DATADIR%%/resources/inspector/common/Trie.js
289	%%DATADIR%%/resources/inspector/common/UIString.js	367	%%DATADIR%%/resources/inspector/common/UIString.js
290	%%DATADIR%%/resources/inspector/common/Worker.js	368	%%DATADIR%%/resources/inspector/common/Worker.js
291	%%DATADIR%%/resources/inspector/components/components.js	369	%%DATADIR%%/resources/inspector/common/common-legacy.js
		370	%%DATADIR%%/resources/inspector/common/common.js
292	%%DATADIR%%/resources/inspector/components/DockController.js	371	%%DATADIR%%/resources/inspector/components/DockController.js
293	%%DATADIR%%/resources/inspector/components/ImagePreview.js	372	%%DATADIR%%/resources/inspector/components/ImagePreview.js
294	%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js	373	%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js
Lines 295-310 Link Here
295	%%DATADIR%%/resources/inspector/components/Linkifier.js	374	%%DATADIR%%/resources/inspector/components/Linkifier.js
296	%%DATADIR%%/resources/inspector/components/Reload.js	375	%%DATADIR%%/resources/inspector/components/Reload.js
297	%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js	376	%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js
		377	%%DATADIR%%/resources/inspector/components/components.js
		378	%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js
		379	%%DATADIR%%/resources/inspector/console/ConsoleFilter.js
		380	%%DATADIR%%/resources/inspector/console/ConsolePanel.js
		381	%%DATADIR%%/resources/inspector/console/ConsolePinPane.js
		382	%%DATADIR%%/resources/inspector/console/ConsolePrompt.js
		383	%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js
		384	%%DATADIR%%/resources/inspector/console/ConsoleView.js
		385	%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js
		386	%%DATADIR%%/resources/inspector/console/ConsoleViewport.js
		387	%%DATADIR%%/resources/inspector/console/console.js
		388	%%DATADIR%%/resources/inspector/console/console_module.js
		389	%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
298	%%DATADIR%%/resources/inspector/console_counters/console_counters.js	390	%%DATADIR%%/resources/inspector/console_counters/console_counters.js
299	%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
300	%%DATADIR%%/resources/inspector/console/console_module.js
301	%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js	391	%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js
		392	%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js
		393	%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js
302	%%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js	394	%%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
		395	%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js
		396	%%DATADIR%%/resources/inspector/coverage/CoverageListView.js
		397	%%DATADIR%%/resources/inspector/coverage/CoverageModel.js
		398	%%DATADIR%%/resources/inspector/coverage/CoverageView.js
		399	%%DATADIR%%/resources/inspector/coverage/coverage.js
303	%%DATADIR%%/resources/inspector/coverage/coverage_module.js	400	%%DATADIR%%/resources/inspector/coverage/coverage_module.js
304	%%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js	401	%%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
305	%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js	402	%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
		403	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js
		404	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js
		405	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js
		406	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js
		407	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js
		408	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js
		409	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js
		410	%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js
		411	%%DATADIR%%/resources/inspector/css_overview/css_overview.js
306	%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js	412	%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js
307	%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js	413	%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js
		414	%%DATADIR%%/resources/inspector/data_grid/DataGrid.js
		415	%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js
		416	%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js
		417	%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js
		418	%%DATADIR%%/resources/inspector/data_grid/data_grid.js
308	%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js	419	%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
309	%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js	420	%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
310	%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js	421	%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
Lines 313-320 Link Here
313	%%DATADIR%%/resources/inspector/devtools_app.js	424	%%DATADIR%%/resources/inspector/devtools_app.js
314	%%DATADIR%%/resources/inspector/devtools_compatibility.js	425	%%DATADIR%%/resources/inspector/devtools_compatibility.js
315	%%DATADIR%%/resources/inspector/devtools_extension_api.js	426	%%DATADIR%%/resources/inspector/devtools_extension_api.js
		427	%%DATADIR%%/resources/inspector/diff/DiffWrapper.js
		428	%%DATADIR%%/resources/inspector/diff/diff.js
		429	%%DATADIR%%/resources/inspector/diff/diff_match_patch.js
316	%%DATADIR%%/resources/inspector/diff/diff_module.js	430	%%DATADIR%%/resources/inspector/diff/diff_module.js
317	%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js	431	%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js
		432	%%DATADIR%%/resources/inspector/dom_extension/dom_extension.js
		433	%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js
		434	%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js
		435	%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js
		436	%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js
		437	%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js
		438	%%DATADIR%%/resources/inspector/elements/DOMPath.js
		439	%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js
		440	%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js
		441	%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
		442	%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js
		443	%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js
		444	%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js
		445	%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js
		446	%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js
		447	%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js
		448	%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js
		449	%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js
		450	%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js
		451	%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js
		452	%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js
		453	%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js
		454	%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js
		455	%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js
		456	%%DATADIR%%/resources/inspector/elements/elements.js
318	%%DATADIR%%/resources/inspector/elements/elements_module.js	457	%%DATADIR%%/resources/inspector/elements/elements_module.js
319	%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js	458	%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js
320	%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg	459	%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg
Lines 354-394 Link Here
354	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg	493	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg
355	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg	494	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
356	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg	495	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
		496	%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js
		497	%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js
		498	%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js
357	%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js	499	%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
358	%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
359	%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js	500	%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js
360	%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js	501	%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js
361	%%DATADIR%%/resources/inspector/extensions/extensions.js
362	%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js	502	%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js
363	%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js	503	%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js
364	%%DATADIR%%/resources/inspector/extensions/ExtensionView.js	504	%%DATADIR%%/resources/inspector/extensions/ExtensionView.js
		505	%%DATADIR%%/resources/inspector/extensions/extensions.js
		506	%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
		507	%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js
		508	%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js
		509	%%DATADIR%%/resources/inspector/formatter/formatter.js
365	%%DATADIR%%/resources/inspector/formatter/formatter_module.js	510	%%DATADIR%%/resources/inspector/formatter/formatter_module.js
366	%%DATADIR%%/resources/inspector/formatter_worker.js	511	%%DATADIR%%/resources/inspector/formatter_worker.js
		512	%%DATADIR%%/resources/inspector/formatter_worker.unbundled.js
		513	%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js
		514	%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js
		515	%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js
		516	%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js
		517	%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js
		518	%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js
		519	%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js
		520	%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js
		521	%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js
		522	%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js
		523	%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js
		524	%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js
		525	%%DATADIR%%/resources/inspector/har_importer/HARFormat.js
		526	%%DATADIR%%/resources/inspector/har_importer/HARImporter.js
		527	%%DATADIR%%/resources/inspector/har_importer/har_importer.js
367	%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js	528	%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js
368	%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js	529	%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js
		530	%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js
		531	%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js
369	%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js	532	%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
370	%%DATADIR%%/resources/inspector/heap_snapshot_worker.js	533	%%DATADIR%%/resources/inspector/heap_snapshot_worker.js
		534	%%DATADIR%%/resources/inspector/heap_snapshot_worker.unbundled.js
		535	%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js
		536	%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js
		537	%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js
		538	%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js
		539	%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js
		540	%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js
371	%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js	541	%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
		542	%%DATADIR%%/resources/inspector/help/HelpImpl.js
		543	%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js
		544	%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js
		545	%%DATADIR%%/resources/inspector/help/help.js
372	%%DATADIR%%/resources/inspector/help/help_module.js	546	%%DATADIR%%/resources/inspector/help/help_module.js
373	%%DATADIR%%/resources/inspector/host/host.js
374	%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js	547	%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js
375	%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js	548	%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js
376	%%DATADIR%%/resources/inspector/host/Platform.js	549	%%DATADIR%%/resources/inspector/host/Platform.js
377	%%DATADIR%%/resources/inspector/host/ResourceLoader.js	550	%%DATADIR%%/resources/inspector/host/ResourceLoader.js
378	%%DATADIR%%/resources/inspector/host/UserMetrics.js	551	%%DATADIR%%/resources/inspector/host/UserMetrics.js
		552	%%DATADIR%%/resources/inspector/host/host.js
		553	%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js
		554	%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js
		555	%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js
		556	%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js
		557	%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js
		558	%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js
		559	%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js
379	%%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js	560	%%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
380	%%DATADIR%%/resources/inspector/inspector.html	561	%%DATADIR%%/resources/inspector/inspector.html
381	%%DATADIR%%/resources/inspector/inspector.js	562	%%DATADIR%%/resources/inspector/inspector.js
		563	%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js
		564	%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js
		565	%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js
382	%%DATADIR%%/resources/inspector/integration_test_runner.html	566	%%DATADIR%%/resources/inspector/integration_test_runner.html
383	%%DATADIR%%/resources/inspector/integration_test_runner.js	567	%%DATADIR%%/resources/inspector/integration_test_runner.js
		568	%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js
		569	%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js
		570	%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js
384	%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js	571	%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js
385	%%DATADIR%%/resources/inspector/js_app.html	572	%%DATADIR%%/resources/inspector/js_app.html
386	%%DATADIR%%/resources/inspector/js_app.js	573	%%DATADIR%%/resources/inspector/js_app.js
		574	%%DATADIR%%/resources/inspector/js_main/JsMain.js
		575	%%DATADIR%%/resources/inspector/js_main/js_main.js
387	%%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js	576	%%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
		577	%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js
		578	%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js
		579	%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js
		580	%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js
		581	%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js
		582	%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js
		583	%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js
388	%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js	584	%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
		585	%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js
		586	%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js
		587	%%DATADIR%%/resources/inspector/layers/LayersPanel.js
		588	%%DATADIR%%/resources/inspector/layers/layers.js
389	%%DATADIR%%/resources/inspector/layers/layers_module.js	589	%%DATADIR%%/resources/inspector/layers/layers_module.js
390	%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js	590	%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
391	%%DATADIR%%/resources/inspector/media/media_module.js	591	%%DATADIR%%/resources/inspector/media/media_module.js
		592	%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js
		593	%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js
		594	%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js
		595	%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js
		596	%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js
		597	%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js
		598	%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js
392	%%DATADIR%%/resources/inspector/ndb_app.html	599	%%DATADIR%%/resources/inspector/ndb_app.html
393	%%DATADIR%%/resources/inspector/ndb_app.js	600	%%DATADIR%%/resources/inspector/ndb_app.js
394	%%DATADIR%%/resources/inspector/network/network_module.js	601	%%DATADIR%%/resources/inspector/network/network_module.js
Lines 396-403 Link Here
396	%%DATADIR%%/resources/inspector/node_app.html	603	%%DATADIR%%/resources/inspector/node_app.html
397	%%DATADIR%%/resources/inspector/node_app.js	604	%%DATADIR%%/resources/inspector/node_app.js
398	%%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js	605	%%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
		606	%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js
		607	%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js
		608	%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js
		609	%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js
		610	%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js
		611	%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js
		612	%%DATADIR%%/resources/inspector/object_ui/object_ui.js
399	%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js	613	%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js
400	%%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js	614	%%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js
		615	%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js
		616	%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js
401	%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js	617	%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
402	%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js	618	%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
403	%%DATADIR%%/resources/inspector/persistence/Automapping.js	619	%%DATADIR%%/resources/inspector/persistence/Automapping.js
Lines 406-435 Link Here
406	%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js	622	%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js
407	%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js	623	%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js
408	%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js	624	%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js
409	%%DATADIR%%/resources/inspector/persistence/persistence.js
410	%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js	625	%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js
411	%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js	626	%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js
412	%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js	627	%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js
413	%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js	628	%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js
414	%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js	629	%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js
		630	%%DATADIR%%/resources/inspector/persistence/persistence.js
		631	%%DATADIR%%/resources/inspector/platform/platform.js
415	%%DATADIR%%/resources/inspector/platform/utilities.js	632	%%DATADIR%%/resources/inspector/platform/utilities.js
416	%%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js
417	%%DATADIR%%/resources/inspector/profiler/profiler_module.js	633	%%DATADIR%%/resources/inspector/profiler/profiler_module.js
418	%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
419	%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js	634	%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js
420	%%DATADIR%%/resources/inspector/protocol/NodeURL.js	635	%%DATADIR%%/resources/inspector/protocol/NodeURL.js
421	%%DATADIR%%/resources/inspector/protocol/protocol.js	636	%%DATADIR%%/resources/inspector/protocol/protocol.js
		637	%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js
		638	%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js
		639	%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
		640	%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js
		641	%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js
		642	%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js
		643	%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js
		644	%%DATADIR%%/resources/inspector/quick_open/quick_open.js
422	%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js	645	%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
423	%%DATADIR%%/resources/inspector/resources/resources_module.js	646	%%DATADIR%%/resources/inspector/resources/resources_module.js
424	%%DATADIR%%/resources/inspector/root.js	647	%%DATADIR%%/resources/inspector/root.js
425	%%DATADIR%%/resources/inspector/Runtime.js	648	%%DATADIR%%/resources/inspector/screencast/InputModel.js
426	%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js	649	%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js
427	%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js	650	%%DATADIR%%/resources/inspector/screencast/ScreencastView.js
428	%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js	651	%%DATADIR%%/resources/inspector/screencast/screencast.js
429	%%DATADIR%%/resources/inspector/sdk/Connections.js
430	%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
431	%%DATADIR%%/resources/inspector/sdk/CookieModel.js
432	%%DATADIR%%/resources/inspector/sdk/CookieParser.js
433	%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js	652	%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js
434	%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js	653	%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js
435	%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js	654	%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js
Lines 440-453 Link Here
440	%%DATADIR%%/resources/inspector/sdk/CSSRule.js	659	%%DATADIR%%/resources/inspector/sdk/CSSRule.js
441	%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js	660	%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js
442	%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js	661	%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js
443	%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js	662	%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
		663	%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
		664	%%DATADIR%%/resources/inspector/sdk/Connections.js
		665	%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
		666	%%DATADIR%%/resources/inspector/sdk/CookieModel.js
		667	%%DATADIR%%/resources/inspector/sdk/CookieParser.js
444	%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js	668	%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js
445	%%DATADIR%%/resources/inspector/sdk/DOMModel.js	669	%%DATADIR%%/resources/inspector/sdk/DOMModel.js
		670	%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js
446	%%DATADIR%%/resources/inspector/sdk/EmulationModel.js	671	%%DATADIR%%/resources/inspector/sdk/EmulationModel.js
447	%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js	672	%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js
448	%%DATADIR%%/resources/inspector/sdk/HARLog.js	673	%%DATADIR%%/resources/inspector/sdk/HARLog.js
449	%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js	674	%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js
450	%%DATADIR%%/resources/inspector/sdk/IsolateManager.js	675	%%DATADIR%%/resources/inspector/sdk/IsolateManager.js
		676	%%DATADIR%%/resources/inspector/sdk/IssuesModel.js
451	%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js	677	%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js
452	%%DATADIR%%/resources/inspector/sdk/LogModel.js	678	%%DATADIR%%/resources/inspector/sdk/LogModel.js
453	%%DATADIR%%/resources/inspector/sdk/NetworkLog.js	679	%%DATADIR%%/resources/inspector/sdk/NetworkLog.js
Lines 461-470 Link Here
461	%%DATADIR%%/resources/inspector/sdk/Resource.js	687	%%DATADIR%%/resources/inspector/sdk/Resource.js
462	%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js	688	%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js
463	%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js	689	%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js
		690	%%DATADIR%%/resources/inspector/sdk/SDKModel.js
464	%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js	691	%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js
465	%%DATADIR%%/resources/inspector/sdk/Script.js	692	%%DATADIR%%/resources/inspector/sdk/Script.js
466	%%DATADIR%%/resources/inspector/sdk/sdk.js
467	%%DATADIR%%/resources/inspector/sdk/SDKModel.js
468	%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js	693	%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js
469	%%DATADIR%%/resources/inspector/sdk/ServerTiming.js	694	%%DATADIR%%/resources/inspector/sdk/ServerTiming.js
470	%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js	695	%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js
Lines 475-500 Link Here
475	%%DATADIR%%/resources/inspector/sdk/TargetManager.js	700	%%DATADIR%%/resources/inspector/sdk/TargetManager.js
476	%%DATADIR%%/resources/inspector/sdk/TracingManager.js	701	%%DATADIR%%/resources/inspector/sdk/TracingManager.js
477	%%DATADIR%%/resources/inspector/sdk/TracingModel.js	702	%%DATADIR%%/resources/inspector/sdk/TracingModel.js
		703	%%DATADIR%%/resources/inspector/sdk/sdk.js
		704	%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js
		705	%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm
		706	%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
		707	%%DATADIR%%/resources/inspector/search/SearchConfig.js
		708	%%DATADIR%%/resources/inspector/search/SearchResultsPane.js
		709	%%DATADIR%%/resources/inspector/search/SearchView.js
		710	%%DATADIR%%/resources/inspector/search/search.js
478	%%DATADIR%%/resources/inspector/search/search_module.js	711	%%DATADIR%%/resources/inspector/search/search_module.js
		712	%%DATADIR%%/resources/inspector/security/SecurityModel.js
		713	%%DATADIR%%/resources/inspector/security/SecurityPanel.js
		714	%%DATADIR%%/resources/inspector/security/security.js
479	%%DATADIR%%/resources/inspector/security/security_module.js	715	%%DATADIR%%/resources/inspector/security/security_module.js
480	%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js	716	%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js
481	%%DATADIR%%/resources/inspector/services/ServiceManager.js	717	%%DATADIR%%/resources/inspector/services/ServiceManager.js
482	%%DATADIR%%/resources/inspector/services/services.js	718	%%DATADIR%%/resources/inspector/services/services.js
		719	%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js
		720	%%DATADIR%%/resources/inspector/settings/SettingsScreen.js
		721	%%DATADIR%%/resources/inspector/settings/settings.js
483	%%DATADIR%%/resources/inspector/settings/settings_module.js	722	%%DATADIR%%/resources/inspector/settings/settings_module.js
484	%%DATADIR%%/resources/inspector/shell.js	723	%%DATADIR%%/resources/inspector/shell.js
		724	%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js
		725	%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js
		726	%%DATADIR%%/resources/inspector/snippets/snippets.js
485	%%DATADIR%%/resources/inspector/snippets/snippets_module.js	727	%%DATADIR%%/resources/inspector/snippets/snippets_module.js
		728	%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js
		729	%%DATADIR%%/resources/inspector/source_frame/FontView.js
		730	%%DATADIR%%/resources/inspector/source_frame/ImageView.js
		731	%%DATADIR%%/resources/inspector/source_frame/JSONView.js
		732	%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js
		733	%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js
		734	%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js
		735	%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js
		736	%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js
		737	%%DATADIR%%/resources/inspector/source_frame/XMLView.js
		738	%%DATADIR%%/resources/inspector/source_frame/source_frame.js
486	%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js	739	%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js
487	%%DATADIR%%/resources/inspector/sources/sources_module.js	740	%%DATADIR%%/resources/inspector/sources/sources_module.js
488	%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js	741	%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js
		742	%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js
		743	%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js
		744	%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js
		745	%%DATADIR%%/resources/inspector/text_editor/text_editor.js
489	%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js	746	%%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
		747	%%DATADIR%%/resources/inspector/text_utils/Text.js
		748	%%DATADIR%%/resources/inspector/text_utils/TextRange.js
		749	%%DATADIR%%/resources/inspector/text_utils/TextUtils.js
		750	%%DATADIR%%/resources/inspector/text_utils/text_utils.js
		751	%%DATADIR%%/resources/inspector/timeline/timeline_module.js
		752	%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js
		753	%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js
		754	%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js
		755	%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js
		756	%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js
		757	%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js
		758	%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js
		759	%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js
490	%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js	760	%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
491	%%DATADIR%%/resources/inspector/timeline/timeline_module.js
492	%%DATADIR%%/resources/inspector/toolbox.html	761	%%DATADIR%%/resources/inspector/toolbox.html
493	%%DATADIR%%/resources/inspector/toolbox.js	762	%%DATADIR%%/resources/inspector/toolbox.js
		763	%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
494	%%DATADIR%%/resources/inspector/ui/Action.js	764	%%DATADIR%%/resources/inspector/ui/Action.js
495	%%DATADIR%%/resources/inspector/ui/ActionDelegate.js	765	%%DATADIR%%/resources/inspector/ui/ActionDelegate.js
496	%%DATADIR%%/resources/inspector/ui/ActionRegistry.js	766	%%DATADIR%%/resources/inspector/ui/ActionRegistry.js
497	%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
498	%%DATADIR%%/resources/inspector/ui/Context.js	767	%%DATADIR%%/resources/inspector/ui/Context.js
499	%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js	768	%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js
500	%%DATADIR%%/resources/inspector/ui/ContextMenu.js	769	%%DATADIR%%/resources/inspector/ui/ContextMenu.js
Lines 541-547 Link Here
541	%%DATADIR%%/resources/inspector/ui/Toolbar.js	810	%%DATADIR%%/resources/inspector/ui/Toolbar.js
542	%%DATADIR%%/resources/inspector/ui/Tooltip.js	811	%%DATADIR%%/resources/inspector/ui/Tooltip.js
543	%%DATADIR%%/resources/inspector/ui/Treeoutline.js	812	%%DATADIR%%/resources/inspector/ui/Treeoutline.js
544	%%DATADIR%%/resources/inspector/ui/ui.js
545	%%DATADIR%%/resources/inspector/ui/UIUtils.js	813	%%DATADIR%%/resources/inspector/ui/UIUtils.js
546	%%DATADIR%%/resources/inspector/ui/View.js	814	%%DATADIR%%/resources/inspector/ui/View.js
547	%%DATADIR%%/resources/inspector/ui/ViewManager.js	815	%%DATADIR%%/resources/inspector/ui/ViewManager.js
Lines 550-565 Link Here
550	%%DATADIR%%/resources/inspector/ui/XLink.js	818	%%DATADIR%%/resources/inspector/ui/XLink.js
551	%%DATADIR%%/resources/inspector/ui/XWidget.js	819	%%DATADIR%%/resources/inspector/ui/XWidget.js
552	%%DATADIR%%/resources/inspector/ui/ZoomManager.js	820	%%DATADIR%%/resources/inspector/ui/ZoomManager.js
		821	%%DATADIR%%/resources/inspector/ui/ui.js
		822	%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js
		823	%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js
		824	%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js
		825	%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js
		826	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js
		827	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js
		828	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js
		829	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js
		830	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js
		831	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js
		832	%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/Types.js
		833	%%DATADIR%%/resources/inspector/web_audio/web_audio.js
553	%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js	834	%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js
554	%%DATADIR%%/resources/inspector/worker_app.html	835	%%DATADIR%%/resources/inspector/worker_app.html
555	%%DATADIR%%/resources/inspector/worker_app.js	836	%%DATADIR%%/resources/inspector/worker_app.js
556	%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
557	%%DATADIR%%/resources/inspector/workspace/FileManager.js	837	%%DATADIR%%/resources/inspector/workspace/FileManager.js
558	%%DATADIR%%/resources/inspector/workspace/UISourceCode.js	838	%%DATADIR%%/resources/inspector/workspace/UISourceCode.js
		839	%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js
559	%%DATADIR%%/resources/inspector/workspace/workspace.js	840	%%DATADIR%%/resources/inspector/workspace/workspace.js
560	%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js	841	%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js
		842	%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js
		843	%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
561	%%DATADIR%%/snapshot_blob.bin	844	%%DATADIR%%/snapshot_blob.bin
562	%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
563	%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so	845	%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so
564	%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so	846	%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so
565	%%DATADIR%%/v8_context_snapshot.bin	847	%%DATADIR%%/v8_context_snapshot.bin
Lines 568-576 Link Here
568	%%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so	850	%%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so
569	%%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so	851	%%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so
570	%%DEBUG%%%%DATADIR%%/libtest_shared_library.so	852	%%DEBUG%%%%DATADIR%%/libtest_shared_library.so
571	%%DRIVER%%bin/chromedriver
572	man/man1/chrome.1.gz
573	share/applications/chromium-browser.desktop
574	share/icons/hicolor/128x128/apps/chrome.png	853	share/icons/hicolor/128x128/apps/chrome.png
575	share/icons/hicolor/22x22/apps/chrome.png	854	share/icons/hicolor/22x22/apps/chrome.png
576	share/icons/hicolor/24x24/apps/chrome.png	855	share/icons/hicolor/24x24/apps/chrome.png

Return to bug 244625

Lines 2-8 Link Here

(-)www/chromium/Makefile (-6 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= chromium	4	PORTNAME= chromium
5	PORTVERSION= 79.0.3945.130	5	PORTVERSION= 80.0.3987.132
6	CATEGORIES?= www java	6	CATEGORIES?= www java
7	MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \	7	MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
8	LOCAL/cpm/chromium/:fonts	8	LOCAL/cpm/chromium/:fonts
Lines 119-125 Link Here
119	use_bundled_fontconfig=false \	119	use_bundled_fontconfig=false \
120	use_custom_libcxx=false \	120	use_custom_libcxx=false \
121	use_gnome_keyring=false \	121	use_gnome_keyring=false \
122	use_jumbo_build=true \
123	use_lld=true \	122	use_lld=true \
124	use_sysroot=false \	123	use_sysroot=false \
125	use_system_freetype=true \	124	use_system_freetype=true \
Lines 160-169 Link Here
160		159
161	CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \	160	CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
162	GN_ARGS+=proprietary_codecs=true \	161	GN_ARGS+=proprietary_codecs=true \
163	GN_ARGS+=enable_hevc_demuxing=true	162	GN_ARGS+=enable_platform_hevc=true
164	CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \	163	CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
165	GN_ARGS+=proprietary_codecs=false \	164	GN_ARGS+=proprietary_codecs=false \
166	GN_ARGS+=enable_hevc_demuxing=false	165	GN_ARGS+=enable_platform_hevc=false
167		166
168	CUPS_LIB_DEPENDS= libcups.so:print/cups	167	CUPS_LIB_DEPENDS= libcups.so:print/cups
169	CUPS_VARS= GN_ARGS+=use_cups=true	168	CUPS_VARS= GN_ARGS+=use_cups=true
Lines 259-265 Link Here
259	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	258	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
260	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \	259	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
261	./build/linux/unbundle/replace_gn_files.py --system-libraries \	260	./build/linux/unbundle/replace_gn_files.py --system-libraries \
262	ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm \|\| ${FALSE}	261	ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm \|\| ${FALSE}
263	.endif	262	.endif
264		263
265	do-configure:	264	do-configure:
Lines 301-307 Link Here
301	.endfor	300	.endfor
302	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}	301	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
303	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}	302	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
304	.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin	303	.for d in protoc mksnapshot
		304	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
		305	.endfor
		306	.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
305	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	307	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
306	.endfor	308	.endfor
307	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \	309	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Lines 1-4 Link Here

(-)www/chromium/files/patch-BUILD.gn (-5 / +5 lines)
1	--- BUILD.gn.orig 2019-12-16 21:51:21 UTC	1	--- BUILD.gn.orig 2020-03-03 18:53:46 UTC
2	+++ BUILD.gn	2	+++ BUILD.gn
3	@@ -411,7 +411,7 @@ group("gn_all") {	3	@@ -411,7 +411,7 @@ group("gn_all") {
4	]	4	]
Lines 57-63 Link Here
57	]	57	]
58	if (is_desktop_linux && use_ozone) {	58	if (is_desktop_linux && use_ozone) {
59	deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]	59	deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
60	@@ -905,7 +894,6 @@ if (is_chromeos) {	60	@@ -918,7 +907,6 @@ if (is_chromeos) {
61	"//ppapi/examples/video_decode",	61	"//ppapi/examples/video_decode",
62	"//sandbox/linux:chrome_sandbox",	62	"//sandbox/linux:chrome_sandbox",
63	"//sandbox/linux:sandbox_linux_unittests",	63	"//sandbox/linux:sandbox_linux_unittests",
Lines 65-71 Link Here
65		65
66	# Blocked on https://github.com/catapult-project/catapult/issues/2297	66	# Blocked on https://github.com/catapult-project/catapult/issues/2297
67	#"//third_party/catapult/telemetry:bitmaptools",	67	#"//third_party/catapult/telemetry:bitmaptools",
68	@@ -1076,7 +1064,7 @@ if (!is_ios) {	68	@@ -1069,7 +1057,7 @@ if (!is_ios) {
69	]	69	]
70	}	70	}
71		71
Lines 74-80 Link Here
74	data_deps +=	74	data_deps +=
75	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]	75	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
76	}	76	}
77	@@ -1085,7 +1073,7 @@ if (!is_ios) {	77	@@ -1078,7 +1066,7 @@ if (!is_ios) {
78	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	78	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
79	}	79	}
80		80
Lines 83-89 Link Here
83	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	83	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
84	}	84	}
85		85
86	@@ -1227,9 +1215,6 @@ group("chromium_builder_perf") {	86	@@ -1220,9 +1208,6 @@ group("chromium_builder_perf") {
87		87
88	if (is_win) {	88	if (is_win) {
89	data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]	89	data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_BUILD.gn (-10 / +10 lines)
1	--- base/BUILD.gn.orig 2019-12-16 21:51:21 UTC	1	--- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC
2	+++ base/BUILD.gn	2	+++ base/BUILD.gn
3	@@ -1274,7 +1274,7 @@ jumbo_component("base") {	3	@@ -1302,7 +1302,7 @@ jumbo_component("base") {
4	# Needed for <atomic> if using newer C++ library than sysroot, except if	4	# Needed for <atomic> if using newer C++ library than sysroot, except if
5	# building inside the cros_sdk environment - use host_toolchain as a	5	# building inside the cros_sdk environment - use host_toolchain as a
6	# more robust check for this.	6	# more robust check for this.
Lines 9-15 Link Here
9	host_toolchain != "//build/toolchain/cros:host") {	9	host_toolchain != "//build/toolchain/cros:host") {
10	libs += [ "atomic" ]	10	libs += [ "atomic" ]
11	}	11	}
12	@@ -1300,7 +1300,7 @@ jumbo_component("base") {	12	@@ -1328,7 +1328,7 @@ jumbo_component("base") {
13	"allocator/allocator_shim_override_glibc_weak_symbols.h",	13	"allocator/allocator_shim_override_glibc_weak_symbols.h",
14	]	14	]
15	deps += [ "//base/allocator:tcmalloc" ]	15	deps += [ "//base/allocator:tcmalloc" ]
Lines 18-24 Link Here
18	sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]	18	sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
19	} else if (is_android && use_allocator == "none") {	19	} else if (is_android && use_allocator == "none") {
20	sources += [	20	sources += [
21	@@ -1903,6 +1903,33 @@ jumbo_component("base") {	21	@@ -1919,6 +1919,33 @@ jumbo_component("base") {
22	}	22	}
23	}	23	}
24		24
Lines 51-60 Link Here
51	+	51	+
52	# iOS	52	# iOS
53	if (is_ios) {	53	if (is_ios) {
54	set_sources_assignment_filter([])	54	sources -= [
55	@@ -3071,6 +3098,12 @@ test("base_unittests") {	55	@@ -3069,6 +3096,12 @@ test("base_unittests") {
56	]	56
57	set_sources_assignment_filter(sources_assignment_filter)	57	manifest = "//build/config/fuchsia/tests.cmx"
58	}	58	}
59	+	59	+
60	+ if (is_bsd) {	60	+ if (is_bsd) {
Lines 63-67 Link Here
63	+ ]	63	+ ]
64	+ }	64	+ }
65		65
66	if (is_win) {	66	if (!is_fuchsia && !is_ios) {
67	deps += [ "//base:scoped_handle_test_dll" ]	67	sources += [ "files/file_locking_unittest.cc" ]

Lines 1-18 Link Here

(-)www/chromium/files/patch-base_debug_elf__reader.cc (-9 / +9 lines)
1	--- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC	1	--- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC
2	+++ base/debug/elf_reader.cc	2	+++ base/debug/elf_reader.cc
3	@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,	3	@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
4	reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
5	bool found = false;	4	bool found = false;
6	while (current_note < section_end) {	5	while (current_section < section_end) {
		6	current_note = reinterpret_cast<const Nhdr*>(current_section);
7	+#if !defined(OS_BSD)	7	+#if !defined(OS_BSD)
8	if (current_note->n_type == NT_GNU_BUILD_ID) {	8	if (current_note->n_type == NT_GNU_BUILD_ID) {
9	const char* note_name =	9	StringPiece note_name(current_section + sizeof(Nhdr),
10	reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);	10	current_note->n_namesz);
11	@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,	11	@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
12	break;	12	break;
13	}	13	}
14	}	14	}
15	+#endif	15	+#endif
16		16
17	current_note = reinterpret_cast<const Nhdr*>(	17	size_t section_size = bits::Align(current_note->n_namesz, 4) +
18	reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +	18	bits::Align(current_note->n_descsz, 4) +

Lines 1-20 Link Here

(-)www/chromium/files/patch-base_i18n_icu__util.cc (-15 / +15 lines)
1	--- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC	1	--- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC
2	+++ base/i18n/icu_util.cc	2	+++ base/i18n/icu_util.cc
3	@@ -20,7 +20,7 @@	3	@@ -43,7 +43,7 @@
4	#include "build/build_config.h"	4	#endif
5	#include "third_party/icu/source/common/unicode/putil.h"	5
6	#include "third_party/icu/source/common/unicode/udata.h"	6	#if defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| \
7	-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_ANDROID)	7	- (defined(OS_LINUX) && !defined(IS_CHROMECAST))
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD) && !defined(OS_CHROMEOS)) \|\| defined(OS_ANDROID)	8	+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) \|\| defined(OS_BSD)
9	#include "third_party/icu/source/i18n/unicode/timezone.h"	9	#include "third_party/icu/source/i18n/unicode/timezone.h"
10	#endif	10	#endif
11		11
12	@@ -365,7 +365,7 @@ bool InitializeICU() {	12	@@ -288,7 +288,7 @@ void InitializeIcuTimeZone() {
13	// TODO(jungshik): Some callers do not care about tz at all. If necessary,	13	fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
14	// add a boolean argument to this function to init'd the default tz only	14	icu::TimeZone::adoptDefault(
15	// when requested.	15	icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
16	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	16	-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
17	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)	17	+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) \|\| defined(OS_BSD)
18	if (result)	18	// To respond to the timezone change properly, the default timezone
19	std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());	19	// cache in ICU has to be populated on starting up.
20	#endif	20	// See TimeZoneMonitorLinux::NotifyClientsFromImpl().

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_memory_platform__shared__memory__region.h (-4 / +4 lines)
1	--- base/memory/platform_shared_memory_region.h.orig 2019-09-16 12:06:15 UTC	1	--- base/memory/platform_shared_memory_region.h.orig 2020-03-03 18:52:59 UTC
2	+++ base/memory/platform_shared_memory_region.h	2	+++ base/memory/platform_shared_memory_region.h
3	@@ -28,7 +28,7 @@	3	@@ -27,7 +27,7 @@
4	#include "base/files/scoped_file.h"	4	#include "base/files/scoped_file.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	namespace content {	9	namespace content {
10	class SandboxIPCHandler;	10	class SandboxIPCHandler;
11	}	11	}
12	@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {	12	@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
13	kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE	13	kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
14	};	14	};
15		15
Lines 18-24 Link Here
18	// Structure to limit access to executable region creation.	18	// Structure to limit access to executable region creation.
19	struct ExecutableRegion {	19	struct ExecutableRegion {
20	private:	20	private:
21	@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {	21	@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
22	CheckPlatformHandlePermissionsCorrespondToMode);	22	CheckPlatformHandlePermissionsCorrespondToMode);
23	static PlatformSharedMemoryRegion Create(Mode mode,	23	static PlatformSharedMemoryRegion Create(Mode mode,
24	size_t size	24	size_t size

Lines 1-31 Link Here

(-)www/chromium/files/patch-base_memory_protected__memory__posix.cc (-31 lines)
1	--- base/memory/protected_memory_posix.cc.orig 2019-05-01 17:25:41 UTC
2	+++ base/memory/protected_memory_posix.cc
3	@@ -8,9 +8,9 @@
4	#include <sys/mman.h>
5	#include <unistd.h>
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include <sys/resource.h>
10	-#endif // defined(OS_LINUX)
11	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
12
13	#if defined(OS_MACOSX) && !defined(OS_IOS)
14	#include <mach/mach.h>
15	@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
16	return SetMemory(start, end, PROT_READ);
17	}
18
19	-#if defined(OS_LINUX)
20	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
21	void AssertMemoryIsReadOnly(const void* ptr) {
22	#if DCHECK_IS_ON()
23	const uintptr_t page_mask = ~(base::GetPageSize() - 1);
24	@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
25	DCHECK_EQ(region_info.protection, VM_PROT_READ);
26	#endif // DCHECK_IS_ON()
27	}
28	-#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS))
29	+#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS)) \|\| defined(OS_BSD)
30
31	} // namespace base

Line 0 Link Here

(-)www/chromium/files/patch-base_profiler_register__context.h (+36 lines)
	1	--- base/profiler/register_context.h.orig 2020-03-03 18:53:47 UTC
	2	+++ base/profiler/register_context.h
	3	@@ -17,7 +17,7 @@
	4	#include <windows.h>
	5	#elif defined(OS_MACOSX)
	6	#include <mach/machine/thread_status.h>
	7	-#elif defined(OS_ANDROID) \|\| defined(OS_LINUX)
	8	+#elif defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	9	#include <sys/ucontext.h>
	10	#endif
	11
	12	@@ -152,6 +152,24 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
	13	}
	14
	15	#endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
	16	+
	17	+#elif defined(OS_FREEBSD)
	18	+
	19	+using RegisterContext = mcontext_t;
	20	+
	21	+#if defined(ARCH_CPU_X86_64)
	22	+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
	23	+ return AsUintPtr(&context->mc_rsp);
	24	+}
	25	+
	26	+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
	27	+ return AsUintPtr(&context->mc_rbp);
	28	+}
	29	+
	30	+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
	31	+ return AsUintPtr(&context->mc_rip);
	32	+}
	33	+#endif
	34
	35	#else // #if defined(OS_WIN)
	36

Line 0 Link Here

(-)www/chromium/files/patch-base_profiler_stack__copier__signal.cc (+65 lines)
		1	--- base/profiler/stack_copier_signal.cc.orig 2020-03-03 18:53:47 UTC
		2	+++ base/profiler/stack_copier_signal.cc
		3	@@ -4,10 +4,16 @@
		4
		5	#include "base/profiler/stack_copier_signal.h"
		6
		7	+#if defined(OS_LINUX)
		8	#include <linux/futex.h>
		9	+#include <syscall.h>
		10	+#elif defined(OS_FREEBSD)
		11	+#include <sys/types.h>
		12	+#include <sys/thr.h>
		13	+#include <sys/umtx.h>
		14	+#endif
		15	#include <signal.h>
		16	#include <sys/ucontext.h>
		17	-#include <syscall.h>
		18
		19	#include <atomic>
		20
		21	@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent {
		22	// for a pthread mutex. So, also check the condition.
		23	while (true) {
		24	int res =
		25	+#if defined(OS_LINUX)
		26	syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT \| FUTEX_PRIVATE_FLAG,
		27	0, nullptr, nullptr, 0);
		28	+#elif defined(OS_FREEBSD)
		29	+ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr,
		30	+ nullptr);
		31	+#endif
		32	if (futex_.load(std::memory_order_acquire) != 0)
		33	return true;
		34	if (res != 0)
		35	@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent {
		36
		37	void Signal() {
		38	futex_.store(1, std::memory_order_release);
		39	+#if defined(OS_LINUX)
		40	syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE \| FUTEX_PRIVATE_FLAG, 1,
		41	nullptr, nullptr, 0);
		42	+#elif defined(OS_FREEBSD)
		43	+ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr);
		44	+#endif
		45	}
		46
		47	private:
		48	@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
		49	if (!scoped_sigaction.succeeded())
		50	return false;
		51
		52	+#if defined(OS_LINUX)
		53	if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(),
		54	SIGURG) != 0) {
		55	NOTREACHED();
		56	return false;
		57	}
		58	+#elif defined(OS_FREEBSD)
		59	+ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) {
		60	+ return false;
		61	+ }
		62	+#endif
		63	bool finished_waiting = wait_event.Wait();
		64	TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"),
65	"StackCopierSignal copy stack");

Line 0 Link Here

(-)www/chromium/files/patch-base_profiler_thread__delegate__posix.cc (+63 lines)
	1	--- base/profiler/thread_delegate_posix.cc.orig 2020-03-03 18:53:47 UTC
	2	+++ base/profiler/thread_delegate_posix.cc
	3	@@ -3,6 +3,9 @@
	4	// found in the LICENSE file.
	5
	6	#include <pthread.h>
	7	+#if defined(__FreeBSD__)
	8	+#include <pthread_np.h>
	9	+#endif
	10
	11	#include "base/process/process_handle.h"
	12	#include "base/profiler/thread_delegate_posix.h"
	13	@@ -17,12 +20,20 @@ namespace {
	14	uintptr_t GetThreadStackBaseAddressImpl(
	15	SamplingProfilerThreadToken thread_token) {
	16	pthread_attr_t attr;
	17	+#if defined(OS_FREEBSD)
	18	+ pthread_attr_init(&attr);
	19	+ pthread_attr_get_np(thread_token.pthread_id, &attr);
	20	+#elif defined(OS_LINUX)
	21	pthread_getattr_np(thread_token.pthread_id, &attr);
	22	+#endif
	23	// See crbug.com/617730 for limitations of this approach on Linux.
	24	void* address;
	25	size_t size;
	26	pthread_attr_getstack(&attr, &address, &size);
	27	const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
	28	+#if defined(OS_FREEBSD)
	29	+ pthread_attr_destroy(&attr);
	30	+#endif
	31	return base_address;
	32	}
	33
	34	@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
	35	for (size_t i = 19; i <= 29; ++i)
	36	registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
	37	return registers;
	38	-#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) &&
	39	- // defined(ARCH_CPU_32_BITS)
	40	+#elif defined(ARCH_CPU_X86_64)
	41	return {
	42	// Return the set of callee-save registers per the x86-64 System V ABI
	43	// section 3.2.1, plus the stack pointer.
	44	+#if defined(OS_FREEBSD)
	45	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp),
	46	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx),
	47	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12),
	48	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13),
	49	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14),
	50	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15),
	51	+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp),
	52	+#else
	53	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
	54	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
	55	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
	56	@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
	57	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
	58	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
	59	reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
	60	+#endif
	61	};
	62	#else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
	63	// Unimplemented for other architectures.

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_BUILD.gn (-4 / +4 lines)
1	--- build/config/BUILD.gn.orig 2019-10-21 19:06:18 UTC	1	--- build/config/BUILD.gn.orig 2020-03-03 18:53:47 UTC
2	+++ build/config/BUILD.gn	2	+++ build/config/BUILD.gn
3	@@ -149,7 +149,7 @@ config("debug") {	3	@@ -133,7 +133,7 @@ config("debug") {
4	# builds, and we have to tell it to turn it off.	4	# builds, and we have to tell it to turn it off.
5	defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]	5	defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
6	}	6	}
Lines 9-15 Link Here
9	# Enable libstdc++ debugging facilities to help catch problems early, see	9	# Enable libstdc++ debugging facilities to help catch problems early, see
10	# http://crbug.com/65151 .	10	# http://crbug.com/65151 .
11	# TODO(phajdan.jr): Should we enable this for all of POSIX?	11	# TODO(phajdan.jr): Should we enable this for all of POSIX?
12	@@ -247,9 +247,7 @@ config("default_libs") {	12	@@ -231,9 +231,7 @@ config("default_libs") {
13	]	13	]
14	} else if (is_linux) {	14	} else if (is_linux) {
15	libs = [	15	libs = [
Lines 19-25 Link Here
19	]	19	]
20	}	20	}
21	}	21	}
22	@@ -337,7 +335,7 @@ config("executable_config") {	22	@@ -321,7 +319,7 @@ config("executable_config") {
23	"//build/config/ios:ios_dynamic_flags",	23	"//build/config/ios:ios_dynamic_flags",
24	"//build/config/ios:ios_executable_flags",	24	"//build/config/ios:ios_executable_flags",
25	]	25	]

Lines 1-4 Link Here

(-)www/chromium/files/patch-build_config_compiler_BUILD.gn (-10 / +10 lines)
1	--- build/config/compiler/BUILD.gn.orig 2019-12-16 21:51:21 UTC	1	--- build/config/compiler/BUILD.gn.orig 2020-03-03 18:53:47 UTC
2	+++ build/config/compiler/BUILD.gn	2	+++ build/config/compiler/BUILD.gn
3	@@ -57,7 +57,7 @@ declare_args() {	3	@@ -57,7 +57,7 @@ declare_args() {
4	# only two architectures that are currently checked in). Turn this off when	4	# only two architectures that are currently checked in). Turn this off when
Lines 9-15 Link Here
9	(current_cpu == "x64" \|\| current_cpu == "x86")	9	(current_cpu == "x64" \|\| current_cpu == "x86")
10	binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",	10	binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
11	root_build_dir)	11	root_build_dir)
12	@@ -303,7 +303,7 @@ config("compiler") {	12	@@ -308,7 +308,7 @@ config("compiler") {
13		13
14	# Linker warnings.	14	# Linker warnings.
15	if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&	15	if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
Lines 18-24 Link Here
18	# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580	18	# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
19	ldflags += [ "-Wl,--fatal-warnings" ]	19	ldflags += [ "-Wl,--fatal-warnings" ]
20	}	20	}
21	@@ -398,7 +398,7 @@ config("compiler") {	21	@@ -403,7 +403,7 @@ config("compiler") {
22		22
23	# Compiler instrumentation can introduce dependencies in DSOs to symbols in	23	# Compiler instrumentation can introduce dependencies in DSOs to symbols in
24	# the executable they are loaded into, so they are unresolved at link-time.	24	# the executable they are loaded into, so they are unresolved at link-time.
Lines 27-33 Link Here
27	ldflags += [	27	ldflags += [
28	"-Wl,-z,defs",	28	"-Wl,-z,defs",
29	"-Wl,--as-needed",	29	"-Wl,--as-needed",
30	@@ -498,7 +498,7 @@ config("compiler") {	30	@@ -503,7 +503,7 @@ config("compiler") {
31	}	31	}
32	}	32	}
33		33
Lines 36-42 Link Here
36	cflags += [ "-fcrash-diagnostics-dir=" +	36	cflags += [ "-fcrash-diagnostics-dir=" +
37	rebase_path("//tools/clang/crashreports", root_build_dir) ]	37	rebase_path("//tools/clang/crashreports", root_build_dir) ]
38		38
39	@@ -768,7 +768,7 @@ config("compiler_cpu_abi") {	39	@@ -773,7 +773,7 @@ config("compiler_cpu_abi") {
40	cflags += [ "-mtune=$arm_tune" ]	40	cflags += [ "-mtune=$arm_tune" ]
41	}	41	}
42	} else if (current_cpu == "arm64") {	42	} else if (current_cpu == "arm64") {
Lines 45-51 Link Here
45	cflags += [ "--target=aarch64-linux-gnu" ]	45	cflags += [ "--target=aarch64-linux-gnu" ]
46	ldflags += [ "--target=aarch64-linux-gnu" ]	46	ldflags += [ "--target=aarch64-linux-gnu" ]
47	}	47	}
48	@@ -1119,7 +1119,7 @@ config("compiler_deterministic") {	48	@@ -1124,7 +1124,7 @@ config("compiler_deterministic") {
49	"-Xclang",	49	"-Xclang",
50	".",	50	".",
51	]	51	]
Lines 54-60 Link Here
54	# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)	54	# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
55	asmflags = [ "-Wa,-fdebug-compilation-dir,." ]	55	asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
56	}	56	}
57	@@ -1508,7 +1508,7 @@ config("default_warnings") {	57	@@ -1513,7 +1513,7 @@ config("default_warnings") {
58	cflags += [ "-Wno-nonportable-include-path" ]	58	cflags += [ "-Wno-nonportable-include-path" ]
59	}	59	}
60		60
Lines 63-69 Link Here
63	# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not	63	# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
64	# recognize.	64	# recognize.
65	cflags += [	65	cflags += [
66	@@ -1738,7 +1738,7 @@ config("thin_archive") {	66	@@ -1761,7 +1761,7 @@ config("thin_archive") {
67	# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't	67	# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
68	# have a "thin archive" mode (it does accept -T, but it means truncating	68	# have a "thin archive" mode (it does accept -T, but it means truncating
69	# archive names to 16 characters, which is not what we want).	69	# archive names to 16 characters, which is not what we want).
Lines 72-78 Link Here
72	arflags = [ "-T" ]	72	arflags = [ "-T" ]
73	} else if (is_win && use_lld) {	73	} else if (is_win && use_lld) {
74	arflags = [ "/llvmlibthin" ]	74	arflags = [ "/llvmlibthin" ]
75	@@ -2328,7 +2328,7 @@ config("symbols") {	75	@@ -2351,7 +2351,7 @@ config("symbols") {
76	# flag, so we can use use -g1 for pnacl and nacl-clang compiles.	76	# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
77	# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.	77	# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
78	if (!is_nacl \|\| is_clang) {	78	if (!is_nacl \|\| is_clang) {
Lines 81-87 Link Here
81	}	81	}
82		82
83	if (use_debug_fission && !is_nacl && !is_android) {	83	if (use_debug_fission && !is_nacl && !is_android) {
84	@@ -2349,7 +2349,7 @@ config("symbols") {	84	@@ -2372,7 +2372,7 @@ config("symbols") {
85	# DWARF info may be corrupt; offsets in a range list entry are in different	85	# DWARF info may be corrupt; offsets in a range list entry are in different
86	# sections" there. Maybe just a bug in nacl_switch_32.S.	86	# sections" there. Maybe just a bug in nacl_switch_32.S.
87	if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&	87	if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&

Lines 1-27 Link Here

(-)www/chromium/files/patch-build_linux_unbundle_libusb.gn (-27 lines)
1	--- build/linux/unbundle/libusb.gn.orig 2019-03-17 01:47:13 UTC
2	+++ build/linux/unbundle/libusb.gn
3	@@ -0,0 +1,24 @@
4	+# Copyright 2016 The Chromium Authors. All rights reserved.
5	+# Use of this source code is governed by a BSD-style license that can be
6	+# found in the LICENSE file.
7	+
8	+import("//build/config/linux/pkg_config.gni")
9	+import("//build/shim_headers.gni")
10	+
11	+pkg_config("system_libusb") {
12	+ packages = [ "libusb-1.0" ]
13	+}
14	+
15	+shim_headers("libusb_shim") {
16	+ root_path = "src/libusb"
17	+ headers = [
18	+ "libusb.h",
19	+ ]
20	+}
21	+
22	+source_set("libusb") {
23	+ deps = [
24	+ ":libusb_shim",
25	+ ]
26	+ public_configs = [ ":system_libusb" ]
27	+}

Line 0 Link Here

(-)www/chromium/files/patch-build_linux_unbundle_libxml.gn (+53 lines)
	1	--- build/linux/unbundle/libxml.gn.orig 2020-03-03 18:53:47 UTC
	2	+++ build/linux/unbundle/libxml.gn
	3	@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
	4	packages = [ "libxml-2.0" ]
	5	}
	6
	7	-static_library("libxml") {
	8	+source_set("libxml") {
	9	+ public_configs = [ ":system_libxml" ]
	10	+}
	11	+
	12	+static_library("libxml_utils") {
	13	+ # Do not expand this visibility list without first consulting with the
	14	+ # Security Team.
	15	+ visibility = [
	16	+ ":xml_reader",
	17	+ ":xml_writer",
	18	+ "//base/test:test_support",
	19	+ "//services/data_decoder:xml_parser_fuzzer",
	20	+ ]
	21	sources = [
	22	"chromium/libxml_utils.cc",
	23	"chromium/libxml_utils.h",
	24	]
	25	-
	26	public_configs = [ ":system_libxml" ]
	27	+}
	28	+
	29	+static_library("xml_reader") {
	30	+ # Do not expand this visibility list without first consulting with the
	31	+ # Security Team.
	32	+ visibility = [
	33	+ "//base/test:test_support",
	34	+ "//components/policy/core/common:unit_tests",
	35	+ "//services/data_decoder:*",
	36	+ "//tools/traffic_annotation/auditor:auditor_sources",
	37	+ ]
	38	+ sources = [
	39	+ "chromium/xml_reader.cc",
	40	+ "chromium/xml_reader.h",
	41	+ ]
	42	+ deps = [ ":libxml_utils" ]
	43	+}
	44	+
	45	+static_library("xml_writer") {
	46	+ # The XmlWriter is considered safe to use from any target.
	47	+ visibility = [ "*" ]
	48	+ sources = [
	49	+ "chromium/xml_writer.cc",
	50	+ "chromium/xml_writer.h",
	51	+ ]
	52	+ deps = [ ":libxml_utils" ]
	53	}

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (-15 / +15 lines)
1	--- chrome/app/chrome_main_delegate.cc.orig 2019-12-16 21:51:22 UTC	1	--- chrome/app/chrome_main_delegate.cc.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/chrome_main_delegate.cc	2	+++ chrome/app/chrome_main_delegate.cc
3	@@ -100,7 +100,7 @@	3	@@ -100,7 +100,7 @@
4	#include "chrome/app/shutdown_signal_handlers_posix.h"	4	#include "chrome/app/shutdown_signal_handlers_posix.h"
Lines 9-15 Link Here
9	#include "components/nacl/common/nacl_paths.h"	9	#include "components/nacl/common/nacl_paths.h"
10	#include "components/nacl/zygote/nacl_fork_delegate_linux.h"	10	#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
11	#endif	11	#endif
12	@@ -139,7 +139,7 @@	12	@@ -142,7 +142,7 @@
13	#include "v8/include/v8.h"	13	#include "v8/include/v8.h"
14	#endif	14	#endif
15		15
Lines 18-24 Link Here
18	#include "base/environment.h"	18	#include "base/environment.h"
19	#endif	19	#endif
20		20
21	@@ -243,7 +243,7 @@ bool UseHooks() {	21	@@ -246,7 +246,7 @@ bool UseHooks() {
22		22
23	#endif // defined(OS_WIN)	23	#endif // defined(OS_WIN)
24		24
Lines 27-33 Link Here
27	void AdjustLinuxOOMScore(const std::string& process_type) {	27	void AdjustLinuxOOMScore(const std::string& process_type) {
28	// Browsers and zygotes should still be killable, but killed last.	28	// Browsers and zygotes should still be killable, but killed last.
29	const int kZygoteScore = 0;	29	const int kZygoteScore = 0;
30	@@ -302,13 +302,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty	30	@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
31	if (score > -1)	31	if (score > -1)
32	base::AdjustOOMScore(base::GetCurrentProcId(), score);	32	base::AdjustOOMScore(base::GetCurrentProcId(), score);
33	}	33	}
Lines 43-49 Link Here
43	// The zygote process opens the resources for the renderers.	43	// The zygote process opens the resources for the renderers.
44	process_type == service_manager::switches::kZygoteProcess \|\|	44	process_type == service_manager::switches::kZygoteProcess \|\|
45	#endif	45	#endif
46	@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co	46	@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
47	return false;	47	return false;
48	}	48	}
49		49
Lines 52-58 Link Here
52	// Show the man page if --help or -h is on the command line.	52	// Show the man page if --help or -h is on the command line.
53	void HandleHelpSwitches(const base::CommandLine& command_line) {	53	void HandleHelpSwitches(const base::CommandLine& command_line) {
54	if (command_line.HasSwitch(switches::kHelp) \|\|	54	if (command_line.HasSwitch(switches::kHelp) \|\|
55	@@ -357,7 +357,7 @@ void HandleHelpSwitches(const base::CommandLine& comma	55	@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
56	PLOG(FATAL) << "execlp failed";	56	PLOG(FATAL) << "execlp failed";
57	}	57	}
58	}	58	}
Lines 61-67 Link Here
61		61
62	#if !defined(OS_MACOSX) && !defined(OS_ANDROID)	62	#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
63	void SIGTERMProfilingShutdown(int signal) {	63	void SIGTERMProfilingShutdown(int signal) {
64	@@ -411,7 +411,7 @@ void InitializeUserDataDir(base::CommandLine* command_	64	@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
65	std::string process_type =	65	std::string process_type =
66	command_line->GetSwitchValueASCII(switches::kProcessType);	66	command_line->GetSwitchValueASCII(switches::kProcessType);
67		67
Lines 70-76 Link Here
70	// On Linux, Chrome does not support running multiple copies under different	70	// On Linux, Chrome does not support running multiple copies under different
71	// DISPLAYs, so the profile directory can be specified in the environment to	71	// DISPLAYs, so the profile directory can be specified in the environment to
72	// support the virtual desktop use-case.	72	// support the virtual desktop use-case.
73	@@ -423,7 +423,7 @@ void InitializeUserDataDir(base::CommandLine* command_	73	@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
74	user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);	74	user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
75	}	75	}
76	}	76	}
Lines 79-85 Link Here
79	#if defined(OS_MACOSX)	79	#if defined(OS_MACOSX)
80	policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);	80	policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
81	#endif // OS_MAC	81	#endif // OS_MAC
82	@@ -480,7 +480,7 @@ void InitLogging(const std::string& process_type) {	82	@@ -483,7 +483,7 @@ void InitLogging(const std::string& process_type) {
83	void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {	83	void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
84	if (!exe_entry_point_ticks.is_null())	84	if (!exe_entry_point_ticks.is_null())
85	startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);	85	startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
Lines 88-94 Link Here
88	// Record the startup process creation time on supported platforms.	88	// Record the startup process creation time on supported platforms.
89	startup_metric_utils::RecordStartupProcessCreationTime(	89	startup_metric_utils::RecordStartupProcessCreationTime(
90	base::Process::Current().CreationTime());	90	base::Process::Current().CreationTime());
91	@@ -665,7 +665,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi	91	@@ -684,7 +684,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
92	*exit_code = 0;	92	*exit_code = 0;
93	return true; // Got a --version switch; exit with a success error code.	93	return true; // Got a --version switch; exit with a success error code.
94	}	94	}
Lines 97-103 Link Here
97	// This will directly exit if the user asked for help.	97	// This will directly exit if the user asked for help.
98	HandleHelpSwitches(command_line);	98	HandleHelpSwitches(command_line);
99	#endif	99	#endif
100	@@ -689,7 +689,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi	100	@@ -708,7 +708,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
101	#if defined(OS_CHROMEOS)	101	#if defined(OS_CHROMEOS)
102	chromeos::RegisterPathProvider();	102	chromeos::RegisterPathProvider();
103	#endif	103	#endif
Lines 106-112 Link Here
106	nacl::RegisterPathProvider();	106	nacl::RegisterPathProvider();
107	#endif	107	#endif
108		108
109	@@ -883,7 +883,7 @@ void ChromeMainDelegate::PreSandboxStartup() {	109	@@ -902,7 +902,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
110	#if defined(OS_WIN)	110	#if defined(OS_WIN)
111	child_process_logging::Init();	111	child_process_logging::Init();
112	#endif	112	#endif
Lines 115-121 Link Here
115	// Create an instance of the CPU class to parse /proc/cpuinfo and cache	115	// Create an instance of the CPU class to parse /proc/cpuinfo and cache
116	// cpu_brand info.	116	// cpu_brand info.
117	base::CPU cpu_info;	117	base::CPU cpu_info;
118	@@ -1007,7 +1007,7 @@ void ChromeMainDelegate::PreSandboxStartup() {	118	@@ -1026,7 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
119	InitializePDF();	119	InitializePDF();
120	#endif	120	#endif
121		121
Lines 124-130 Link Here
124	// Zygote needs to call InitCrashReporter() in RunZygote().	124	// Zygote needs to call InitCrashReporter() in RunZygote().
125	if (process_type != service_manager::switches::kZygoteProcess) {	125	if (process_type != service_manager::switches::kZygoteProcess) {
126	#if defined(OS_ANDROID)	126	#if defined(OS_ANDROID)
127	@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {	127	@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
128	}	128	}
129	#endif // defined(OS_ANDROID)	129	#endif // defined(OS_ANDROID)
130	}	130	}
Lines 133-139 Link Here
133		133
134	// After all the platform Breakpads have been initialized, store the command	134	// After all the platform Breakpads have been initialized, store the command
135	// line for crash reporting.	135	// line for crash reporting.
136	@@ -1038,7 +1038,7 @@ void ChromeMainDelegate::PreSandboxStartup() {	136	@@ -1057,7 +1057,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
137	void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {	137	void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
138	// Note: If you are adding a new process type below, be sure to adjust the	138	// Note: If you are adding a new process type below, be sure to adjust the
139	// AdjustLinuxOOMScore function too.	139	// AdjustLinuxOOMScore function too.

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_chromium__strings.grd (-4 / +4 lines)
1	--- chrome/app/chromium_strings.grd.orig 2019-12-16 21:51:22 UTC	1	--- chrome/app/chromium_strings.grd.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/chromium_strings.grd	2	+++ chrome/app/chromium_strings.grd
3	@@ -602,7 +602,7 @@ Chromium is unable to recover your settings.	3	@@ -623,7 +623,7 @@ Chromium is unable to recover your settings.
4	</if>	4	</if>
5		5
6	<!-- about:browser-switch strings -->	6	<!-- about:browser-switch strings -->
Lines 9-15 Link Here
9	<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">	9	<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">
10	Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.	10	Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
11	</message>	11	</message>
12	@@ -713,7 +713,7 @@ Chromium is unable to recover your settings.	12	@@ -727,7 +727,7 @@ Chromium is unable to recover your settings.
13	</message>	13	</message>
14		14
15	<!-- ProcessSingleton -->	15	<!-- ProcessSingleton -->
Lines 18-24 Link Here
18	<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.">	18	<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.">
19	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.	19	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.
20	</message>	20	</message>
21	@@ -946,7 +946,7 @@ Chromium is unable to recover your settings.	21	@@ -960,7 +960,7 @@ Chromium is unable to recover your settings.
22	</message>	22	</message>
23		23
24	<!-- Plugin Placeholders -->	24	<!-- Plugin Placeholders -->

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_generated__resources.grd (-4 / +4 lines)
1	--- chrome/app/generated_resources.grd.orig 2019-12-16 21:51:22 UTC	1	--- chrome/app/generated_resources.grd.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/generated_resources.grd	2	+++ chrome/app/generated_resources.grd
3	@@ -4922,7 +4922,7 @@ Keep your key file in a safe place. You will need it t	3	@@ -5008,7 +5008,7 @@ Keep your key file in a safe place. You will need it t
4	</if>	4	</if>
5		5
6	<!-- chrome://browser-switch strings -->	6	<!-- chrome://browser-switch strings -->
Lines 9-15 Link Here
9	<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">	9	<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
10	Legacy Browser Support	10	Legacy Browser Support
11	</message>	11	</message>
12	@@ -6571,7 +6571,7 @@ the Bookmarks menu.">	12	@@ -6712,7 +6712,7 @@ the Bookmarks menu.">
13	Google Pay	13	Google Pay
14	</message>	14	</message>
15		15
Lines 18-24 Link Here
18	<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.">	18	<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.">
19	Use system title bar and borders	19	Use system title bar and borders
20	</message>	20	</message>
21	@@ -7521,7 +7521,7 @@ Please help our engineers fix this problem. Tell us wh	21	@@ -7669,7 +7669,7 @@ Please help our engineers fix this problem. Tell us wh
22	Set as default	22	Set as default
23	</message>	23	</message>
24		24

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_google__chrome__strings.grd (-4 / +4 lines)
1	--- chrome/app/google_chrome_strings.grd.orig 2019-12-16 21:51:22 UTC	1	--- chrome/app/google_chrome_strings.grd.orig 2020-03-03 18:53:48 UTC
2	+++ chrome/app/google_chrome_strings.grd	2	+++ chrome/app/google_chrome_strings.grd
3	@@ -614,7 +614,7 @@ Google Chrome is unable to recover your settings.	3	@@ -635,7 +635,7 @@ Google Chrome is unable to recover your settings.
4	</if>	4	</if>
5		5
6	<!-- about:browser-switch strings -->	6	<!-- about:browser-switch strings -->
Lines 9-15 Link Here
9	<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">	9	<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">
10	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>.	10	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>.
11	</message>	11	</message>
12	@@ -725,7 +725,7 @@ Google Chrome is unable to recover your settings.	12	@@ -739,7 +739,7 @@ Google Chrome is unable to recover your settings.
13	</message>	13	</message>
14		14
15	<!-- ProcessSingleton -->	15	<!-- ProcessSingleton -->
Lines 18-24 Link Here
18	<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.">	18	<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.">
19	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.	19	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.
20	</message>	20	</message>
21	@@ -965,7 +965,7 @@ Google Chrome is unable to recover your settings.	21	@@ -979,7 +979,7 @@ Google Chrome is unable to recover your settings.
22	</message>	22	</message>
23		23
24	<!-- Plugin Placeholders -->	24	<!-- Plugin Placeholders -->

Lines 9-20 Link Here

(-)www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd (-9 lines)
9	<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />	9	<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
10	<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />	10	<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
11	</if>	11	</if>
12	@@ -109,7 +109,7 @@
13	<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
14	<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
15	</if>
16	- <if expr="is_linux and enable_app_list">
17	+ <if expr="is_posix and enable_app_list">
18	<!-- App Launcher icons for desktop icon. -->
19	<if expr="_google_chrome">
20	<then>

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_about__flags.cc (-96 / +19 lines)
1	--- chrome/browser/about_flags.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/about_flags.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/about_flags.cc	2	+++ chrome/browser/about_flags.cc
3	@@ -164,7 +164,7 @@	3	@@ -166,7 +166,7 @@
4	#include "ui/gl/gl_switches.h"	4	#include "ui/gl/gl_switches.h"
5	#include "ui/native_theme/native_theme_features.h"	5	#include "ui/native_theme/native_theme_features.h"
6		6
Lines 9-33 Link Here
9	#include "base/allocator/buildflags.h"	9	#include "base/allocator/buildflags.h"
10	#endif	10	#endif
11		11
12	@@ -715,7 +715,7 @@ const FeatureEntry::FeatureVariation	12	@@ -804,7 +804,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
13	nullptr}};
14	#endif // OS_ANDROID
15
16	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
17	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
18	const FeatureEntry::FeatureParam
19	kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = {
20	{autofill::features::
21	@@ -762,7 +762,7 @@ const FeatureEntry::FeatureVariation
22	kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard),
23	nullptr},
24	};
25	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
26	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
27
28	const FeatureEntry::Choice kMemlogModeChoices[] = {
29	{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
30	@@ -815,7 +815,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
31	heap_profiling::kMemlogSamplingRate5MB},	13	heap_profiling::kMemlogSamplingRate5MB},
32	};	14	};
33		15
Lines 36-51 Link Here
36	const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {	18	const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
37	{"DocumentUseServerScore", "true"},	19	{"DocumentUseServerScore", "true"},
38	{"DocumentUseClientScore", "false"},	20	{"DocumentUseClientScore", "false"},
39	@@ -853,7 +853,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP	21	@@ -956,7 +956,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
40	base::size(kOmniboxDocumentProviderClientScoring), nullptr},
41	{"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
42	base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
43	-#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
44	+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
45
46	#ifdef OS_ANDROID
47	const FeatureEntry::FeatureParam kOmniboxNTPZPSLocal[] = {
48	@@ -967,7 +967,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
49	{"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),	22	{"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),
50	nullptr}};	23	nullptr}};
51		24
Lines 52-69 Link Here
52	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| \	25	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| \
53	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD) \|\| \	26	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD) \|\| \
54	defined(OS_CHROMEOS)	27	defined(OS_CHROMEOS)
55	const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = {	28	const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = {
56	{language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}};	29	{language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}};
57	@@ -983,7 +983,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU	30	@@ -1981,13 +1981,13 @@ const FeatureEntry kFeatureEntries[] = {
58	{"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr},
59	{"Button_GM2", kTranslateBubbleUIButtonGM2,
60	base::size(kTranslateBubbleUIButton), nullptr}};
61	-#endif // OS_LINUX \|\| OS_MACOSX \|\| OS_WIN \|\| OS_CHROMEOS
62	+#endif // OS_LINUX \|\| OS_MACOSX \|\| OS_WIN \|\| OS_BSD \|\| OS_CHROMEOS
63
64	const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
65	{security_state::features::kMarkHttpAsFeatureParameterName,
66	@@ -1913,13 +1913,13 @@ const FeatureEntry kFeatureEntries[] = {
67	flag_descriptions::kCloudPrintXpsDescription, kOsWin,	31	flag_descriptions::kCloudPrintXpsDescription, kOsWin,
68	SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},	32	SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
69	#endif // OS_WIN	33	#endif // OS_WIN
Lines 79-85 Link Here
79	{"enable-webgl-draft-extensions",	43	{"enable-webgl-draft-extensions",
80	flag_descriptions::kWebglDraftExtensionsName,	44	flag_descriptions::kWebglDraftExtensionsName,
81	flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,	45	flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
82	@@ -1971,14 +1971,14 @@ const FeatureEntry kFeatureEntries[] = {	46	@@ -2031,14 +2031,14 @@ const FeatureEntry kFeatureEntries[] = {
83	"OverrideTranslateTriggerInIndia")},	47	"OverrideTranslateTriggerInIndia")},
84	#endif // OS_ANDROID	48	#endif // OS_ANDROID
85		49
Lines 96-111 Link Here
96		60
97	#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)	61	#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
98	{"enable-native-notifications",	62	{"enable-native-notifications",
99	@@ -2044,7 +2044,7 @@ const FeatureEntry kFeatureEntries[] = {	63	@@ -2119,7 +2119,7 @@ const FeatureEntry kFeatureEntries[] = {
100	flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
101	FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
102	#endif // OS_CHROMEOS
103	-#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
104	+#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
105	{"terminal-system-app", flag_descriptions::kTerminalSystemAppName,
106	flag_descriptions::kTerminalSystemAppDescription, kOsCrOS \| kOsLinux,
107	FEATURE_VALUE_TYPE(features::kTerminalSystemApp)},
108	@@ -2053,7 +2053,7 @@ const FeatureEntry kFeatureEntries[] = {
109	flag_descriptions::kDynamicTcmallocDescription, kOsCrOS \| kOsLinux,	64	flag_descriptions::kDynamicTcmallocDescription, kOsCrOS \| kOsLinux,
110	FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},	65	FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
111	#endif // BUILDFLAG(USE_TCMALLOC)	66	#endif // BUILDFLAG(USE_TCMALLOC)
Lines 114-120 Link Here
114	#if defined(OS_ANDROID)	69	#if defined(OS_ANDROID)
115	{"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,	70	{"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
116	flag_descriptions::kCreditCardAssistDescription, kOsAndroid,	71	flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
117	@@ -2131,7 +2131,7 @@ const FeatureEntry kFeatureEntries[] = {	72	@@ -2197,7 +2197,7 @@ const FeatureEntry kFeatureEntries[] = {
118	flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,	73	flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
119	FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},	74	FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
120	#endif // OS_ANDROID	75	#endif // OS_ANDROID
Lines 123-131 Link Here
123	{"enable-save-data", flag_descriptions::kEnableSaveDataName,	78	{"enable-save-data", flag_descriptions::kEnableSaveDataName,
124	flag_descriptions::kEnableSaveDataDescription, kOsCrOS,	79	flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
125	SINGLE_VALUE_TYPE(	80	SINGLE_VALUE_TYPE(
126	@@ -2810,7 +2810,7 @@ const FeatureEntry kFeatureEntries[] = {	81	@@ -2858,7 +2858,7 @@ const FeatureEntry kFeatureEntries[] = {
127	flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,	82	flag_descriptions::kOmniboxExperimentalSuggestScoringDescription, kOsAll,
128	FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},	83	FEATURE_VALUE_TYPE(omnibox::kOmniboxExperimentalSuggestScoring)},
129		84
130	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)	85	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
131	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)	86	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
Lines 132-138 Link Here
132	{"omnibox-experimental-keyword-mode",	87	{"omnibox-experimental-keyword-mode",
133	flag_descriptions::kOmniboxExperimentalKeywordModeName,	88	flag_descriptions::kOmniboxExperimentalKeywordModeName,
134	flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,	89	flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
135	@@ -2850,7 +2850,7 @@ const FeatureEntry kFeatureEntries[] = {	90	@@ -2903,7 +2903,7 @@ const FeatureEntry kFeatureEntries[] = {
136	flag_descriptions::kOmniboxAutocompleteTitlesName,	91	flag_descriptions::kOmniboxAutocompleteTitlesName,
137	flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,	92	flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,
138	FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},	93	FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},
Lines 141-147 Link Here
141		96
142	{"enable-speculative-service-worker-start-on-query-input",	97	{"enable-speculative-service-worker-start-on-query-input",
143	flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,	98	flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
144	@@ -3084,13 +3084,13 @@ const FeatureEntry kFeatureEntries[] = {	99	@@ -3136,13 +3136,13 @@ const FeatureEntry kFeatureEntries[] = {
145	flag_descriptions::kClickToOpenPDFDescription, kOsAll,	100	flag_descriptions::kClickToOpenPDFDescription, kOsAll,
146	FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},	101	FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
147		102
Lines 157-163 Link Here
157		112
158	#if !defined(OS_ANDROID)	113	#if !defined(OS_ANDROID)
159	{"chrome-colors", flag_descriptions::kChromeColorsName,	114	{"chrome-colors", flag_descriptions::kChromeColorsName,
160	@@ -3889,13 +3889,13 @@ const FeatureEntry kFeatureEntries[] = {	115	@@ -3965,13 +3965,13 @@ const FeatureEntry kFeatureEntries[] = {
161	FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},	116	FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
162	#endif	117	#endif
163		118
Lines 173-197 Link Here
173	// defined(OS_CHROMEOS)	128	// defined(OS_CHROMEOS)
174		129
175	{"enable-audio-focus-enforcement",	130	{"enable-audio-focus-enforcement",
176	@@ -4269,7 +4269,7 @@ const FeatureEntry kFeatureEntries[] = {	131	@@ -4425,12 +4425,12 @@ const FeatureEntry kFeatureEntries[] = {
177	flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll,
178	FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)},
179
180	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
181	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
182	{"enable-autofill-save-credit-card-uses-improved-messaging",
183	flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName,
184	flag_descriptions::
185	@@ -4279,7 +4279,7 @@ const FeatureEntry kFeatureEntries[] = {
186	autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging,
187	kAutofillSaveCreditCardUsesImprovedMessagingVariations,
188	"AutofillSaveCreditCardUsesImprovedMessaging")},
189	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
190	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
191
192	#if defined(OS_CHROMEOS)
193	{"release-notes", flag_descriptions::kReleaseNotesName,
194	@@ -4367,12 +4367,12 @@ const FeatureEntry kFeatureEntries[] = {
195	flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,	132	flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
196	FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},	133	FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
197		134
Lines 206-212 Link Here
206		143
207	#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)	144	#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
208	{"win-use-native-spellchecker",	145	{"win-use-native-spellchecker",
209	@@ -4385,12 +4385,12 @@ const FeatureEntry kFeatureEntries[] = {	146	@@ -4450,12 +4450,12 @@ const FeatureEntry kFeatureEntries[] = {
210	flag_descriptions::kSafetyTipDescription, kOsAll,	147	flag_descriptions::kSafetyTipDescription, kOsAll,
211	FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)},	148	FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)},
212		149
Lines 221-227 Link Here
221		158
222	#if defined(OS_CHROMEOS)	159	#if defined(OS_CHROMEOS)
223	{"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,	160	{"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
224	@@ -4526,12 +4526,12 @@ const FeatureEntry kFeatureEntries[] = {	161	@@ -4587,12 +4587,12 @@ const FeatureEntry kFeatureEntries[] = {
225	chrome::android::kDarkenWebsitesCheckboxInThemesSetting)},	162	chrome::android::kDarkenWebsitesCheckboxInThemesSetting)},
226	#endif // defined(OS_ANDROID)	163	#endif // defined(OS_ANDROID)
227		164
Lines 236-252 Link Here
236		173
237	{"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,	174	{"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,
238	flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,	175	flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,
239	@@ -4605,11 +4605,11 @@ const FeatureEntry kFeatureEntries[] = {
240	content_settings::kImprovedCookieControlsForThirdPartyCookieBlocking)},
241	#endif // !defined(OS_ANDROID)
242
243	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
244	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
245	{"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName,
246	flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop,
247	FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)},
248	-#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX
249	+#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX \|\| defined(OS_BSD)
250
251	#if !defined(OS_ANDROID)
252	{"accessibility-internals-page-improvements",

Lines 1-14 Link Here

(-)www/chromium/files/patch-chrome_browser_browser__features.cc (-14 lines)
1	--- chrome/browser/browser_features.cc.orig 2019-10-30 15:46:57 UTC
2	+++ chrome/browser/browser_features.cc
3	@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{
4	"DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT};
5	#endif
6
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
8	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	const base::Feature kSyncClipboardServiceFeature{
10	"SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT};
11	-#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX
12	+#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX \|\| defined(OS_BSD)
13
14	} // namespace features

Lines 1-14 Link Here

(-)www/chromium/files/patch-chrome_browser_browser__features.h (-14 lines)
1	--- chrome/browser/browser_features.h.orig 2019-10-30 15:47:15 UTC
2	+++ chrome/browser/browser_features.h
3	@@ -20,9 +20,9 @@ namespace features {
4	extern const base::Feature kDoubleTapToZoomInTabletMode;
5	#endif
6
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
8	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	extern const base::Feature kSyncClipboardServiceFeature;
10	-#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX
11	+#endif // OS_WIN \|\| OS_MACOSX \|\| OS_LINUX \|\| defined(OS_BSD)
12
13	} // namespace features
14

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (-6 / +6 lines)
1	--- chrome/browser/chrome_browser_main.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/chrome_browser_main.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/chrome_browser_main.cc	2	+++ chrome/browser/chrome_browser_main.cc
3	@@ -220,9 +220,9 @@	3	@@ -223,9 +223,9 @@
4	#include "components/arc/metrics/stability_metrics_manager.h"	4	#include "components/arc/metrics/stability_metrics_manager.h"
5	#endif // defined(OS_CHROMEOS)	5	#endif // defined(OS_CHROMEOS)
6		6
Lines 12-18 Link Here
12		12
13	#if defined(OS_LINUX)	13	#if defined(OS_LINUX)
14	#include "components/crash/content/app/breakpad_linux.h"	14	#include "components/crash/content/app/breakpad_linux.h"
15	@@ -260,7 +260,7 @@	15	@@ -264,7 +264,7 @@
16	#endif // defined(OS_WIN)	16	#endif // defined(OS_WIN)
17		17
18	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	18	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 21-27 Link Here
21	#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"	21	#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
22	#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"	22	#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
23	#endif	23	#endif
24	@@ -1071,7 +1071,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {	24	@@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
25	AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);	25	AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
26	}	26	}
27		27
Lines 30-36 Link Here
30	// Create directory for user-level Native Messaging manifest files. This	30	// Create directory for user-level Native Messaging manifest files. This
31	// makes it less likely that the directory will be created by third-party	31	// makes it less likely that the directory will be created by third-party
32	// software with incorrect owner or permission. See crbug.com/725513 .	32	// software with incorrect owner or permission. See crbug.com/725513 .
33	@@ -1080,7 +1080,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {	33	@@ -1082,7 +1082,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
34	&user_native_messaging_dir));	34	&user_native_messaging_dir));
35	if (!base::PathExists(user_native_messaging_dir))	35	if (!base::PathExists(user_native_messaging_dir))
36	base::CreateDirectory(user_native_messaging_dir);	36	base::CreateDirectory(user_native_messaging_dir);
Lines 39-45 Link Here
39	}	39	}
40	#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)	40	#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
41		41
42	@@ -1119,7 +1119,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {	42	@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
43	}	43	}
44		44
45	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	45	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_download_download__prefs.cc (-5 / +5 lines)
1	--- chrome/browser/download/download_prefs.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/download/download_prefs.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/download/download_prefs.cc	2	+++ chrome/browser/download/download_prefs.cc
3	@@ -63,7 +63,7 @@ namespace {	3	@@ -63,7 +63,7 @@ namespace {
4	// Consider downloads 'dangerous' if they go to the home directory on Linux and	4	// Consider downloads 'dangerous' if they go to the home directory on Linux and
Lines 27-33 Link Here
27	registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);	27	registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
28	#endif	28	#endif
29	#if defined(OS_ANDROID)	29	#if defined(OS_ANDROID)
30	@@ -358,7 +358,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {	30	@@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
31	}	31	}
32		32
33	bool DownloadPrefs::IsAutoOpenUsed() const {	33	bool DownloadPrefs::IsAutoOpenUsed() const {
Lines 36-42 Link Here
36	if (ShouldOpenPdfInSystemReader())	36	if (ShouldOpenPdfInSystemReader())
37	return true;	37	return true;
38	#endif	38	#endif
39	@@ -372,7 +372,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(	39	@@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
40	return false;	40	return false;
41	DCHECK(extension[0] == base::FilePath::kExtensionSeparator);	41	DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
42	extension.erase(0, 1);	42	extension.erase(0, 1);
Lines 45-51 Link Here
45	if (base::FilePath::CompareEqualIgnoreCase(extension,	45	if (base::FilePath::CompareEqualIgnoreCase(extension,
46	FILE_PATH_LITERAL("pdf")) &&	46	FILE_PATH_LITERAL("pdf")) &&
47	ShouldOpenPdfInSystemReader())	47	ShouldOpenPdfInSystemReader())
48	@@ -409,7 +409,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(	48	@@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
49	SaveAutoOpenState();	49	SaveAutoOpenState();
50	}	50	}
51		51
Lines 54-60 Link Here
54	void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {	54	void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
55	if (should_open_pdf_in_system_reader_ == should_open)	55	if (should_open_pdf_in_system_reader_ == should_open)
56	return;	56	return;
57	@@ -430,7 +430,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons	57	@@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
58	#endif	58	#endif
59		59
60	void DownloadPrefs::ResetAutoOpen() {	60	void DownloadPrefs::ResetAutoOpen() {

Lines 1-20 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (-12 / +12 lines)
1	--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC	1	--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC
2	+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	2	+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
3	@@ -55,7 +55,7 @@	3	@@ -52,7 +52,7 @@
4	#include "chrome/browser/chromeos/extensions/input_method_api.h"	4	#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
5	#include "chrome/browser/chromeos/extensions/media_player_api.h"	5	#include "ppapi/buildflags/buildflags.h"
		6
		7	-#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_WIN)
		8	+#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
6	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"	9	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
7	-#elif defined(OS_LINUX) \|\| defined(OS_WIN)
8	+#elif defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
9	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
10	#endif	10	#endif
11		11
12	@@ -94,7 +94,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()	12	@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
13	#if defined(OS_CHROMEOS)	13	extensions::IdentityAPI::GetFactoryInstance();
		14	extensions::InstallTrackerFactory::GetInstance();
		15	extensions::InstallVerifierFactory::GetInstance();
		16	-#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_WIN)
		17	+#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
14	extensions::InputImeAPI::GetFactoryInstance();	18	extensions::InputImeAPI::GetFactoryInstance();
15	extensions::InputMethodAPI::GetFactoryInstance();
16	-#elif defined(OS_LINUX) \|\| defined(OS_WIN)
17	+#elif defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
18	extensions::InputImeAPI::GetFactoryInstance();
19	#endif	19	#endif
20	extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();	20	extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();

Lines 1-15 Link Here

(-)www/chromium/files/patch-chrome_browser_flag__descriptions.cc (-24 / +6 lines)
1	--- chrome/browser/flag_descriptions.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/flag_descriptions.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/flag_descriptions.cc	2	+++ chrome/browser/flag_descriptions.cc
3	@@ -3744,7 +3744,7 @@ const char kZeroStateFilesDescription[] =	3	@@ -3861,7 +3861,7 @@ const char kDynamicTcmallocDescription[] =
4
5	#endif // defined(OS_CHROMEOS)
6
7	-#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
8	+#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	const char kTerminalSystemAppName[] = "Terminal System App";
10	const char kTerminalSystemAppDescription[] =
11	"Enables the Terminal System App at chrome://terminal which is used for "
12	@@ -3757,7 +3757,7 @@ const char kDynamicTcmallocDescription[] =
13	"utilization.";	4	"utilization.";
14	#endif // BUILDFLAG(USE_TCMALLOC)	5	#endif // BUILDFLAG(USE_TCMALLOC)
15		6
Lines 18-24 Link Here
18		9
19	// All views-based platforms --------------------------------------------------	10	// All views-based platforms --------------------------------------------------
20		11
21	@@ -3782,13 +3782,13 @@ const char kReopenTabInProductHelpDescription[] =	12	@@ -3886,13 +3886,13 @@ const char kReopenTabInProductHelpDescription[] =
22		13
23	// Random platform combinations -----------------------------------------------	14	// Random platform combinations -----------------------------------------------
24		15
Lines 34-54 Link Here
34		25
35	#if BUILDFLAG(ENABLE_CLICK_TO_CALL)	26	#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
36		27
37	@@ -3806,7 +3806,7 @@ const char kClickToCallUIDescription[] =	28	@@ -3921,7 +3921,7 @@ const char kRemoteCopyReceiverDescription[] =
		29	#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\|
		30	// defined(OS_CHROMEOS)
38		31
39	#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
40
41	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	32	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
42	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)	33	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
43		34
44	const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus";	35	const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus";
45	const char kDirectManipulationStylusDescription[] =	36	const char kDirectManipulationStylusDescription[] =
46	@@ -3825,7 +3825,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa
47	const char kSyncClipboardServiceDescription[] =
48	"Enables clipboard syncing via Chrome Sync.";
49
50	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
51	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
52
53	#if defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)
54

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_flag__descriptions.h (-24 / +6 lines)
1	--- chrome/browser/flag_descriptions.h.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/flag_descriptions.h.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/flag_descriptions.h	2	+++ chrome/browser/flag_descriptions.h
3	@@ -20,9 +20,9 @@	3	@@ -20,9 +20,9 @@
4	#include "ui/android/buildflags.h"	4	#include "ui/android/buildflags.h"
Lines 12-27 Link Here
12		12
13	// This file declares strings used in chrome://flags. These messages are not	13	// This file declares strings used in chrome://flags. These messages are not
14	// translated, because instead of end-users they target Chromium developers and	14	// translated, because instead of end-users they target Chromium developers and
15	@@ -2233,7 +2233,7 @@ extern const char kZeroStateFilesDescription[];	15	@@ -2299,7 +2299,7 @@ extern const char kDynamicTcmallocName[];
16
17	#endif // #if defined(OS_CHROMEOS)
18
19	-#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
20	+#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
21	extern const char kTerminalSystemAppName[];
22	extern const char kTerminalSystemAppDescription[];
23
24	@@ -2242,7 +2242,7 @@ extern const char kDynamicTcmallocName[];
25	extern const char kDynamicTcmallocDescription[];	16	extern const char kDynamicTcmallocDescription[];
26	#endif // BUILDFLAG(USE_TCMALLOC)	17	#endif // BUILDFLAG(USE_TCMALLOC)
27		18
Lines 30-36 Link Here
30		21
31	// All views-based platforms --------------------------------------------------	22	// All views-based platforms --------------------------------------------------
32		23
33	@@ -2261,12 +2261,12 @@ extern const char kReopenTabInProductHelpDescription[]	24	@@ -2318,12 +2318,12 @@ extern const char kReopenTabInProductHelpDescription[]
34		25
35	// Random platform combinations -----------------------------------------------	26	// Random platform combinations -----------------------------------------------
36		27
Lines 45-65 Link Here
45		36
46	#if BUILDFLAG(ENABLE_CLICK_TO_CALL)	37	#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
47		38
48	@@ -2278,7 +2278,7 @@ extern const char kClickToCallUIDescription[];	39	@@ -2344,7 +2344,7 @@ extern const char kRemoteCopyReceiverDescription[];
		40	#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\|
		41	// defined(OS_CHROMEOS)
49		42
50	#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
51
52	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	43	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
53	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)	44	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
54		45
55	extern const char kDirectManipulationStylusName[];	46	extern const char kDirectManipulationStylusName[];
56	extern const char kDirectManipulationStylusDescription[];	47	extern const char kDirectManipulationStylusDescription[];
57	@@ -2292,7 +2292,7 @@ extern const char kProfileMenuRevampDescription[];
58	extern const char kSyncClipboardServiceName[];
59	extern const char kSyncClipboardServiceDescription[];
60
61	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
62	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
63
64	#if defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)
65

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (-8 / +8 lines)
1	--- chrome/browser/net/system_network_context_manager.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/net/system_network_context_manager.cc	2	+++ chrome/browser/net/system_network_context_manager.cc
3	@@ -81,11 +81,11 @@	3	@@ -79,11 +79,11 @@
4	#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"	4	#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
5	#endif // defined(OS_CHROMEOS)	5	#endif // defined(OS_CHROMEOS)
6		6
Lines 12-20 Link Here
12	-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)	12	-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
13	+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)	13	+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
14		14
15	#if BUILDFLAG(ENABLE_EXTENSIONS)	15	#if defined(OS_WIN) \|\| defined(OS_MACOSX)
16	#include "extensions/common/constants.h"	16	#include "content/public/common/network_service_util.h"
17	@@ -209,10 +209,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut	17	@@ -211,10 +211,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
18	auth_dynamic_params->enable_negotiate_port =	18	auth_dynamic_params->enable_negotiate_port =
19	local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);	19	local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
20		20
Lines 27-33 Link Here
27		27
28	#if defined(OS_POSIX)	28	#if defined(OS_POSIX)
29	auth_dynamic_params->ntlm_v2_enabled =	29	auth_dynamic_params->ntlm_v2_enabled =
30	@@ -476,10 +476,10 @@ SystemNetworkContextManager::SystemNetworkContextManag	30	@@ -480,10 +480,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
31	pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,	31	pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
32	auth_pref_callback);	32	auth_pref_callback);
33		33
Lines 40-46 Link Here
40		40
41	#if defined(OS_POSIX)	41	#if defined(OS_POSIX)
42	pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);	42	pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
43	@@ -531,10 +531,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe	43	@@ -535,10 +535,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
44	registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());	44	registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
45	registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,	45	registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
46	std::string());	46	std::string());
Lines 53-59 Link Here
53		53
54	#if defined(OS_POSIX)	54	#if defined(OS_POSIX)
55	registry->RegisterBooleanPref(	55	registry->RegisterBooleanPref(
56	@@ -645,7 +645,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea	56	@@ -643,7 +643,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
57	insecure_stub_resolver_enabled, secure_dns_mode,	57	insecure_stub_resolver_enabled, secure_dns_mode,
58	std::move(dns_over_https_servers));	58	std::move(dns_over_https_servers));
59		59

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (-9 / +9 lines)
1	--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc	2	+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
3	@@ -113,7 +113,7 @@	3	@@ -117,7 +117,7 @@
4	#endif	4	#endif
5		5
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
Lines 9-18 Link Here
9	#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"	9	#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
10	#endif	10	#endif
11		11
12	@@ -352,11 +352,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =	12	@@ -357,11 +357,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
13	prefs::kSafeBrowsingSendFilesForMalwareCheck,	13	{ key::kWebComponentsV0Enabled,
14	base::Value::Type::INTEGER	14	prefs::kWebComponentsV0Enabled,
15	},	15	base::Value::Type::BOOLEAN },
16	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)	16	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)
17	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)	17	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
18	{ key::kAuthNegotiateDelegateByKdcPolicy,	18	{ key::kAuthNegotiateDelegateByKdcPolicy,
Lines 23-31 Link Here
23	#if defined(OS_POSIX)	23	#if defined(OS_POSIX)
24	{ key::kNtlmV2Enabled,	24	{ key::kNtlmV2Enabled,
25	prefs::kNtlmV2Enabled,	25	prefs::kNtlmV2Enabled,
26	@@ -1141,7 +1141,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =	26	@@ -1147,7 +1147,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
		27	prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox,
27	base::Value::Type::BOOLEAN },	28	base::Value::Type::BOOLEAN },
28
29	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	29	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
30	- (defined(OS_LINUX) && !defined(OS_CHROMEOS))	30	- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
31	+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)	31	+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
Lines 32-38 Link Here
32	{ key::kAlternativeBrowserPath,	32	{ key::kAlternativeBrowserPath,
33	browser_switcher::prefs::kAlternativeBrowserPath,	33	browser_switcher::prefs::kAlternativeBrowserPath,
34	base::Value::Type::STRING },	34	base::Value::Type::STRING },
35	@@ -1205,7 +1205,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =	35	@@ -1208,7 +1208,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
36	browser_switcher::prefs::kChromeParameters,	36	browser_switcher::prefs::kChromeParameters,
37	base::Value::Type::LIST },	37	base::Value::Type::LIST },
38	#endif	38	#endif

Lines 1-17 Link Here

(-)www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (-22 / +4 lines)
1	--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-12-16 21:51:23 UTC	1	--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-03-03 18:53:51 UTC
2	+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc	2	+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
3	@@ -186,7 +186,7 @@	3	@@ -292,7 +292,7 @@ void ChromeBrowserMainExtraPartsProfiles::
4	#include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"	4	if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore))
5	#endif	5	media_history::MediaHistoryKeyedServiceFactory::GetInstance();
6
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
8	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include "chrome/browser/sync/sync_clipboard_service_factory.h"
10	#endif
11
12	@@ -352,7 +352,7 @@ void ChromeBrowserMainExtraPartsProfiles::
13	MediaGalleriesPreferencesFactory::GetInstance();
14	#endif
15	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
16	- (defined(OS_LINUX) && !defined(OS_CHROMEOS))	7	- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
17	+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)	8	+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
Lines 18-29 Link Here
18	metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();	9	metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
19	#endif	10	#endif
20	ModelTypeStoreServiceFactory::GetInstance();	11	ModelTypeStoreServiceFactory::GetInstance();
21	@@ -415,7 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles::
22	StorageNotificationServiceFactory::GetInstance();
23	#endif
24	suggestions::SuggestionsServiceFactory::GetInstance();
25	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
26	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
27	SyncClipboardServiceFactory::GetInstance();
28	#endif
29	TabRestoreServiceFactory::GetInstance();