Attachment #179266 for bug #215271





PORTNAME=	chromium
PORTVERSION=	55.0.2883.87
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on

LICENSE=	BSD3CLAUSE LGPL21 MPL
LICENSE_COMB=	multi

BUILD_DEPENDS=	gperf:devel/gperf \
		clang39:devel/llvm39 \
		yasm:devel/yasm \
		python:lang/python \
		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
		bash:shells/bash \
		flock:sysutils/flock \
		gperf:devel/gperf \
		yasm:devel/yasm \
		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \

		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib

LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
		libsnappy.so:archivers/snappy \
		libFLAC.so:audio/flac \
		libspeex.so:audio/speex \
		libdbus-1.so:devel/dbus \
		libdbus-glib-1.so:devel/dbus-glib \
		libicuuc.so:devel/icu \
		libjsoncpp.so:devel/jsoncpp \
		libpci.so:devel/libpci \
		libnspr4.so:devel/nspr \
		libre2.so:devel/re2 \
		libcairo.so:graphics/cairo \
		libdrm.so:graphics/libdrm \
		libexif.so:graphics/libexif \
		libpng.so:graphics/png \
		libwebp.so:graphics/webp \
		libavcodec.so:multimedia/ffmpeg \
		libcups.so:print/cups \
		libfreetype.so:print/freetype2 \
		libgnome-keyring.so:security/libgnome-keyring \
		libharfbuzz.so:print/harfbuzz \
		libexif.so:graphics/libexif \
		libfontconfig.so:x11-fonts/fontconfig \
		libgcrypt.so:security/libgcrypt \
		libgnome-keyring.so:security/libgnome-keyring \
		libjsoncpp.so:devel/jsoncpp \
		libnspr4.so:devel/nspr \
		libnss3.so:security/nss \
		libexpat.so:textproc/expat2 \
		libxml2.so:textproc/libxml2 \
		libfontconfig.so:x11-fonts/fontconfig
		libsnappy.so:archivers/snappy \
		libspeechd.so:accessibility/speech-dispatcher \
		libspeex.so:audio/speex \
		libwebp.so:graphics/webp \
		libxml2.so:textproc/libxml2

RUN_DEPENDS=	xdg-open:devel/xdg-utils \
		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf

ONLY_FOR_ARCHS=	i386 amd64
USES=		compiler bison cpe desktop-file-utils execinfo jpeg \

OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
OPTIONS_GROUP_TESTS=	DEBUG TEST

OPTIONS_DEFAULT=	ALSA CODECS DRIVER GCONF KERBEROS
OPTIONS_SUB=		yes

GCONF_USE=	GNOME=gconf2

ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
			alsa-lib>=1.1.1_1:audio/alsa-lib
ALSA_RUN_DEPENDS_OFF=	${BUILD_DEPENDS:M*pulseaudio*}
PULSEAUDIO_BUILD_DEPENDS=	pulseaudio>0:audio/pulseaudio
DRIVER_MAKE_ARGS=chromedriver
TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}


	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
	cd ${WRKSRC} && ${PYTHON_CMD} \
		./build/linux/unbundle/replace_gn_files.py --system-libraries \
		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}

do-configure:
	# GN generator bootstrapping and generating ninja files

Lines 1-4 Link Here

(-)www/chromium/files/patch-BUILD.gn (-1 / +1 lines)
1	--- BUILD.gn.orig 2016-12-01 23:02:04 UTC	1	--- BUILD.gn.orig 2016-12-09 05:04:13 UTC
2	+++ BUILD.gn	2	+++ BUILD.gn
3	@@ -215,7 +215,7 @@ group("both_gn_and_gyp") {	3	@@ -215,7 +215,7 @@ group("both_gn_and_gyp") {
4	]	4	]




--- base/BUILD.gn.orig	2016-12-09 05:04:13 UTC
+++ base/BUILD.gn
@@ -1064,6 +1064,35 @@ component("base") {
     public_deps += [ "//base/allocator:unified_allocator_shim" ]
   }
 

   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos || is_chromecast) {
@@ -1337,7 +1366,7 @@ component("base") {
   }
 
   # Linux.

     if (is_asan || is_lsan || is_msan || is_tsan) {
       # For llvm-sanitizer.
       data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
@@ -1362,7 +1391,7 @@ component("base") {
       "//base/third_party/xdg_user_dirs",
     ]
   } else {

     sources -= [
       "nix/mime_util_xdg.cc",
       "nix/mime_util_xdg.h",
@@ -1378,6 +1407,13 @@ component("base") {
     }
   }
 

   # iOS
   if (is_ios) {
     set_sources_assignment_filter([])
@@ -2137,6 +2173,12 @@ test("base_unittests") {
     set_sources_assignment_filter(sources_assignment_filter)
   }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-base__trace_event__process_memory_dump.h (-3 / +3 lines)
1	--- base/trace_event/process_memory_dump.h.orig 2016-05-25 15:00:55.000000000 -0400	1	--- base/trace_event/process_memory_dump.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/trace_event/process_memory_dump.h 2016-05-27 01:46:53.167565000 -0400	2	+++ base/trace_event/process_memory_dump.h
3	@@ -23,7 +23,7 @@	3	@@ -24,7 +24,7 @@
4		4
5	// Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the	5	// Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
6	// resident memory.	6	// resident memory.

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_allocator_BUILD.gn (-3 / +3 lines)
1	--- base/allocator/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/allocator/BUILD.gn.orig 2016-12-09 05:04:13 UTC
2	+++ base/allocator/BUILD.gn 2016-10-13 04:07:29.886540000 +0300	2	+++ base/allocator/BUILD.gn
3	@@ -330,6 +330,9 @@	3	@@ -333,6 +333,9 @@ if (use_experimental_allocator_shim) {
4	]	4	]
5	} else if (is_linux && use_allocator == "none") {	5	} else if (is_linux && use_allocator == "none") {
6	sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]	6	sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (-1 / +1 lines)
1	--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-12-01 23:02:05 UTC	1	--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc	2	+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
3	@@ -3,19 +3,28 @@	3	@@ -3,19 +3,28 @@
4	// found in the LICENSE file.	4	// found in the LICENSE file.

Lines 1-11 Link Here

(-)www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h (-5 / +5 lines)
1	--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2016-08-13 16:23:28.370905000 +0300	1	--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/allocator/allocator_shim_override_libc_symbols.h 2016-08-13 16:23:33.784774000 +0300	2	+++ base/allocator/allocator_shim_override_libc_symbols.h
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4	#endif	4	#endif
5	#define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_	5	#define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_
6		6
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
9		9
10	#include "base/allocator/allocator_shim_internals.h"	10	#include "base/allocator/allocator_shim_internals.h"
11		11




--- base/allocator/allocator_shim_unittest.cc.orig	2016-12-09 05:04:13 UTC
+++ base/allocator/allocator_shim_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/allocator/allocator_shim.h"

 #include <stdlib.h>
 #include <string.h>
 
@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
   ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);
 
 #if !defined(OS_WIN)

 
   void* posix_memalign_ptr = nullptr;
   int res = posix_memalign(&posix_memalign_ptr, 256, 59);
@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
   ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
   ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
 

 #endif  // OS_WIN
 
   char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));
@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
   ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
 
 #if !defined(OS_WIN)

 
   free(posix_memalign_ptr);
   ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);
@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
   free(valloc_ptr);
   ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_debug_proc__maps__linux.cc (-2 / +2 lines)
1	--- base/debug/proc_maps_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/debug/proc_maps_linux.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/debug/proc_maps_linux.cc 2016-09-05 22:49:53.622055000 +0300	2	+++ base/debug/proc_maps_linux.cc
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4	#include "base/strings/string_split.h"	4	#include "base/strings/string_split.h"
5	#include "build/build_config.h"	5	#include "build/build_config.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc (-1 / +1 lines)
1	--- base/debug/scoped_thread_heap_usage.cc.orig 2016-12-12 23:57:03 UTC	1	--- base/debug/scoped_thread_heap_usage.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/debug/scoped_thread_heap_usage.cc	2	+++ base/debug/scoped_thread_heap_usage.cc
3	@@ -14,11 +14,13 @@	3	@@ -14,11 +14,13 @@
4	#include "base/threading/thread_local_storage.h"	4	#include "base/threading/thread_local_storage.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_debug_stack__trace__posix.cc (-1 / +1 lines)
1	--- base/debug/stack_trace_posix.cc.orig 2016-05-11 19:02:11 UTC	1	--- base/debug/stack_trace_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/debug/stack_trace_posix.cc	2	+++ base/debug/stack_trace_posix.cc
3	@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper {	3	@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper {
4	// for the modules that are loaded in the current process.	4	// for the modules that are loaded in the current process.

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_files_file__path__unittest.cc (-3 / +3 lines)
1	--- base/files/file_path_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/files/file_path_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/files/file_path_unittest.cc 2016-10-25 21:44:53.079388000 +0300	2	+++ base/files/file_path_unittest.cc
3	@@ -1133,7 +1133,7 @@	3	@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_
4	"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },	4	"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
5	};	5	};
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_files_file__path__watcher__kqueue.h (-2 / +2 lines)
1	--- base/files/file_path_watcher_kqueue.h.orig 2016-03-25 13:04:44 UTC	1	--- base/files/file_path_watcher_kqueue.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/files/file_path_watcher_kqueue.h	2	+++ base/files/file_path_watcher_kqueue.h
3	@@ -5,6 +5,10 @@	3	@@ -5,6 +5,10 @@
4	#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_	4	#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
Lines 9-13 Link Here
9	+#include <sys/types.h>	9	+#include <sys/types.h>
10	+#endif	10	+#endif
11	#include <sys/event.h>	11	#include <sys/event.h>
12	#include <vector>
13		12
		13	#include <memory>

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_files_file__util.h (-3 / +3 lines)
1	--- base/files/file_util.h.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/files/file_util.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/files/file_util.h 2016-09-05 23:00:09.940024000 +0300	2	+++ base/files/file_util.h
3	@@ -391,7 +391,7 @@	3	@@ -393,7 +393,7 @@ BASE_EXPORT bool VerifyPathControlledByA
4	// the directory \|path\|, in the number of FilePath::CharType, or -1 on failure.	4	// the directory \|path\|, in the number of FilePath::CharType, or -1 on failure.
5	BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);	5	BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_linux__util.cc (-4 / +4 lines)
1	--- base/linux_util.cc.orig 2016-08-13 05:03:14.838982000 +0300	1	--- base/linux_util.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/linux_util.cc 2016-08-13 05:04:48.912092000 +0300	2	+++ base/linux_util.cc
3	@@ -86,12 +86,14 @@	3	@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
4	"CrOS";	4	"CrOS";
5	#elif defined(OS_ANDROID)	5	#elif defined(OS_ANDROID)
6	"Android";	6	"Android";
Lines 9-15 Link Here
9	#else // if defined(OS_LINUX)	9	#else // if defined(OS_LINUX)
10	"Unknown";	10	"Unknown";
11	#endif	11	#endif
12		12
13	std::string GetLinuxDistro() {	13	std::string GetLinuxDistro() {
14	-#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID)	14	-#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID)
15	+#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)	15	+#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)

Lines 1-8 Link Here

(-)www/chromium/files/patch-base_native__library__posix.cc (-5 / +5 lines)
1	--- base/native_library_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/native_library_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/native_library_posix.cc 2016-10-14 03:14:48.329757000 +0300	2	+++ base/native_library_posix.cc
3	@@ -35,7 +35,7 @@	3	@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio
4	// versions. Crash here to warn developers that they're trying to rely on	4	// further investigation, as it might vary across versions. Crash here to
5	// uncertain behavior.	5	// warn developers that they're trying to rely on uncertain behavior.
6	CHECK(!options.prefer_own_symbols);	6	CHECK(!options.prefer_own_symbols);
7	-#else	7	-#else
8	+#elif !defined(OS_BSD)	8	+#elif !defined(OS_BSD)

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc (-4 / +4 lines)
1	--- base/posix/unix_domain_socket_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/posix/unix_domain_socket_linux.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/posix/unix_domain_socket_linux.cc 2016-09-06 23:39:53.563078000 +0300	2	+++ base/posix/unix_domain_socket_linux.cc
3	@@ -23,6 +23,15 @@	3	@@ -23,6 +23,15 @@
4		4
5	namespace base {	5	namespace base {
Lines 16-22 Link Here
16	const size_t UnixDomainSocket::kMaxFileDescriptors = 16;	16	const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
17		17
18	#if !defined(OS_NACL_NONSFI)	18	#if !defined(OS_NACL_NONSFI)
19	@@ -40,8 +49,14 @@	19	@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o
20		20
21	// static	21	// static
22	bool UnixDomainSocket::EnableReceiveProcessId(int fd) {	22	bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
Lines 31-37 Link Here
31	}	31	}
32	#endif // !defined(OS_NACL_NONSFI)	32	#endif // !defined(OS_NACL_NONSFI)
33		33
34	@@ -147,7 +162,11 @@	34	@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
35	// The PNaCl toolchain for Non-SFI binary build does not support	35	// The PNaCl toolchain for Non-SFI binary build does not support
36	// SCM_CREDENTIALS.	36	// SCM_CREDENTIALS.
37	if (cmsg->cmsg_level == SOL_SOCKET &&	37	if (cmsg->cmsg_level == SOL_SOCKET &&

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc (-1 / +1 lines)
1	--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2016-03-25 13:04:44 UTC	1	--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/posix/unix_domain_socket_linux_unittest.cc	2	+++ base/posix/unix_domain_socket_linux_unittest.cc
3	@@ -2,10 +2,15 @@	3	@@ -2,10 +2,15 @@
4	// Use of this source code is governed by a BSD-style license that can be	4	// Use of this source code is governed by a BSD-style license that can be

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_process_internal__linux.h (-1 / +1 lines)
1	--- base/process/internal_linux.h.orig 2016-03-25 13:04:44 UTC	1	--- base/process/internal_linux.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/internal_linux.h	2	+++ base/process/internal_linux.h
3	@@ -14,6 +14,8 @@	3	@@ -14,6 +14,8 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_launch.cc (-3 / +3 lines)
1	--- base/process/launch.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/launch.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/launch.cc 2016-10-13 04:27:47.136877000 +0300	2	+++ base/process/launch.cc
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
4		4
5	LaunchOptions LaunchOptionsForTest() {	5	LaunchOptions LaunchOptionsForTest() {
6	LaunchOptions options;	6	LaunchOptions options;

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_launch.h (-5 / +5 lines)
1	--- base/process/launch.h.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/launch.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/launch.h 2016-10-13 04:27:24.908534000 +0300	2	+++ base/process/launch.h
3	@@ -138,7 +138,7 @@	3	@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
4	// will be the same as its pid.	4	// will be the same as its pid.
5	bool new_process_group = false;	5	bool new_process_group = false;
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	@@ -151,7 +151,7 @@	12	@@ -151,7 +151,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;
Lines 17-20 Link Here
17	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)	17	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
18		18
19	#if defined(OS_POSIX)	19	#if defined(OS_POSIX)
20	// If non-null, a delegate to be run immediately prior to executing the new	20	// If not empty, launch the specified executable instead of

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_process_launch__posix.cc (-2 / +2 lines)
1	--- base/process/launch_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/launch_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/launch_posix.cc 2016-10-16 15:45:00.730008000 +0300	2	+++ base/process/launch_posix.cc
3	@@ -62,6 +62,7 @@	3	@@ -62,6 +62,7 @@
4	#include <sys/event.h>	4	#include <sys/event.h>
5	#else	5	#else

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_memory.h (-3 / +3 lines)
1	--- base/process/memory.h.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/process/memory.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/memory.h 2016-09-11 01:10:36.394804000 +0300	2	+++ base/process/memory.h
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO
4	// Crash reporting classifies such crashes as OOM.	4	// Crash reporting classifies such crashes as OOM.
5	BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);	5	BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_memory__stubs.cc (-3 / +3 lines)
1	--- base/process/memory_stubs.cc.orig 2016-03-25 13:04:44 UTC	1	--- base/process/memory_stubs.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/memory_stubs.cc	2	+++ base/process/memory_stubs.cc
3	@@ -27,6 +27,8 @@ bool AdjustOOMScore(ProcessId process, i	3	@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t
4	// their respective stdlib function since those functions will return null on a	4	// their respective stdlib function since those functions will return null on a
5	// failure to allocate.	5	// failure to allocate.
6		6
Lines 9-15 Link Here
9	bool UncheckedMalloc(size_t size, void** result) {	9	bool UncheckedMalloc(size_t size, void** result) {
10	*result = malloc(size);	10	*result = malloc(size);
11	return *result != nullptr;	11	return *result != nullptr;
12	@@ -36,5 +38,6 @@ bool UncheckedCalloc(size_t num_items, s	12	@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s
13	*result = calloc(num_items, size);	13	*result = calloc(num_items, size);
14	return *result != nullptr;	14	return *result != nullptr;
15	}	15	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_memory__unittest.cc (-4 / +4 lines)
1	--- base/process/memory_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/memory_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/memory_unittest.cc 2016-10-13 04:32:50.457987000 +0300	2	+++ base/process/memory_unittest.cc
3	@@ -82,10 +82,10 @@	3	@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
4	ASSERT_TRUE(base::allocator::IsAllocatorInitialized());	4	ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
5	}	5	}
6		6
Lines 13-19 Link Here
13	BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \	13	BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
14	!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)	14	!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
15		15
16	@@ -439,5 +439,5 @@	16	@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
17	EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));	17	EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
18	EXPECT_TRUE(value_ == NULL);	18	EXPECT_TRUE(value_ == NULL);
19	}	19	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_process__handle__freebsd.cc (-3 / +3 lines)
1	--- base/process/process_handle_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/process_handle_freebsd.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_handle_freebsd.cc 2016-10-26 19:55:22.341492000 +0300	2	+++ base/process/process_handle_freebsd.cc
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@ namespace base {
4		4
5	ProcessId GetParentProcessId(ProcessHandle process) {	5	ProcessId GetParentProcessId(ProcessHandle process) {
6	struct kinfo_proc info;	6	struct kinfo_proc info;

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_process_process__info__linux.cc (-1 / +1 lines)
1	--- base/process/process_info_linux.cc.orig 2016-03-25 13:04:44 UTC	1	--- base/process/process_info_linux.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_info_linux.cc	2	+++ base/process/process_info_linux.cc
3	@@ -11,10 +11,28 @@	3	@@ -11,10 +11,28 @@
4	#include "base/process/process_handle.h"	4	#include "base/process/process_handle.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-base_process_process__iterator__freebsd.cc (-1 / +1 lines)
1	--- base/process/process_iterator_freebsd.cc.orig 2016-03-25 13:04:44 UTC	1	--- base/process/process_iterator_freebsd.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_iterator_freebsd.cc	2	+++ base/process/process_iterator_freebsd.cc
3	@@ -10,6 +10,10 @@	3	@@ -10,6 +10,10 @@
4	#include <sys/sysctl.h>	4	#include <sys/sysctl.h>

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_process_process__metrics.h (-3 / +3 lines)
1	--- base/process/process_metrics.h.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/process/process_metrics.h.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_metrics.h 2016-10-13 12:58:13.818273000 +0300	2	+++ base/process/process_metrics.h
3	@@ -22,6 +22,12 @@	3	@@ -22,6 +22,12 @@
4	#include "base/values.h"	4	#include "base/values.h"
5	#include "build/build_config.h"	5	#include "build/build_config.h"
Lines 13-19 Link Here
13	#if defined(OS_MACOSX)	13	#if defined(OS_MACOSX)
14	#include <mach/mach.h>	14	#include <mach/mach.h>
15	#include "base/process/port_provider_mac.h"	15	#include "base/process/port_provider_mac.h"
16	@@ -326,13 +332,17 @@	16	@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
17	// CPU-related ticks. Returns -1 on parse error.	17	// CPU-related ticks. Returns -1 on parse error.
18	// Exposed for testing.	18	// Exposed for testing.
19	BASE_EXPORT int ParseProcStatCPU(const std::string& input);	19	BASE_EXPORT int ParseProcStatCPU(const std::string& input);

Lines 1-7 Link Here

(-)www/chromium/files/patch-base_process_process__metrics__freebsd.cc (-4 / +4 lines)
1	--- base/process/process_metrics_freebsd.cc.orig 2016-03-25 13:04:44 UTC	1	--- base/process/process_metrics_freebsd.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_metrics_freebsd.cc	2	+++ base/process/process_metrics_freebsd.cc
3	@@ -12,6 +12,9 @@	3	@@ -13,6 +13,9 @@
4	#include "base/macros.h"	4	#include "base/memory/ptr_util.h"
5	#include "base/sys_info.h"	5	#include "base/sys_info.h"
6		6
7	+#include <unistd.h> /* getpagesize() */	7	+#include <unistd.h> /* getpagesize() */
Lines 10-16 Link Here
10	namespace base {	10	namespace base {
11		11
12	ProcessMetrics::ProcessMetrics(ProcessHandle process)	12	ProcessMetrics::ProcessMetrics(ProcessHandle process)
13	@@ -121,4 +124,23 @@ size_t GetSystemCommitCharge() {	13	@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() {
14	return mem_total - (mem_freepagesize) - (mem_inactivepagesize);	14	return mem_total - (mem_freepagesize) - (mem_inactivepagesize);
15	}	15	}
16		16




--- base/process/process_posix.cc.orig	2016-12-09 05:04:13 UTC
+++ base/process/process_posix.cc
@@ -21,8 +21,18 @@
 #include <sys/event.h>
 #endif
 

 #if !defined(OS_NACL_NONSFI)
 
 bool WaitpidWithTimeout(base::ProcessHandle handle,
@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
   base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
   base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
   if (parent_pid != our_pid) {

   }
 
   int status;
@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro
   return Process(handle);
 }
 

 
 bool Process::IsValid() const {
   return process_ != kNullProcessHandle;
@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim
 bool Process::IsProcessBackgrounded() const {
   // See SetProcessBackgrounded().
   DCHECK(IsValid());

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc (-2 / +2 lines)
1	--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/profiler/stack_sampling_profiler_unittest.cc 2016-10-25 21:31:13.576230000 +0300	2	+++ base/profiler/stack_sampling_profiler_unittest.cc
3	@@ -30,7 +30,7 @@	3	@@ -30,7 +30,7 @@
4	#include <intrin.h>	4	#include <intrin.h>
5	#include <malloc.h>	5	#include <malloc.h>

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_security__unittest.cc (-2 / +2 lines)
1	--- base/security_unittest.cc.orig 2016-05-11 19:02:11 UTC	1	--- base/security_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/security_unittest.cc	2	+++ base/security_unittest.cc
3	@@ -73,7 +73,7 @@ bool IsTcMallocBypassed() {	3	@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
4	// FAILS_ is too clunky.	4	// FAILS_ is too clunky.
5	void OverflowTestsSoftExpectTrue(bool overflow_detected) {	5	void OverflowTestsSoftExpectTrue(bool overflow_detected) {
6	if (!overflow_detected) {	6	if (!overflow_detected) {

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_sys__info__freebsd.cc (-3 / +3 lines)
1	--- base/sys_info_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/sys_info_freebsd.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/sys_info_freebsd.cc 2016-10-13 10:20:37.344204000 +0300	2	+++ base/sys_info_freebsd.cc
3	@@ -12,12 +12,34 @@	3	@@ -12,12 +12,34 @@
4		4
5	namespace base {	5	namespace base {
Lines 39-45 Link Here
39	NOTREACHED();	39	NOTREACHED();
40	return 0;	40	return 0;
41	}	41	}
42	@@ -25,14 +47,24 @@	42	@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory(
43	}	43	}
44		44
45	// static	45	// static

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_sys__info__posix.cc (-4 / +4 lines)
1	--- base/sys_info_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/sys_info_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/sys_info_posix.cc 2016-09-24 01:27:31.548122000 +0300	2	+++ base/sys_info_posix.cc
3	@@ -30,7 +30,7 @@	3	@@ -35,7 +35,7 @@
4		4
5	namespace {	5	namespace {
6		6
Lines 9-15 Link Here
9	int NumberOfProcessors() {	9	int NumberOfProcessors() {
10	// sysconf returns the number of "logical" (not "physical") processors on both	10	// sysconf returns the number of "logical" (not "physical") processors on both
11	// Mac and Linux. So we get the number of max available "logical" processors.	11	// Mac and Linux. So we get the number of max available "logical" processors.
12	@@ -77,7 +77,7 @@	12	@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa
13		13
14	namespace base {	14	namespace base {
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_test_BUILD.gn (-3 / +3 lines)
1	--- base/test/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/test/BUILD.gn.orig 2016-12-09 05:04:13 UTC
2	+++ base/test/BUILD.gn 2016-09-02 23:56:39.647089000 +0300	2	+++ base/test/BUILD.gn
3	@@ -249,7 +249,7 @@	3	@@ -301,7 +301,7 @@ static_library("run_all_base_unittests")
4	]	4	]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_test_launcher_test__launcher.cc (-2 / +2 lines)
1	--- base/test/launcher/test_launcher.cc.orig 2016-05-11 19:02:11 UTC	1	--- base/test/launcher/test_launcher.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/test/launcher/test_launcher.cc	2	+++ base/test/launcher/test_launcher.cc
3	@@ -52,6 +52,10 @@	3	@@ -59,6 +59,10 @@
4	#include "base/win/windows_version.h"	4	#include "base/win/windows_version.h"
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_test_test__file__util__posix.cc (-3 / +3 lines)
1	--- base/test/test_file_util_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/test/test_file_util_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/test/test_file_util_posix.cc 2016-10-25 21:44:27.287523000 +0300	2	+++ base/test/test_file_util_posix.cc
3	@@ -79,7 +79,7 @@	3	@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo
4	return DeleteFile(file, recurse);	4	return DeleteFile(file, recurse);
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_third__party_libevent_BUILD.gn (-3 / +3 lines)
1	--- base/third_party/libevent/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/third_party/libevent/BUILD.gn.orig 2016-12-09 05:04:13 UTC
2	+++ base/third_party/libevent/BUILD.gn 2016-10-12 18:30:43.933710000 +0300	2	+++ base/third_party/libevent/BUILD.gn
3	@@ -29,6 +29,9 @@	3	@@ -29,6 +29,9 @@ static_library("libevent") {
4	} else if (is_linux) {	4	} else if (is_linux) {
5	sources += [ "epoll.c" ]	5	sources += [ "epoll.c" ]
6	include_dirs = [ "linux" ]	6	include_dirs = [ "linux" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_threading_platform__thread__posix.cc (-2 / +2 lines)
1	--- base/threading/platform_thread_posix.cc.orig 2016-05-11 19:02:11 UTC	1	--- base/threading/platform_thread_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/threading/platform_thread_posix.cc	2	+++ base/threading/platform_thread_posix.cc
3	@@ -53,7 +53,7 @@ void* ThreadFunc(void* params) {	3	@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
4	if (!thread_params->joinable)	4	if (!thread_params->joinable)
5	base::ThreadRestrictions::SetSingletonAllowed(false);	5	base::ThreadRestrictions::SetSingletonAllowed(false);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc (-5 / +5 lines)
1	--- base/trace_event/malloc_dump_provider.cc.orig 2016-07-20 22:03:18.000000000 +0300	1	--- base/trace_event/malloc_dump_provider.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/trace_event/malloc_dump_provider.cc 2016-08-14 13:06:10.819247000 +0300	2	+++ base/trace_event/malloc_dump_provider.cc
3	@@ -20,7 +20,7 @@	3	@@ -21,7 +21,7 @@
4	#if defined(OS_MACOSX)	4	#if defined(OS_MACOSX)
5	#include <malloc/malloc.h>	5	#include <malloc/malloc.h>
6	#else	6	#else
Lines 7-11 Link Here
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
9	#endif	9	#endif
10		10	#if defined(OS_WIN)
11	namespace base {	11	#include <windows.h>

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_trace__event_process__memory__dump.cc (-3 / +3 lines)
1	--- base/trace_event/process_memory_dump.cc.orig 2016-05-27 10:29:07.111255000 -0400	1	--- base/trace_event/process_memory_dump.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/trace_event/process_memory_dump.cc 2016-05-27 10:29:28.215964000 -0400	2	+++ base/trace_event/process_memory_dump.cc
3	@@ -83,7 +83,7 @@	3	@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB
4	const size_t kMaxChunkSize = 8 * 1024 * 1024;	4	const size_t kMaxChunkSize = 8 * 1024 * 1024;
5	size_t max_vec_size =	5	size_t max_vec_size =
6	GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);	6	GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);

Lines 1-6 Link Here

(-)www/chromium/files/patch-breakpad_BUILD.gn (-3 / +3 lines)
1	--- breakpad/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- breakpad/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ breakpad/BUILD.gn 2016-09-03 00:07:22.742094000 +0300	2	+++ breakpad/BUILD.gn
3	@@ -420,7 +420,7 @@	3	@@ -468,7 +468,7 @@ if (is_mac) {
4	}	4	}
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_BUILD.gn (-4 / +4 lines)
1	--- build/config/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/config/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/BUILD.gn 2016-10-13 04:42:48.294016000 +0300	2	+++ build/config/BUILD.gn
3	@@ -297,7 +297,7 @@	3	@@ -289,7 +289,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	@@ -411,7 +411,7 @@	12	@@ -403,7 +403,7 @@ config("executable_config") {
13	]	13	]
14	} else if (is_ios) {	14	} else if (is_ios) {
15	configs += [ "//build/config/ios:ios_dynamic_flags" ]	15	configs += [ "//build/config/ios:ios_dynamic_flags" ]




--- build/config/BUILDCONFIG.gn.orig	2016-12-09 05:04:14 UTC
+++ build/config/BUILDCONFIG.gn
@@ -134,12 +134,13 @@ declare_args() {
   is_debug = !is_official_build
 
   # Whether we're a traditional desktop unix.

 
   # Allows the path to a custom target toolchain to be injected as a single
   # argument, and set as the default toolchain.
@@ -183,8 +184,8 @@ if (host_toolchain == "") {
   # TODO(dpranke): Add some sort of assert here that verifies that
   # no toolchain omitted host_toolchain from its toolchain_args().
 

       # TODO(dpranke) - is_clang normally applies only to the target
       # build, and there is no way to indicate that you want to override
       # it for both the target build *and* the host build. Do we need to
@@ -220,7 +221,7 @@ if (target_os == "android") {
   } else {
     _default_toolchain = "//build/toolchain/android:$target_cpu"
   }

   # See comments in build/toolchain/cros/BUILD.gn about board compiles.
   if (is_clang) {
     _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
@@ -340,8 +341,17 @@ if (current_os == "win" || current_os ==
   is_nacl = false
   is_posix = true
   is_win = false

 # =============================================================================
 # SOURCES FILTERS
 # =============================================================================
@@ -410,7 +420,7 @@ if (!is_ios) {
 if (!is_mac && !is_ios) {
   sources_assignment_filter += [ "*.mm" ]
 }

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_allocator.gni (-3 / +3 lines)
1	--- build/config/allocator.gni.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/config/allocator.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/allocator.gni 2016-10-13 10:29:19.634367000 +0300	2	+++ build/config/allocator.gni
3	@@ -44,7 +44,7 @@	3	@@ -44,7 +44,7 @@ assert(use_allocator == "none" \|\| use_al
4	assert(!is_win \|\| use_allocator == "none", "Tcmalloc doesn't work on Windows.")	4	assert(!is_win \|\| use_allocator == "none", "Tcmalloc doesn't work on Windows.")
5		5
6	assert(	6	assert(




--- build/config/clang/BUILD.gn.orig	2016-12-09 05:04:14 UTC
+++ build/config/clang/BUILD.gn
@@ -20,7 +20,7 @@ config("find_bad_constructs") {
         rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
                     root_build_dir),
       ]
-    } else if (is_linux || is_android) {
+    } else if (is_linux || is_bsd || is_android) {

       cflags += [
         "-Xclang",
         "-load",
@@ -37,7 +37,7 @@ config("find_bad_constructs") {
       "find-bad-constructs",
     ]
 
-    if ((is_linux || is_android) && !is_chromecast) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-build_config_compiler_BUILD.gn (-1 / +1 lines)
1	--- build/config/compiler/BUILD.gn.orig 2016-12-01 23:02:05 UTC	1	--- build/config/compiler/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/compiler/BUILD.gn	2	+++ build/config/compiler/BUILD.gn
3	@@ -153,7 +153,7 @@ config("compiler") {	3	@@ -153,7 +153,7 @@ config("compiler") {
4	configs += [ "//build/config/win:compiler" ]	4	configs += [ "//build/config/win:compiler" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_crypto.gni (-3 / +3 lines)
1	--- build/config/crypto.gni.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/crypto.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/crypto.gni 2016-09-03 01:37:11.785915000 +0300	2	+++ build/config/crypto.gni
3	@@ -20,4 +20,4 @@	3	@@ -20,4 +20,4 @@ use_openssl_certs = is_android \|\| is_nac
4		4
5	# True if NSS is used for certificate handling. It is possible to use OpenSSL	5	# True if NSS is used for certificate handling. It is possible to use OpenSSL
6	# for the crypto library, but NSS for the platform certificate library.	6	# for the crypto library, but NSS for the platform certificate library.




--- build/config/features.gni.orig	2016-12-09 05:04:14 UTC
+++ build/config/features.gni
@@ -22,7 +22,7 @@ if (is_android) {
 
 declare_args() {
   # Multicast DNS.

 
   enable_extensions = !is_android && !is_ios
   enable_plugins = (!is_android && !is_ios) || is_chromecast
@@ -97,13 +97,13 @@ declare_args() {
   # libudev usage. This currently only affects the content layer.
   use_udev = is_linux && !is_chromecast
 

+  use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast
 
   # Enable basic printing support and UI.
   enable_basic_printing = !is_chromecast && !is_ios
@@ -135,7 +135,7 @@ use_minikin_hyphenation = is_android
 
 # Enables the use of CDMs in pepper plugins.
 enable_pepper_cdms =

Lines 1-5 Link Here

(-)www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn (-2 / +2 lines)
1	--- build/config/linux/gtk2/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/linux/gtk2/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/linux/gtk2/BUILD.gn 2016-09-02 22:54:36.628597000 +0300	2	+++ build/config/linux/gtk2/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	import("//build/config/linux/pkg_config.gni")	5	import("//build/config/linux/pkg_config.gni")

Lines 1-5 Link Here

(-)www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn (-2 / +2 lines)
1	--- build/config/linux/gtk3/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/linux/gtk3/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/linux/gtk3/BUILD.gn 2016-09-03 01:35:58.974361000 +0300	2	+++ build/config/linux/gtk3/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	import("//build/config/linux/pkg_config.gni")	5	import("//build/config/linux/pkg_config.gni")

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_linux_pkg-config.py (-4 / +4 lines)
1	--- build/config/linux/pkg-config.py.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/linux/pkg-config.py.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/linux/pkg-config.py 2016-09-04 01:43:37.226981000 +0300	2	+++ build/config/linux/pkg-config.py
3	@@ -57,8 +57,12 @@	3	@@ -57,8 +57,12 @@ def SetConfigPath(options):
4	print "You must specify an architecture via -a if using a sysroot."	4	print "You must specify an architecture via -a if using a sysroot."
5	sys.exit(1)	5	sys.exit(1)
6		6
Lines 15-21 Link Here
15	os.environ['PKG_CONFIG_LIBDIR'] = libdir	15	os.environ['PKG_CONFIG_LIBDIR'] = libdir
16	return libdir	16	return libdir
17		17
18	@@ -107,7 +111,7 @@	18	@@ -107,7 +111,7 @@ def main():
19	# If this is run on non-Linux platforms, just return nothing and indicate	19	# If this is run on non-Linux platforms, just return nothing and indicate
20	# success. This allows us to "kind of emulate" a Linux build from other	20	# success. This allows us to "kind of emulate" a Linux build from other
21	# platforms.	21	# platforms.

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_sanitizers_BUILD.gn (-4 / +4 lines)
1	--- build/config/sanitizers/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/sanitizers/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/sanitizers/BUILD.gn 2016-09-03 00:19:39.656881000 +0300	2	+++ build/config/sanitizers/BUILD.gn
3	@@ -280,7 +280,7 @@	3	@@ -405,7 +405,7 @@ config("lsan_flags") {
4		4
5	config("msan_flags") {	5	config("msan_flags") {
6	if (is_msan) {	6	if (is_msan) {
Lines 9-15 Link Here
9	msan_blacklist_path =	9	msan_blacklist_path =
10	rebase_path("//tools/msan/blacklist.txt", root_build_dir)	10	rebase_path("//tools/msan/blacklist.txt", root_build_dir)
11	cflags = [	11	cflags = [
12	@@ -293,7 +293,7 @@	12	@@ -418,7 +418,7 @@ config("msan_flags") {
13		13
14	config("tsan_flags") {	14	config("tsan_flags") {
15	if (is_tsan) {	15	if (is_tsan) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_sanitizers_sanitizers.gni (-3 / +3 lines)
1	--- build/config/sanitizers/sanitizers.gni.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/config/sanitizers/sanitizers.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/sanitizers/sanitizers.gni 2016-10-24 22:57:06.565590000 +0300	2	+++ build/config/sanitizers/sanitizers.gni
3	@@ -53,8 +53,8 @@	3	@@ -53,8 +53,8 @@ declare_args() {
4	# See http://clang.llvm.org/docs/ControlFlowIntegrity.html	4	# See http://clang.llvm.org/docs/ControlFlowIntegrity.html
5	#	5	#
6	# TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.	6	# TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.




--- build/config/ui.gni.orig	2016-12-09 05:04:14 UTC
+++ build/config/ui.gni
@@ -31,7 +31,7 @@ declare_args() {
 
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
   # of a replacement for GDI or GTK.

 
   # True means the UI is built using the "views" framework.
   toolkit_views =
@@ -47,7 +47,7 @@ declare_args() {
   use_xkbcommon = false
 
   # Whether we should use glib, a low level C utility library.

 
   # Indicates if Wayland display server support is enabled.
   enable_wayland_server = is_chromeos
@@ -65,19 +65,19 @@ declare_args() {
 
 # Use GPU accelerated cross process image transport by default on linux builds
 # with the Aura window manager.

Lines 1-5 Link Here

(-)www/chromium/files/patch-build_linux_libpci_BUILD.gn (-7 / +6 lines)
1	--- build/linux/libpci/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/linux/libpci/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/linux/libpci/BUILD.gn 2016-10-29 18:17:51.990988000 +0300	2	+++ build/linux/libpci/BUILD.gn
3	@@ -3,20 +3,36 @@	3	@@ -3,20 +3,36 @@
4	# found in the LICENSE file.	4	# found in the LICENSE file.
5		5
Lines 12-18 Link Here
12	- output_h = "libpci.h"	12	- output_h = "libpci.h"
13	- output_cc = "libpci_loader.cc"	13	- output_cc = "libpci_loader.cc"
14	- header = "<pci/pci.h>"	14	- header = "<pci/pci.h>"
15	-	15	+declare_args() {
		16	+ use_system_libpci = is_bsd
		17	+}
		18
16	- functions = [	19	- functions = [
17	- "pci_alloc",	20	- "pci_alloc",
18	- "pci_init",	21	- "pci_init",
Lines 21-30 Link Here
21	- "pci_fill_info",	24	- "pci_fill_info",
22	- "pci_lookup_name",	25	- "pci_lookup_name",
23	- ]	26	- ]
24	+declare_args() {
25	+ use_system_libpci = is_bsd
26	+}
27	+
28	+if (use_system_libpci) {	27	+if (use_system_libpci) {
29	+ pkg_config("system_libpci") {	28	+ pkg_config("system_libpci") {
30	+ packages = [ "libpci" ]	29	+ packages = [ "libpci" ]

Lines 1-5 Link Here

(-)www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn (-2 / +2 lines)
1	--- build/secondary/third_party/nss/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/secondary/third_party/nss/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/secondary/third_party/nss/BUILD.gn 2016-09-03 00:19:12.999091000 +0300	2	+++ build/secondary/third_party/nss/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	import("//build/config/linux/pkg_config.gni")	5	import("//build/config/linux/pkg_config.gni")




--- build/toolchain/gcc_toolchain.gni.orig	2016-12-09 05:04:14 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/toolchain.gni")
 

 # This template defines a toolchain for something that works like gcc
 # (including clang).
 #
@@ -482,14 +487,23 @@ template("clang_toolchain") {
   }
 
   gcc_toolchain(target_name) {

-    cc = "$prefix/clang"
-    cxx = "$prefix/clang++"
-    ld = cxx
-
-    readelf = "${toolprefix}readelf"
-    ar = "${toolprefix}ar"
-    nm = "${toolprefix}nm"
+    if (is_bsd) {
+      cc = "${toolprefix}clang39"
+      cxx = "${toolprefix}clang++39"

+      cc = "$prefix/clang"
+      cxx = "$prefix/clang++"
+      ld = cxx
 
-    readelf = "${toolprefix}readelf"
-    ar = "${toolprefix}ar"
-    nm = "${toolprefix}nm"
+      readelf = "${toolprefix}readelf"
+      ar = "${toolprefix}ar"
+      nm = "${toolprefix}nm"

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_toolchain_get__concurrent__links.py (-3 / +3 lines)
1	--- build/toolchain/get_concurrent_links.py.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/toolchain/get_concurrent_links.py.orig 2016-12-09 05:04:14 UTC
2	+++ build/toolchain/get_concurrent_links.py 2016-10-13 05:28:45.448027000 +0300	2	+++ build/toolchain/get_concurrent_links.py
3	@@ -45,6 +45,14 @@	3	@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
4	return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))	4	return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
5	except Exception:	5	except Exception:
6	return 0	6	return 0

Lines 1-6 Link Here

(-)www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc (-2 / +2 lines)
1	--- cc/layers/scrollbar_layer_impl_base.cc.orig 2016-03-25 13:04:44 UTC	1	--- cc/layers/scrollbar_layer_impl_base.cc.orig 2016-12-09 05:04:14 UTC
2	+++ cc/layers/scrollbar_layer_impl_base.cc	2	+++ cc/layers/scrollbar_layer_impl_base.cc
3	@@ -181,8 +181,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput	3	@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
4	int thumb_offset = TrackStart();	4	int thumb_offset = TrackStart();
5	if (maximum > 0) {	5	if (maximum > 0) {
6	float ratio = clamped_current_pos / maximum;	6	float ratio = clamped_current_pos / maximum;

Lines 1-6 Link Here

(-)www/chromium/files/patch-cc_trees_property__tree.cc (-4 / +4 lines)
1	--- cc/trees/property_tree.cc.orig 2016-05-27 18:17:35.339678000 -0400	1	--- cc/trees/property_tree.cc.orig 2016-12-09 05:04:14 UTC
2	+++ cc/trees/property_tree.cc 2016-05-27 18:29:09.640334000 -0400	2	+++ cc/trees/property_tree.cc
3	@@ -1488,13 +1488,13 @@	3	@@ -1439,13 +1439,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
4		4
5	gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);	5	gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
6		6
Lines 17-20 Link Here
17	+ return _max_offset;	17	+ return _max_offset;
18	}	18	}
19		19
20	gfx::Size ScrollTree::scroll_clip_layer_bounds(int scroll_node_id) const {	20	void ScrollTree::OnScrollOffsetAnimated(int layer_id,




--- chrome/BUILD.gn.orig	2016-12-09 05:04:14 UTC
+++ chrome/BUILD.gn
@@ -128,7 +128,7 @@ if (!is_android && !is_mac) {
     data = [
       "$root_out_dir/resources.pak",
     ]

       data += [
         "$root_out_dir/chrome_100_percent.pak",
         "$root_out_dir/locales/en-US.pak",
@@ -204,7 +204,7 @@ if (!is_android && !is_mac) {
       sources += [ "app/chrome_exe_main_aura.cc" ]
     }
 

       sources += [
         "app/chrome_dll_resource.h",
         "app/chrome_main.cc",
@@ -1492,7 +1492,7 @@ if (enable_resource_whitelist_generation
   }
 }
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__command__ids.h (-2 / +2 lines)
1	--- chrome/app/chrome_command_ids.h.orig 2016-10-06 04:02:10.000000000 +0300	1	--- chrome/app/chrome_command_ids.h.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/app/chrome_command_ids.h 2016-10-14 06:38:03.530973000 +0300	2	+++ chrome/app/chrome_command_ids.h
3	@@ -75,7 +75,7 @@	3	@@ -75,7 +75,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




--- chrome/app/chrome_main_delegate.cc.orig	2016-12-09 05:04:14 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -116,7 +116,7 @@
 #include "ui/base/x/x11_util.h"  // nogncheck
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)

 #include "components/crash/content/app/breakpad_linux.h"
 #endif
 
@@ -559,7 +559,7 @@ bool ChromeMainDelegate::BasicStartupCom
       std::string format_str =
           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
       if (format_str == "machine") {

       } else if (format_str == "log") {
         format = diagnostics::DiagnosticsWriter::LOG;
       } else {
@@ -609,7 +609,7 @@ bool ChromeMainDelegate::BasicStartupCom
       std::string format_str =
           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
       if (format_str == "machine") {

       } else if (format_str == "human") {
         format = diagnostics::DiagnosticsWriter::HUMAN;
       } else {
@@ -721,7 +721,7 @@ void ChromeMainDelegate::PreSandboxStart
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 

   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
 #endif
 
@@ -851,7 +851,7 @@ void ChromeMainDelegate::PreSandboxStart
   chrome::InitializePDF();
 #endif
 

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

 
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
@@ -979,7 +979,7 @@ bool ChromeMainDelegate::DelaySandboxIni
 #endif
   return process_type == switches::kRelauncherProcess;
 }

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__main__delegate.h (-2 / +2 lines)
1	--- chrome/app/chrome_main_delegate.h.orig 2016-05-11 19:02:13 UTC	1	--- chrome/app/chrome_main_delegate.h.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/app/chrome_main_delegate.h	2	+++ chrome/app/chrome_main_delegate.h
3	@@ -38,7 +38,7 @@ class ChromeMainDelegate : public conten	3	@@ -44,7 +44,7 @@ class ChromeMainDelegate : public conten
4	const std::string& process_type) override;	4	const std::string& process_type) override;
5	bool ShouldSendMachPort(const std::string& process_type) override;	5	bool ShouldSendMachPort(const std::string& process_type) override;
6	bool DelaySandboxInitialization(const std::string& process_type) override;	6	bool DelaySandboxInitialization(const std::string& process_type) override;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_chromium__strings.grd (-2 / +2 lines)
1	--- chrome/app/chromium_strings.grd.orig 2016-05-11 19:02:13 UTC	1	--- chrome/app/chromium_strings.grd.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/app/chromium_strings.grd	2	+++ chrome/app/chromium_strings.grd
3	@@ -948,7 +948,7 @@ Signing in anyway will merge Chromium in	3	@@ -936,7 +936,7 @@ Signing in anyway will merge Chromium in
4	</message>	4	</message>
5		5
6	<!-- ProcessSingleton -->	6	<!-- ProcessSingleton -->




--- chrome/app/generated_resources.grd.orig	2016-12-09 05:04:14 UTC
+++ chrome/app/generated_resources.grd
@@ -6843,7 +6843,7 @@ Keep your key file in a safe place. You 
       <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
           Right-to-left
       </message>

         <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
           Enable Input IME API
         </message>
@@ -10212,7 +10212,7 @@ I don't think this site should be blocke
       <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
         Appearance
       </message>

         <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
           Themes
         </message>
@@ -10220,7 +10220,7 @@ I don't think this site should be blocke
       <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
         Reset to default theme
       </message>

         <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
           Use GTK+ theme
         </message>
@@ -11516,7 +11516,7 @@ Tell us what happened exactly before you
         Set as default
       </message>
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_resources_locale__settings.grd (-2 / +2 lines)
1	--- chrome/app/resources/locale_settings.grd.orig 2016-05-11 19:02:13 UTC	1	--- chrome/app/resources/locale_settings.grd.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/app/resources/locale_settings.grd	2	+++ chrome/app/resources/locale_settings.grd
3	@@ -156,7 +156,7 @@	3	@@ -151,7 +151,7 @@
4	55	4	55
5	</message>	5	</message>
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_BUILD.gn (-1 / +1 lines)
1	--- chrome/browser/BUILD.gn.orig 2016-12-01 23:02:06 UTC	1	--- chrome/browser/BUILD.gn.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/BUILD.gn	2	+++ chrome/browser/BUILD.gn
3	@@ -2105,7 +2105,7 @@ split_static_library("browser") {	3	@@ -2105,7 +2105,7 @@ split_static_library("browser") {
4	deps += [ "//device/udev_linux" ]	4	deps += [ "//device/udev_linux" ]

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_about__flags.cc (-1 / +1 lines)
1	--- chrome/browser/about_flags.cc.orig 2016-12-01 23:02:06 UTC	1	--- chrome/browser/about_flags.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/about_flags.cc	2	+++ chrome/browser/about_flags.cc
3	@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = {	3	@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = {
4	kOsLinux \| kOsCrOS \| kOsWin \| kOsAndroid,	4	kOsLinux \| kOsCrOS \| kOsWin \| kOsAndroid,

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_browser__process__impl.cc (-5 / +5 lines)
1	--- chrome/browser/browser_process_impl.cc.orig 2016-10-06 04:02:11.000000000 +0300	1	--- chrome/browser/browser_process_impl.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/browser_process_impl.cc 2016-10-16 22:35:35.925144000 +0300	2	+++ chrome/browser/browser_process_impl.cc
3	@@ -161,7 +161,7 @@	3	@@ -163,7 +163,7 @@
4	#include "chrome/browser/media/webrtc_log_uploader.h"	4	#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
5	#endif	5	#endif
6		6
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
Lines 9-15 Link Here
9	#include "chrome/browser/memory/tab_manager.h"	9	#include "chrome/browser/memory/tab_manager.h"
10	#endif	10	#endif
11		11
12	@@ -765,7 +765,7 @@	12	@@ -768,7 +768,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
13		13
14	memory::TabManager* BrowserProcessImpl::GetTabManager() {	14	memory::TabManager* BrowserProcessImpl::GetTabManager() {
15	DCHECK(CalledOnValidThread());	15	DCHECK(CalledOnValidThread());

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_browser__process__impl.h (-3 / +3 lines)
1	--- chrome/browser/browser_process_impl.h.orig 2016-10-06 04:02:11.000000000 +0300	1	--- chrome/browser/browser_process_impl.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/browser_process_impl.h 2016-10-16 22:37:41.017296000 +0300	2	+++ chrome/browser/browser_process_impl.h
3	@@ -336,7 +336,7 @@	3	@@ -338,7 +338,7 @@ class BrowserProcessImpl : public Browse
4		4
5	std::unique_ptr<ChromeDeviceClient> device_client_;	5	std::unique_ptr<ChromeDeviceClient> device_client_;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (-4 / +4 lines)
1	--- chrome/browser/chrome_browser_main.cc.orig 2016-05-25 15:00:57.000000000 -0400	1	--- chrome/browser/chrome_browser_main.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/chrome_browser_main.cc 2016-05-27 09:43:16.154885000 -0400	2	+++ chrome/browser/chrome_browser_main.cc
3	@@ -173,7 +173,7 @@	3	@@ -183,7 +183,7 @@
4	#include "chrome/browser/feedback/feedback_profile_observer.h"	4	#include "chrome/browser/feedback/feedback_profile_observer.h"
5	#endif // defined(OS_ANDROID)	5	#endif // defined(OS_ANDROID)
6		6
Lines 9-15 Link Here
9	#include "chrome/browser/first_run/upgrade_util_linux.h"	9	#include "chrome/browser/first_run/upgrade_util_linux.h"
10	#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)	10	#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
11		11
12	@@ -1109,11 +1109,11 @@	12	@@ -1301,11 +1301,11 @@ int ChromeBrowserMainParts::PreCreateThr
13	}	13	}
14	#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)	14	#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (-3 / +3 lines)
1	--- chrome/browser/chrome_browser_main_linux.cc.orig 2016-05-21 16:00:15 UTC	1	--- chrome/browser/chrome_browser_main_linux.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/chrome_browser_main_linux.cc	2	+++ chrome/browser/chrome_browser_main_linux.cc
3	@@ -62,12 +62,14 @@ void ChromeBrowserMainPartsLinux::PrePro	3	@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PrePro
4	void ChromeBrowserMainPartsLinux::PostProfileInit() {	4	void ChromeBrowserMainPartsLinux::PostProfileInit() {
5	ChromeBrowserMainPartsPosix::PostProfileInit();	5	ChromeBrowserMainPartsPosix::PostProfileInit();
6		6
Lines 16-22 Link Here
16	bluez::DBusThreadManagerLinux::Initialize();	16	bluez::DBusThreadManagerLinux::Initialize();
17	bluez::BluezDBusManager::Initialize(	17	bluez::BluezDBusManager::Initialize(
18	bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);	18	bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
19	@@ -77,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PostMa	19	@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMa
20	}	20	}
21		21
22	void ChromeBrowserMainPartsLinux::PostDestroyThreads() {	22	void ChromeBrowserMainPartsLinux::PostDestroyThreads() {




--- chrome/browser/chrome_content_browser_client.cc.orig	2016-12-09 05:04:15 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -219,7 +219,7 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_manager.h"
-#elif defined(OS_LINUX)

 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/chrome_browser_main_android.h"
@@ -231,7 +231,7 @@
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 

 #include "base/debug/leak_annotations.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
@@ -256,7 +256,7 @@
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
 

 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
 #endif
 
@@ -547,7 +547,7 @@ bool CertMatchesFilter(const net::X509Ce
   return false;
 }
 

 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
@@ -875,7 +875,7 @@ content::BrowserMainParts* ChromeContent
   main_parts = new ChromeBrowserMainPartsMac(parameters);
 #elif defined(OS_CHROMEOS)
   main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);

   main_parts = new ChromeBrowserMainPartsLinux(parameters);
 #elif defined(OS_ANDROID)
   main_parts = new ChromeBrowserMainPartsAndroid(parameters);
@@ -891,7 +891,7 @@ content::BrowserMainParts* ChromeContent
   // Construct additional browser parts. Stages are called in the order in
   // which they are added.
 #if defined(TOOLKIT_VIEWS)

   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
 #else
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
@@ -1498,7 +1498,7 @@ void ChromeContentBrowserClient::AppendE
     command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                     client_info->client_id);
   }

+#elif defined(OS_POSIX) && !defined(OS_BSD)
   if (breakpad::IsCrashReporterEnabled()) {
     std::string switch_value;
     std::unique_ptr<metrics::ClientInfo> client_info =
@@ -2807,7 +2807,7 @@ void ChromeContentBrowserClient::GetAddi
   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
   DCHECK(!app_data_path.empty());
 }

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 2016-05-11 19:02:13 UTC	1	--- chrome/browser/chrome_content_browser_client.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/chrome_content_browser_client.h	2	+++ chrome/browser/chrome_content_browser_client.h
3	@@ -272,7 +272,7 @@ class ChromeContentBrowserClient : publi	3	@@ -269,7 +269,7 @@ class ChromeContentBrowserClient : publi
4	int child_process_id,	4	int child_process_id,
5	content::FileDescriptorInfo* mappings,	5	content::FileDescriptorInfo* mappings,
6	std::map<int, base::MemoryMappedFile::Region>* regions) override;	6	std::map<int, base::MemoryMappedFile::Region>* regions) override;

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_defaults.cc (-3 / +3 lines)
1	--- chrome/browser/defaults.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/defaults.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/defaults.cc	2	+++ chrome/browser/defaults.cc
3	@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;	3	@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;
4	const bool kShowOtherBrowsersInAboutMemory = true;	4	const bool kSyncAutoStarts = false;
5	#endif	5	#endif
6		6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc (-1 / +1 lines)
1	--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/diagnostics/diagnostics_writer.cc	2	+++ chrome/browser/diagnostics/diagnostics_writer.cc
3	@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool	3	@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
4	console_->SetColor(color);	4	console_->SetColor(color);

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h (-2 / +2 lines)
1	--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/diagnostics/diagnostics_writer.h	2	+++ chrome/browser/diagnostics/diagnostics_writer.h
3	@@ -18,7 +18,7 @@ class DiagnosticsWriter : public Diagnos	3	@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos
4	public:	4	public:
5	// The type of formatting done by this writer.	5	// The type of formatting done by this writer.
6	enum FormatType {	6	enum FormatType {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (-3 / +3 lines)
1	--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/download/chrome_download_manager_delegate.cc	2	+++ chrome/browser/download/chrome_download_manager_delegate.cc
3	@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDo	3	@@ -772,7 +772,7 @@ void ChromeDownloadManagerDelegate::OnDo
4	target_info->is_filetype_handled_safely)	4	target_info->is_filetype_handled_safely)
5	DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);	5	DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
6		6
Lines 9-15 Link Here
9	if (item->GetOriginalMimeType() == "application/x-x509-user-cert")	9	if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
10	DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);	10	DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
11	#endif	11	#endif
12	@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDo	12	@@ -787,7 +787,7 @@ void ChromeDownloadManagerDelegate::OnDo
13		13
14	bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(	14	bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
15	const base::FilePath& path) {	15	const base::FilePath& path) {




--- chrome/browser/download/download_commands.cc.orig	2016-12-09 05:04:15 UTC
+++ chrome/browser/download/download_commands.cc
@@ -217,7 +217,7 @@ bool DownloadCommands::IsCommandChecked(
       return download_item_->GetOpenWhenComplete() ||
              download_crx_util::IsExtensionDownload(*download_item_);
     case ALWAYS_OPEN_TYPE:

       if (CanOpenPdfInSystemViewer()) {
         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
             download_item_->GetBrowserContext());
@@ -261,7 +261,7 @@ void DownloadCommands::ExecuteCommand(Co
       bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
           download_item_->GetBrowserContext());

       if (CanOpenPdfInSystemViewer()) {
         prefs->SetShouldOpenPdfInSystemReader(!is_checked);
         DownloadItemModel(download_item_)
@@ -374,7 +374,7 @@ Browser* DownloadCommands::GetBrowser() 
   return browser_displayer.browser();
 }
 

 bool DownloadCommands::IsDownloadPdf() const {
   base::FilePath path = download_item_->GetTargetFilePath();
   return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
@@ -391,7 +391,7 @@ bool DownloadCommands::CanOpenPdfInSyste
   return IsDownloadPdf() &&
          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                           : true);

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_download_download__commands.h (-2 / +2 lines)
1	--- chrome/browser/download/download_commands.h.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/download/download_commands.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/download/download_commands.h	2	+++ chrome/browser/download/download_commands.h
3	@@ -42,7 +42,8 @@ class DownloadCommands {	3	@@ -43,7 +43,8 @@ class DownloadCommands {
4	void ExecuteCommand(Command command);	4	void ExecuteCommand(Command command);
5		5
6	#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| \




--- chrome/browser/download/download_prefs.cc.orig	2016-12-09 05:04:15 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -56,7 +56,7 @@ namespace {
 // Consider downloads 'dangerous' if they go to the home directory on Linux and
 // to the desktop on any platform.
 bool DownloadPathIsDangerous(const base::FilePath& download_path) {

   base::FilePath home_dir = base::GetHomeDir();
   if (download_path == home_dir) {
     return true;
@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
                  GetDefaultDownloadDirectoryForProfile()));
 #endif  // defined(OS_CHROMEOS)
 

-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
   should_open_pdf_in_system_reader_ =
       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) ||
       prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs
                                  default_download_path);
   registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                  default_download_path);

   registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
 #endif
 }
@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage
 }
 
 bool DownloadPrefs::IsAutoOpenUsed() const {

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

   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
     return true;
 #endif
@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased
   SaveAutoOpenState();
 }
 

-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
   should_open_pdf_in_system_reader_ = should_open ||
      profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_download_download__prefs.h (-4 / +4 lines)
1	--- chrome/browser/download/download_prefs.h.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/download/download_prefs.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/download/download_prefs.h	2	+++ chrome/browser/download/download_prefs.h
3	@@ -79,7 +79,7 @@ class DownloadPrefs {	3	@@ -80,7 +80,7 @@ class DownloadPrefs {
4	// Disables auto-open based on file extension.	4	// Disables auto-open based on file extension.
5	void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);	5	void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
6		6
Lines 9-15 Link Here
9	// Store the user preference to disk. If \|should_open\| is true, also disable	9	// Store the user preference to disk. If \|should_open\| is true, also disable
10	// the built-in PDF plugin. If \|should_open\| is false, enable the PDF plugin.	10	// the built-in PDF plugin. If \|should_open\| is false, enable the PDF plugin.
11	void SetShouldOpenPdfInSystemReader(bool should_open);	11	void SetShouldOpenPdfInSystemReader(bool should_open);
12	@@ -110,7 +110,7 @@ class DownloadPrefs {	12	@@ -115,7 +115,7 @@ class DownloadPrefs {
13	AutoOpenCompareFunctor> AutoOpenSet;	13	AutoOpenCompareFunctor> AutoOpenSet;
14	AutoOpenSet auto_open_;	14	AutoOpenSet auto_open_;
15		15
Lines 16-20 Link Here
16	-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX)	16	-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX)
17	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)	17	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
18	bool should_open_pdf_in_system_reader_;	18	bool should_open_pdf_in_system_reader_;
		19	bool disable_adobe_version_check_for_tests_;
19	#endif	20	#endif
20

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_download_download__query.cc (-2 / +2 lines)
1	--- chrome/browser/download/download_query.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/download/download_query.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/download/download_query.cc	2	+++ chrome/browser/download/download_query.cc
3	@@ -31,7 +31,11 @@	3	@@ -28,7 +28,11 @@
4	#include "components/url_formatter/url_formatter.h"	4	#include "components/url_formatter/url_formatter.h"
5	#include "content/public/browser/content_browser_client.h"	5	#include "content/public/browser/content_browser_client.h"
6	#include "content/public/browser/download_item.h"	6	#include "content/public/browser/download_item.h"

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 2016-03-25 13:04:45 UTC	1	--- chrome/browser/download/download_shelf_context_menu.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/download/download_shelf_context_menu.cc	2	+++ chrome/browser/download/download_shelf_context_menu.cc
3	@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu:	3	@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu:
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 (-6 / +6 lines)
1	--- chrome/browser/extensions/BUILD.gn.orig 2016-10-06 04:02:11.000000000 +0300	1	--- chrome/browser/extensions/BUILD.gn.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/BUILD.gn 2016-10-13 05:50:49.572236000 +0300	2	+++ chrome/browser/extensions/BUILD.gn
3	@@ -186,7 +186,7 @@	3	@@ -1023,7 +1023,7 @@ static_library("extensions") {
4	sources -= [ "global_shortcut_listener_ozone.cc" ]	4	sources -= [ "global_shortcut_listener_ozone.cc" ]
5	}	5	}
6		6
Lines 9-15 Link Here
9	deps += [ "//build/linux:fontconfig" ]	9	deps += [ "//build/linux:fontconfig" ]
10		10
11	if (use_dbus) {	11	if (use_dbus) {
12	@@ -252,6 +252,12 @@	12	@@ -1104,6 +1104,12 @@ static_library("extensions") {
13	defines += [ "ENABLE_HOTWORDING" ]	13	defines += [ "ENABLE_HOTWORDING" ]
14	}	14	}
15		15
Lines 20-24 Link Here
20	+ }	20	+ }
21	+	21	+
22	if (enable_service_discovery) {	22	if (enable_service_discovery) {
23	sources += rebase_path(	23	sources += [
24	gypi_values.chrome_browser_extensions_service_discovery_sources,	24	"api/gcd_private/gcd_private_api.cc",

Lines 1-8 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc (-3 / +3 lines)
1	--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/activity_log/activity_log.cc	2	+++ chrome/browser/extensions/activity_log/activity_log.cc
3	@@ -39,7 +39,11 @@	3	@@ -48,7 +48,11 @@
4	#include "extensions/browser/extensions_browser_client.h"
5	#include "extensions/common/extension.h"	4	#include "extensions/common/extension.h"
		5	#include "extensions/common/extension_messages.h"
6	#include "extensions/common/one_shot_event.h"	6	#include "extensions/common/one_shot_event.h"
7	+#if defined(OS_BSD)	7	+#if defined(OS_BSD)
8	+#include <re2/re2.h>	8	+#include <re2/re2.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc (-1 / +1 lines)
1	--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2	+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
3	@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe	3	@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe
4	}	4	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h (-2 / +2 lines)
1	--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/api/input_ime/input_ime_api.h	2	+++ chrome/browser/extensions/api/input_ime/input_ime_api.h
3	@@ -27,7 +27,7 @@	3	@@ -28,7 +28,7 @@
4		4
5	#if defined(OS_CHROMEOS)	5	#if defined(OS_CHROMEOS)
6	#include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"	6	#include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc (-4 / +4 lines)
1	--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-07-22 00:06:51.000000000 -0400	1	--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/api/messaging/message_service.cc 2016-08-03 11:20:56.579570000 -0400	2	+++ chrome/browser/extensions/api/messaging/message_service.cc
3	@@ -119,7 +119,7 @@	3	@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message
4		4
5	const char kReceivingEndDoesntExistError[] =	5	const char kReceivingEndDoesntExistError[] =
6	"Could not establish connection. Receiving end does not exist.";	6	"Could not establish connection. Receiving end does not exist.";
Lines 9-15 Link Here
9	const char kMissingPermissionError[] =	9	const char kMissingPermissionError[] =
10	"Access to native messaging requires nativeMessaging permission.";	10	"Access to native messaging requires nativeMessaging permission.";
11	const char kProhibitedByPoliciesError[] =	11	const char kProhibitedByPoliciesError[] =
12	@@ -415,7 +415,7 @@	12	@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative
13	if (!source)	13	if (!source)
14	return;	14	return;
15		15

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc (-1 / +1 lines)
1	--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2	+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
3	@@ -4,6 +4,10 @@	3	@@ -4,6 +4,10 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc (-3 / +3 lines)
1	--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2016-12-16 03:22:03.040835000 +0000	1	--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc 2016-12-16 03:22:24.317714000 +0000	2	+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc
3	@@ -45,7 +45,7 @@	3	@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] =
4	// Pref key for omnibox.setDefaultSuggestion.	4	// Pref key for omnibox.setDefaultSuggestion.
5	const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";	5	const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (-3 / +3 lines)
1	--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2016-12-16 03:24:27.367808000 +0000	1	--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/bookmark_app_helper.cc 2016-12-16 03:24:51.798418000 +0000	2	+++ chrome/browser/extensions/bookmark_app_helper.cc
3	@@ -707,7 +707,7 @@	3	@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallati
4	#if !defined(OS_MACOSX)	4	#if !defined(OS_MACOSX)
5	#if !defined(USE_ASH)	5	#if !defined(USE_ASH)
6	web_app::ShortcutLocations creation_locations;	6	web_app::ShortcutLocations creation_locations;

Lines 1-5 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (-3 / +3 lines)
1	--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-12-01 23:02:07.000000000 +0000	1	--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2016-12-16 19:35:19.489404000 +0000	2	+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
3	@@ -62,7 +62,7 @@	3	@@ -62,7 +62,7 @@
4	#include "chrome/browser/chromeos/extensions/media_player_api.h"	4	#include "chrome/browser/chromeos/extensions/media_player_api.h"
5	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"	5	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
Lines 9-15 Link Here
9	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"	9	#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
10	#endif	10	#endif
11		11
12	@@ -103,7 +103,7 @@	12	@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFac
13	#if defined(OS_CHROMEOS)	13	#if defined(OS_CHROMEOS)
14	extensions::InputImeAPI::GetFactoryInstance();	14	extensions::InputImeAPI::GetFactoryInstance();
15	extensions::InputMethodAPI::GetFactoryInstance();	15	extensions::InputMethodAPI::GetFactoryInstance();

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (-1 / +1 lines)
1	--- chrome/browser/extensions/external_provider_impl.cc.orig 2016-12-01 23:02:07 UTC	1	--- chrome/browser/extensions/external_provider_impl.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/extensions/external_provider_impl.cc	2	+++ chrome/browser/extensions/external_provider_impl.cc
3	@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna	3	@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
4	Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,	4	Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc (-2 / +2 lines)
1	--- chrome/browser/gpu/gl_string_manager.cc.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/gpu/gl_string_manager.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/gpu/gl_string_manager.cc	2	+++ chrome/browser/gpu/gl_string_manager.cc
3	@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() {	3	@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() {
4		4
5	void GLStringManager::Initialize() {	5	void GLStringManager::Initialize() {
6	// On MacOSX or Windows, preliminary GPUInfo is enough.	6	// On MacOSX or Windows, preliminary GPUInfo is enough.

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc (-1 / +1 lines)
1	--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/gpu/gpu_feature_checker.cc	2	+++ chrome/browser/gpu/gpu_feature_checker.cc
3	@@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA	3	@@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA
4	CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));	4	CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc (-3 / +3 lines)
1	--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/interstitials/chrome_controller_client.cc	2	+++ chrome/browser/interstitials/chrome_controller_client.cc
3	@@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() {	3	@@ -56,7 +56,7 @@ void LaunchDateAndTimeSettingsOnFile() {
4	chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),	4	chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
5	sub_page);	5	sub_page);
6		6
Lines 9-15 Link Here
9	struct ClockCommand {	9	struct ClockCommand {
10	const char* pathname;	10	const char* pathname;
11	const char* argument;	11	const char* argument;
12	@@ -138,7 +138,7 @@ void ChromeControllerClient::set_interst	12	@@ -142,7 +142,7 @@ void ChromeControllerClient::set_interst
13		13
14	bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {	14	bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
15	#if defined(OS_ANDROID) \|\| defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| \	15	#if defined(OS_ANDROID) \|\| defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| \

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc (-1 / +1 lines)
1	--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2	+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
3	@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil	3	@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil
4	// Note that this initializes the delegate asynchronously, but since	4	// Note that this initializes the delegate asynchronously, but since

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc (-2 / +2 lines)
1	--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/media_galleries/media_file_system_registry.cc	2	+++ chrome/browser/media_galleries/media_file_system_registry.cc
3	@@ -768,7 +768,10 @@ class MediaFileSystemRegistry::MediaFile	3	@@ -765,7 +765,10 @@ class MediaFileSystemRegistry::MediaFile
4	// Constructor in 'private' section because depends on private class definition.	4	// Constructor in 'private' section because depends on private class definition.
5	MediaFileSystemRegistry::MediaFileSystemRegistry()	5	MediaFileSystemRegistry::MediaFileSystemRegistry()
6	: file_system_context_(new MediaFileSystemContextImpl) {	6	: file_system_context_(new MediaFileSystemContextImpl) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (-1 / +1 lines)
1	--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2016-12-01 23:02:07 UTC	1	--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc	2	+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
3	@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(	3	@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
4	const char product[] = "Chrome_Android";	4	const char product[] = "Chrome_Android";

Lines 1-5 Link Here

(-)www/chromium/files/patch-chrome_browser_memory__details.cc (-3 / +3 lines)
1	--- chrome/browser/memory_details.cc.orig 2016-08-03 22:02:12.000000000 +0300	1	--- chrome/browser/memory_details.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/memory_details.cc 2016-09-30 22:07:01.106885000 +0300	2	+++ chrome/browser/memory_details.cc
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	#include "content/public/common/content_constants.h"	4	#include "content/public/common/content_constants.h"
5	#include "ui/base/l10n/l10n_util.h"	5	#include "ui/base/l10n/l10n_util.h"
Lines 9-15 Link Here
9	#include "content/public/browser/zygote_host_linux.h"	9	#include "content/public/browser/zygote_host_linux.h"
10	#endif	10	#endif
11		11
12	@@ -334,7 +334,7 @@	12	@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUI
13	process.titles.push_back(title);	13	process.titles.push_back(title);
14	}	14	}
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc (-3 / +3 lines)
1	--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc	2	+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
3	@@ -38,12 +38,14 @@	3	@@ -42,12 +42,14 @@
4		4
5	#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	5	#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
6	#include <gnu/libc-version.h>	6	#include <gnu/libc-version.h>
Lines 15-18 Link Here
15	+#endif	15	+#endif
16		16
17	#if defined(USE_OZONE) \|\| defined(USE_X11)	17	#if defined(USE_OZONE) \|\| defined(USE_X11)
18	#include "ui/events/devices/device_data_manager.h"	18	#include "ui/events/devices/input_device_event_observer.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc (-3 / +3 lines)
1	--- chrome/browser/net/async_dns_field_trial.cc.orig 2016-12-16 03:12:55.927001000 +0000	1	--- chrome/browser/net/async_dns_field_trial.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/net/async_dns_field_trial.cc 2016-12-16 03:13:16.445410000 +0000	2	+++ chrome/browser/net/async_dns_field_trial.cc
3	@@ -61,7 +61,7 @@	3	@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour
4	} // namespace	4	} // namespace
5		5
6	bool ConfigureAsyncDnsFieldTrial() {	6	bool ConfigureAsyncDnsFieldTrial() {

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc (-3 / +3 lines)
1	--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/notifications/message_center_notification_manager.cc	2	+++ chrome/browser/notifications/message_center_notification_manager.cc
3	@@ -75,7 +75,7 @@ MessageCenterNotificationManager::Messag	3	@@ -67,7 +67,7 @@ MessageCenterNotificationManager::Messag
4	new FullscreenNotificationBlocker(message_center)));	4	base::MakeUnique<FullscreenNotificationBlocker>(message_center));
5		5
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \
7	- \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))	7	- \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (-4 / +4 lines)
1	--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/password_manager/chrome_password_manager_client.cc	2	+++ chrome/browser/password_manager/chrome_password_manager_client.cc
3	@@ -56,7 +56,11 @@	3	@@ -57,7 +57,11 @@
4	#include "content/public/browser/web_contents.h"	4	#include "content/public/browser/web_contents.h"
5	#include "google_apis/gaia/gaia_urls.h"	5	#include "google_apis/gaia/gaia_urls.h"
6	#include "net/base/url_util.h"	6	#include "net/base/url_util.h"
Lines 10-14 Link Here
10	#include "third_party/re2/src/re2/re2.h"	10	#include "third_party/re2/src/re2/re2.h"
11	+#endif	11	+#endif
12		12
13	#if defined(OS_MACOSX) \|\| BUILDFLAG(ANDROID_JAVA_UI)	13	#if BUILDFLAG(ANDROID_JAVA_UI)
14	#include "chrome/browser/password_manager/save_password_infobar_delegate.h"	14	#include "chrome/browser/android/tab_android.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_platform__util.h (-3 / +3 lines)
1	--- chrome/browser/platform_util.h.orig 2016-08-04 11:19:03.775212000 -0400	1	--- chrome/browser/platform_util.h.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/platform_util.h 2016-08-04 11:19:15.839097000 -0400	2	+++ chrome/browser/platform_util.h
3	@@ -40,7 +40,7 @@	3	@@ -40,7 +40,7 @@ enum OpenOperationResult {
4	enum OpenItemType {	4	enum OpenItemType {
5	OPEN_FILE,	5	OPEN_FILE,
6	OPEN_FOLDER,	6	OPEN_FOLDER,

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc (-1 / +1 lines)
1	--- chrome/browser/plugins/plugins_resource_service.cc.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/plugins/plugins_resource_service.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/plugins/plugins_resource_service.cc	2	+++ chrome/browser/plugins/plugins_resource_service.cc
3	@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() {	3	@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() {
4	std::string filename;	4	std::string filename;

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 2016-05-11 19:02:14 UTC	1	--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/policy/policy_prefs_browsertest.cc	2	+++ chrome/browser/policy/policy_prefs_browsertest.cc
3	@@ -174,6 +174,8 @@ class PolicyTestCase {	3	@@ -175,6 +175,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_process__singleton__posix.cc (-3 / +3 lines)
1	--- chrome/browser/process_singleton_posix.cc.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/process_singleton_posix.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/process_singleton_posix.cc	2	+++ chrome/browser/process_singleton_posix.cc
3	@@ -87,11 +87,11 @@	3	@@ -90,11 +90,11 @@
4	#include "net/base/network_interfaces.h"	4	#include "net/base/network_interfaces.h"
5	#include "ui/base/l10n/l10n_util.h"	5	#include "ui/base/l10n/l10n_util.h"
6		6
Lines 14-20 Link Here
14	#include "ui/views/linux_ui/linux_ui.h"	14	#include "ui/views/linux_ui/linux_ui.h"
15	#endif	15	#endif
16		16
17	@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base	17	@@ -318,7 +318,7 @@ bool DisplayProfileInUseError(const base
18	if (g_disable_prompt)	18	if (g_disable_prompt)
19	return false;	19	return false;
20		20




--- chrome/browser/renderer_preferences_util.cc.orig	2016-12-09 05:04:15 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -18,7 +18,7 @@
 #include "content/public/common/webrtc_ip_handling_policy.h"
 #include "third_party/skia/include/core/SkColor.h"
 

 #include "ui/gfx/font_render_params.h"
 #endif
 
@@ -30,7 +30,7 @@
 #include "ui/base/cocoa/defaults_utils.h"
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)

 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ -132,7 +132,7 @@ void UpdateFromSystemSettings(content::R
     prefs->caret_blink_interval = interval.InSecondsF();
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)

   views::LinuxUI* linux_ui = views::LinuxUI::instance();
   if (linux_ui) {
     if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(content::R
   }
 #endif
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn (-3 / +3 lines)
1	--- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300	1	--- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/resources/safe_browsing/BUILD.gn 2016-09-20 02:51:43.112078000 +0300	2	+++ chrome/browser/resources/safe_browsing/BUILD.gn
3	@@ -26,6 +26,8 @@	3	@@ -29,6 +29,8 @@ action("make_file_types_protobuf") {
4	target_arch = "mac"	4	target_arch = "mac"
5	} else if (is_linux) {	5	} else if (is_linux) {
6	target_arch = "linux"	6	target_arch = "linux"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (-6 / +6 lines)
1	--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-03 22:02:13.000000000 +0300	1	--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-09-20 02:52:27.389763000 +0300	2	+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
3	@@ -39,6 +39,7 @@	3	@@ -41,6 +41,7 @@ def PlatformTypes():
4	"android": config_pb2.DownloadFileType.PLATFORM_ANDROID,	4	"android": config_pb2.DownloadFileType.PLATFORM_ANDROID,
5	"chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS,	5	"chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS,
6	"linux": config_pb2.DownloadFileType.PLATFORM_LINUX,	6	"linux": config_pb2.DownloadFileType.PLATFORM_LINUX,
Lines 8-15 Link Here
8	"mac": config_pb2.DownloadFileType.PLATFORM_MAC,	8	"mac": config_pb2.DownloadFileType.PLATFORM_MAC,
9	"win": config_pb2.DownloadFileType.PLATFORM_WINDOWS,	9	"win": config_pb2.DownloadFileType.PLATFORM_WINDOWS,
10	}	10	}
11	@@ -157,7 +158,7 @@	11	@@ -192,7 +193,7 @@ def main():
12	'fix for http://crbug.com/605592')	12	'Outfile must have a %d for version and %s for platform.')
13	parser.add_option('-t', '--type',	13	parser.add_option('-t', '--type',
14	help='The platform type. One of android, chromeos, ' +	14	help='The platform type. One of android, chromeos, ' +
15	- 'linux, mac, win')	15	- 'linux, mac, win')
Lines 16-19 Link Here
16	+ 'linux, bsd, mac, win')	16	+ 'linux, bsd, mac, win')
17	parser.add_option('-i', '--infile',	17	parser.add_option('-i', '--infile',
18	help='The ASCII DownloadFileType-proto file to read.')	18	help='The ASCII DownloadFileType-proto file to read.')
19	parser.add_option('-o', '--outfile',	19	parser.add_option('-d', '--outdir',

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc (-1 / +1 lines)
1	--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc	2	+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
3	@@ -8,7 +8,12 @@	3	@@ -8,7 +8,12 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc (-3 / +3 lines)
1	--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2016-10-06 04:02:12.000000000 +0300	1	--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/safe_browsing/permission_reporter.cc 2016-10-14 06:15:01.051089000 +0300	2	+++ chrome/browser/safe_browsing/permission_reporter.cc
3	@@ -190,7 +190,7 @@	3	@@ -192,7 +192,7 @@ bool PermissionReporter::BuildReport(con
4	#if defined(OS_ANDROID)	4	#if defined(OS_ANDROID)
5	report.set_platform_type(PermissionReport::ANDROID_PLATFORM);	5	report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
6	#elif defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_CHROMEOS) \|\| \	6	#elif defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_CHROMEOS) \|\| \

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc (-2 / +2 lines)
1	--- chrome/browser/search/local_files_ntp_source.cc.orig 2016-05-11 19:02:15 UTC	1	--- chrome/browser/search/local_files_ntp_source.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/search/local_files_ntp_source.cc	2	+++ chrome/browser/search/local_files_ntp_source.cc
3	@@ -19,8 +19,13 @@	3	@@ -20,8 +20,13 @@
4	#include "chrome/common/url_constants.h"	4	#include "chrome/common/url_constants.h"
5	#include "content/public/browser/browser_thread.h"	5	#include "content/public/browser/browser_thread.h"
6	#include "content/public/browser/url_data_source.h"	6	#include "content/public/browser/url_data_source.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (-3 / +3 lines)
1	--- chrome/browser/sync/chrome_sync_client.cc.orig 2016-05-11 19:02:15 UTC	1	--- chrome/browser/sync/chrome_sync_client.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/sync/chrome_sync_client.cc	2	+++ chrome/browser/sync/chrome_sync_client.cc
3	@@ -554,7 +554,7 @@ void ChromeSyncClient::RegisterDesktopDa	3	@@ -577,7 +577,7 @@ void ChromeSyncClient::RegisterDesktopDa
4	}	4	}
5	#endif	5	#endif
6		6
Lines 8-11 Link Here
8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
9	// Dictionary sync is enabled by default.	9	// Dictionary sync is enabled by default.
10	if (!disabled_types.Has(syncer::DICTIONARY)) {	10	if (!disabled_types.Has(syncer::DICTIONARY)) {
11	sync_service->RegisterDataTypeController(new UIDataTypeController(	11	sync_service->RegisterDataTypeController(

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (-2 / +2 lines)
1	--- chrome/browser/tracing/crash_service_uploader.cc.orig 2016-05-11 19:02:15 UTC	1	--- chrome/browser/tracing/crash_service_uploader.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/tracing/crash_service_uploader.cc	2	+++ chrome/browser/tracing/crash_service_uploader.cc
3	@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUpload	3	@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUpload
4	const char product[] = "Chrome_Android";	4	const char product[] = "Chrome_Android";
5	#elif defined(OS_CHROMEOS)	5	#elif defined(OS_CHROMEOS)
6	const char product[] = "Chrome_ChromeOS";	6	const char product[] = "Chrome_ChromeOS";

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_BUILD.gn (-1 / +1 lines)
1	--- chrome/browser/ui/BUILD.gn.orig 2016-12-01 23:02:08 UTC	1	--- chrome/browser/ui/BUILD.gn.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/BUILD.gn	2	+++ chrome/browser/ui/BUILD.gn
3	@@ -3024,7 +3024,7 @@ split_static_library("ui") {	3	@@ -3024,7 +3024,7 @@ split_static_library("ui") {
4	]	4	]




--- chrome/browser/ui/browser_command_controller.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -80,7 +80,7 @@
 #include "chrome/browser/ui/browser_commands_chromeos.h"
 #endif
 

 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
 #endif
 
@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve
   if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
     return true;
 

   // If this key was registered by the user as a content editing hotkey, then
   // it is not reserved.
   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo
       break;
 #endif
 

     case IDC_USE_SYSTEM_TITLE_BAR: {
       PrefService* prefs = browser_->profile()->GetPrefs();
       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma
   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
 #endif

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (-1 / +1 lines)
1	--- chrome/browser/ui/browser_view_prefs.cc.orig 2016-12-01 23:02:08 UTC	1	--- chrome/browser/ui/browser_view_prefs.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/browser_view_prefs.cc	2	+++ chrome/browser/ui/browser_view_prefs.cc
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4	#include "components/prefs/pref_registry_simple.h"	4	#include "components/prefs/pref_registry_simple.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc (-2 / +2 lines)
1	--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2016-04-08 16:02:07 UTC	1	--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc	2	+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
3	@@ -19,7 +19,7 @@	3	@@ -16,7 +16,7 @@
4		4
5	// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding	5	// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
6	// here.	6	// here.

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 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/input_method/input_method_engine_base.cc	2	+++ chrome/browser/ui/input_method/input_method_engine_base.cc
3	@@ -35,7 +35,7 @@	3	@@ -37,7 +37,7 @@
4	#elif defined(OS_WIN)	4	#elif defined(OS_WIN)
5	#include "ui/events/keycodes/dom/keycode_converter.h"	5	#include "ui/events/keycodes/dom/keycode_converter.h"
6	#include "ui/events/keycodes/keyboard_codes_win.h"	6	#include "ui/events/keycodes/keyboard_codes_win.h"

Lines 1-5 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn (-2 / +2 lines)
1	--- chrome/browser/ui/libgtk2ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300	1	--- chrome/browser/ui/libgtk2ui/BUILD.gn.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/libgtk2ui/BUILD.gn 2016-09-03 00:03:44.741182000 +0300	2	+++ chrome/browser/ui/libgtk2ui/BUILD.gn
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4	# Use of this source code is governed by a BSD-style license that can be	4	# Use of this source code is governed by a BSD-style license that can be
5	# found in the LICENSE file.	5	# found in the LICENSE file.

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (-1 / +1 lines)
1	--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-12-01 23:02:08 UTC	1	--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/startup/startup_browser_creator.cc	2	+++ chrome/browser/ui/startup/startup_browser_creator.cc
3	@@ -91,7 +91,7 @@	3	@@ -91,7 +91,7 @@
4	#include "components/user_manager/user_manager.h"	4	#include "components/user_manager/user_manager.h"

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 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/toolbar/app_menu_model.cc	2	+++ chrome/browser/ui/toolbar/app_menu_model.cc
3	@@ -709,7 +709,7 @@ bool AppMenuModel::IsCommandIdVisible(in	3	@@ -625,7 +625,7 @@ bool AppMenuModel::IsCommandIdVisible(in
4	case IDC_UPGRADE_DIALOG:	4	case IDC_UPGRADE_DIALOG:
5	return browser_defaults::kShowUpgradeMenuItem &&	5	return browser_defaults::kShowUpgradeMenuItem &&
6	UpgradeDetector::GetInstance()->notify_upgrade();	6	UpgradeDetector::GetInstance()->notify_upgrade();

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc (-3 / +3 lines)
1	--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc	2	+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
3	@@ -20,7 +20,7 @@	3	@@ -19,7 +19,7 @@
4	#include "ui/gfx/image/image_skia.h"	4	#include "ui/gfx/image/image_skia.h"
5	#include "ui/views/widget/widget.h"	5	#include "ui/views/widget/widget.h"
6		6
Lines 9-15 Link Here
9	#include "chrome/browser/shell_integration_linux.h"	9	#include "chrome/browser/shell_integration_linux.h"
10	#endif	10	#endif
11		11
12	@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB	12	@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnB
13	const AppWindow::CreateParams& create_params,	13	const AppWindow::CreateParams& create_params,
14	views::Widget::InitParams* init_params,	14	views::Widget::InitParams* init_params,
15	views::Widget* widget) {	15	views::Widget* widget) {




--- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.cc
@@ -57,7 +57,7 @@
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 

 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
@@ -308,7 +308,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
   return GetSmallAppIcon();
 }
 

 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
@@ -447,7 +447,7 @@ void ChromeViewsDelegate::OnBeforeWidget
 #endif
 }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h (-3 / +3 lines)
1	--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/chrome_views_delegate.h	2	+++ chrome/browser/ui/views/chrome_views_delegate.h
3	@@ -35,7 +35,7 @@ class ChromeViewsDelegate : public views	3	@@ -37,7 +37,7 @@ class ChromeViewsDelegate : public views
4	#if defined(OS_WIN)	4	#if defined(OS_WIN)
5	HICON GetDefaultWindowIcon() const override;	5	HICON GetDefaultWindowIcon() const override;
6	HICON GetSmallWindowIcon() const override;	6	HICON GetSmallWindowIcon() const override;
Lines 9-15 Link Here
9	gfx::ImageSkia* GetDefaultWindowIcon() const override;	9	gfx::ImageSkia* GetDefaultWindowIcon() const override;
10	#endif	10	#endif
11		11
12	@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views	12	@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views
13	void OnBeforeWidgetInit(	13	void OnBeforeWidgetInit(
14	views::Widget::InitParams* params,	14	views::Widget::InitParams* params,
15	views::internal::NativeWidgetDelegate* delegate) override;	15	views::internal::NativeWidgetDelegate* delegate) override;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (-3 / +3 lines)
1	--- chrome/browser/ui/views/first_run_dialog.cc.orig 2016-10-06 04:02:13.000000000 +0300	1	--- chrome/browser/ui/views/first_run_dialog.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/first_run_dialog.cc 2016-10-15 10:10:45.850050000 +0300	2	+++ chrome/browser/ui/views/first_run_dialog.cc
3	@@ -35,8 +35,10 @@	3	@@ -40,8 +40,10 @@ using views::GridLayout;
4	namespace {	4	namespace {
5		5
6	void InitCrashReporterIfEnabled(bool enabled) {	6	void InitCrashReporterIfEnabled(bool enabled) {

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc (-4 / +4 lines)
1	--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/browser_frame.cc	2	+++ chrome/browser/ui/views/frame/browser_frame.cc
3	@@ -36,7 +36,7 @@	3	@@ -38,7 +38,7 @@
4	#include "ui/native_theme/native_theme_dark_aura.h"	4	#include "ui/native_theme/native_theme_dark_aura.h" // nogncheck
5	#endif	5	#endif
6		6
7	-#if defined(OS_LINUX)	7	-#if defined(OS_LINUX)
Lines 9-15 Link Here
9	#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"	9	#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
10	#endif	10	#endif
11		11
12	@@ -88,7 +88,7 @@ void BrowserFrame::InitBrowserFrame() {	12	@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
13	non_client_view()->set_context_menu_controller(this);	13	non_client_view()->set_context_menu_controller(this);
14	}	14	}
15		15

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (-4 / +4 lines)
1	--- chrome/browser/ui/views/frame/browser_view.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/frame/browser_view.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/browser_view.cc	2	+++ chrome/browser/ui/views/frame/browser_view.cc
3	@@ -187,7 +187,7 @@	3	@@ -179,7 +179,7 @@
4	#include "content/public/common/mojo_shell_connection.h"	4	#include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
5	#endif	5	#endif
6		6
7	-#if defined(OS_LINUX)	7	-#if defined(OS_LINUX)
Lines 9-15 Link Here
9	#include "ui/native_theme/native_theme_dark_aura.h"	9	#include "ui/native_theme/native_theme_dark_aura.h"
10	#endif	10	#endif
11		11
12	@@ -2017,7 +2017,7 @@ void BrowserView::OnThemeChanged() {	12	@@ -1975,7 +1975,7 @@ void BrowserView::OnThemeChanged() {
13	#if defined(OS_WIN)	13	#if defined(OS_WIN)
14	ui::NativeThemeDarkWin::instance()->NotifyObservers();	14	ui::NativeThemeDarkWin::instance()->NotifyObservers();
15	ui::NativeThemeWin::instance()->NotifyObservers();	15	ui::NativeThemeWin::instance()->NotifyObservers();

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (-3 / +3 lines)
1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
3	@@ -53,7 +53,7 @@	3	@@ -38,7 +38,7 @@
4	#include "ui/views/window/frame_background.h"	4	#include "ui/views/window/frame_background.h"
5	#include "ui/views/window/window_shape.h"	5	#include "ui/views/window/window_shape.h"
6		6
Lines 9-15 Link Here
9	#include "ui/views/controls/menu/menu_runner.h"	9	#include "ui/views/controls/menu/menu_runner.h"
10	#endif	10	#endif
11		11
12	@@ -311,7 +311,7 @@ void OpaqueBrowserFrameView::ButtonPress	12	@@ -293,7 +293,7 @@ void OpaqueBrowserFrameView::ButtonPress
13	void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,	13	void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
14	const gfx::Point& point,	14	const gfx::Point& point,
15	const ui::Event* event) {	15	const ui::Event* event) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc (-1 / +1 lines)
1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc	2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
3	@@ -20,7 +20,7 @@ namespace {	3	@@ -20,7 +20,7 @@ namespace {
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc (-1 / +1 lines)
1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2016-04-08 16:02:08 UTC	1	--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc	2	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
3	@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci	3	@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci
4	return false;	4	return false;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc (-3 / +3 lines)
1	--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc	2	+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
3	@@ -88,7 +88,7 @@ void SystemMenuModelBuilder::BuildSystem	3	@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystem
4	model->AddSeparator(ui::NORMAL_SEPARATOR);	4	model->AddSeparator(ui::NORMAL_SEPARATOR);
5	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);	5	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
6	}	6	}
Lines 9-15 Link Here
9	model->AddSeparator(ui::NORMAL_SEPARATOR);	9	model->AddSeparator(ui::NORMAL_SEPARATOR);
10	model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,	10	model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
11	IDS_SHOW_WINDOW_DECORATIONS_MENU);	11	IDS_SHOW_WINDOW_DECORATIONS_MENU);
12	@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystem	12	@@ -119,7 +119,7 @@ void SystemMenuModelBuilder::BuildSystem
13	model->AddSeparator(ui::NORMAL_SEPARATOR);	13	model->AddSeparator(ui::NORMAL_SEPARATOR);
14	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);	14	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
15	}	15	}

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc (-1 / +1 lines)
1	--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc	2	+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	namespace message_center {	4	namespace message_center {




--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -281,7 +281,7 @@ void TabDragController::Init(
   //     synchronous on desktop Linux, so use that.
   // - Ash
   //     Releasing capture on Ash cancels gestures so avoid it.

   can_release_capture_ = false;
 #endif
   start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
@@ -631,7 +631,7 @@ TabDragController::DragBrowserToNewTabSt
     // that to effect the position of any windows.
     SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
 

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

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc (-3 / +3 lines)
1	--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2016-06-06 21:05:14.000000000 +0200	1	--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/tabs/tab_strip.cc 2016-06-13 22:03:03.000000000 +0200	2	+++ chrome/browser/ui/views/tabs/tab_strip.cc
3	@@ -331,7 +331,7 @@	3	@@ -322,7 +322,7 @@ NewTabButton::NewTabButton(TabStrip* tab
4	: views::ImageButton(listener),	4	: views::ImageButton(listener),
5	tab_strip_(tab_strip),	5	tab_strip_(tab_strip),
6	destroyed_(NULL) {	6	destroyed_(NULL) {




--- chrome/browser/ui/webui/about_ui.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/browser/ui/webui/about_ui.cc
@@ -75,7 +75,7 @@
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "content/public/browser/zygote_host_linux.h"
 #include "content/public/common/sandbox_linux.h"
 #endif
@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref
   DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);
 };
 
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
 std::string AboutLinuxProxyConfig() {
   std::string data;
   AppendHeader(&data, 0,
@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() {
   return data;
 }
 
+#if !defined(OS_BSD)
 void AboutSandboxRow(std::string* data, int name_id, bool good) {
   data->append("<tr><td>");
   data->append(l10n_util::GetStringUTF8(name_id));
@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data, 
   }
   data->append("</td></tr>");
 }
+#endif
 
 std::string AboutSandbox() {
   std::string data;
@@ -683,6 +685,7 @@ std::string AboutSandbox() {
   data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
   data.append("</h1>");
 
+#if !defined(OS_BSD)
   // Get expected sandboxing status of renderers.
   const int status =
       content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
@@ -723,6 +726,7 @@ std::string AboutSandbox() {
     data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
   }
   data.append("</p>");
+#endif
 
   AppendFooter(&data);
   return data;
@@ -787,7 +791,7 @@ void AboutUIHTMLSource::StartDataRequest
   } else if (source_name_ == chrome::kChromeUIDNSHost) {
     AboutDnsHandler::Start(profile(), callback);
     return;

   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
     response = AboutLinuxProxyConfig();
 #endif
@@ -796,7 +800,7 @@ void AboutUIHTMLSource::StartDataRequest
     ChromeOSCreditsHandler::Start(path, callback);
     return;
 #endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (-2 / +2 lines)
1	--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2	+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
3	@@ -275,7 +275,7 @@ bool IsAboutUI(const GURL& url) {	3	@@ -300,7 +300,7 @@ bool IsAboutUI(const GURL& url) {
4	#if !defined(OS_ANDROID)	4	#if !defined(OS_ANDROID)
5	\|\| url.host() == chrome::kChromeUITermsHost	5	\|\| url.host() == chrome::kChromeUITermsHost
6	#endif	6	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc (-2 / +2 lines)
1	--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc	2	+++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc
3	@@ -25,7 +25,11 @@	3	@@ -27,7 +27,11 @@
4	#include "extensions/common/constants.h"	4	#include "extensions/common/constants.h"
5	#include "extensions/common/extension.h"	5	#include "extensions/common/extension.h"
6	#include "extensions/common/manifest_constants.h"	6	#include "extensions/common/manifest_constants.h"




--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -541,13 +541,13 @@ void BrowserOptionsHandler::GetLocalized
     { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
 #endif  // defined(OS_CHROMEOS)
 

 
 #if defined(OS_CHROMEOS) && defined(USE_ASH)
     { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
@@ -790,7 +790,7 @@ void BrowserOptionsHandler::RegisterMess
       "requestProfilesInfo",
       base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                  base::Unretained(this)));

   web_ui()->RegisterMessageCallback(
       "themesSetNative",
       base::Bind(&BrowserOptionsHandler::ThemesSetNative,
@@ -1436,7 +1436,7 @@ void BrowserOptionsHandler::ObserveTheme
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
   bool is_system_theme = false;
 

   bool profile_is_supervised = profile->IsSupervised();
   is_system_theme = theme_service->UsingSystemTheme();
   base::FundamentalValue native_theme_enabled(!is_system_theme &&
@@ -1458,7 +1458,7 @@ void BrowserOptionsHandler::ThemesReset(
   ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
 }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h (-2 / +2 lines)
1	--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/webui/options/browser_options_handler.h	2	+++ chrome/browser/ui/webui/options/browser_options_handler.h
3	@@ -204,7 +204,7 @@ class BrowserOptionsHandler	3	@@ -206,7 +206,7 @@ class BrowserOptionsHandler
4		4
5	void ObserveThemeChanged();	5	void ObserveThemeChanged();
6	void ThemesReset(const base::ListValue* args);	6	void ThemesReset(const base::ListValue* args);

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_web__applications_web__app.cc (-2 / +2 lines)
1	--- chrome/browser/web_applications/web_app.cc.orig 2016-05-11 19:02:17 UTC	1	--- chrome/browser/web_applications/web_app.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/web_applications/web_app.cc	2	+++ chrome/browser/web_applications/web_app.cc
3	@@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationIn	3	@@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationIn
4	}	4	}
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_web__applications_web__app.h (-2 / +2 lines)
1	--- chrome/browser/web_applications/web_app.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/browser/web_applications/web_app.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/web_applications/web_app.h	2	+++ chrome/browser/web_applications/web_app.h
3	@@ -227,7 +227,7 @@ typedef std::vector<WebApplicationInfo::	3	@@ -224,7 +224,7 @@ typedef std::vector<WebApplicationInfo::
4	void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);	4	void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
5	#endif	5	#endif
6		6

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_common_BUILD.gn (-6 / +6 lines)
1	--- chrome/common/BUILD.gn.orig 2016-08-03 22:02:14.000000000 +0300	1	--- chrome/common/BUILD.gn.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/BUILD.gn 2016-09-27 19:17:20.410265000 +0300	2	+++ chrome/common/BUILD.gn
3	@@ -156,6 +156,13 @@	3	@@ -233,6 +233,13 @@ static_library("common") {
4	]	4	public_deps += [ "//ppapi/shared_impl" ]
5	}	5	}
6		6
7	+ if (is_bsd) {	7	+ if (is_bsd) {
Lines 12-16 Link Here
12	+ }	12	+ }
13	+	13	+
14	if (enable_extensions) {	14	if (enable_extensions) {
15	sources += rebase_path(gypi_values.chrome_common_extensions_sources,	15	sources += [
16	".",	16	"cast_messages.cc",




--- chrome/common/chrome_paths.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/common/chrome_paths.cc
@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
         return false;
       break;
     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:

       if (!GetUserDownloadsDirectorySafe(&cur))
         return false;
       break;
@@ -472,10 +472,12 @@ bool PathProvider(int key, base::FilePat
       if (!base::PathExists(cur))  // We don't want to create this
         return false;
       break;

 #else
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
 #endif
@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePat
 #endif
       break;
 

     case chrome::DIR_NATIVE_MESSAGING:
 #if defined(OS_MACOSX)
 #if defined(GOOGLE_CHROME_BUILD)
@@ -540,6 +542,9 @@ bool PathProvider(int key, base::FilePat
 #if defined(GOOGLE_CHROME_BUILD)
       cur = base::FilePath(FILE_PATH_LITERAL(
           "/etc/opt/chrome/native-messaging-hosts"));

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




--- chrome/common/chrome_paths.h.orig	2016-12-09 05:04:16 UTC
+++ chrome/common/chrome_paths.h
@@ -48,7 +48,7 @@ enum {
                                 // to set policies for chrome. This directory
                                 // contains subdirectories.
 #endif
-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \

     defined(OS_MACOSX)
   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                  // on Chrome Mac and Chromium Linux.
@@ -57,7 +57,7 @@ enum {
                                  // create it.
 #endif
 

   DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                        // definition manifest files that
                                        // describe extensions which are to be
@@ -111,7 +111,7 @@ enum {
   DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
                                              // supervised user whitelists are
                                              // installed.

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__paths__internal.h (-1 / +1 lines)
1	--- chrome/common/chrome_paths_internal.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/common/chrome_paths_internal.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/chrome_paths_internal.h	2	+++ chrome/common/chrome_paths_internal.h
3	@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F	3	@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F
4	// Get the path to the user's documents directory.	4	// Get the path to the user's documents directory.

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__switches.cc (-3 / +3 lines)
1	--- chrome/common/chrome_switches.cc.orig 2016-10-06 04:02:14.000000000 +0300	1	--- chrome/common/chrome_switches.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/chrome_switches.cc 2016-10-13 06:11:21.058074000 +0300	2	+++ chrome/common/chrome_switches.cc
3	@@ -1277,7 +1277,7 @@	3	@@ -1288,7 +1288,7 @@ const char kAllowNaClSocketAPI[]
4	const char kEnableWaylandServer[] = "enable-wayland-server";	4	const char kEnableWaylandServer[] = "enable-wayland-server";
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__switches.h (-3 / +3 lines)
1	--- chrome/common/chrome_switches.h.orig 2016-10-06 04:02:14.000000000 +0300	1	--- chrome/common/chrome_switches.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/chrome_switches.h 2016-10-13 06:13:55.604411000 +0300	2	+++ chrome/common/chrome_switches.h
3	@@ -378,7 +378,7 @@	3	@@ -390,7 +390,7 @@ extern const char kAllowNaClSocketAPI[];
4	extern const char kEnableWaylandServer[];	4	extern const char kEnableWaylandServer[];
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (-3 / +3 lines)
1	--- chrome/common/extensions/chrome_extensions_client.cc.orig 2016-12-16 03:27:01.063936000 +0000	1	--- chrome/common/extensions/chrome_extensions_client.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/extensions/chrome_extensions_client.cc 2016-12-16 03:29:25.710522000 +0000	2	+++ chrome/common/extensions/chrome_extensions_client.cc
3	@@ -103,7 +103,10 @@	3	@@ -103,7 +103,10 @@ ChromeChannelForHistogram GetChromeChann
4	static base::LazyInstance<ChromeExtensionsClient> g_client =	4	static base::LazyInstance<ChromeExtensionsClient> g_client =
5	LAZY_INSTANCE_INITIALIZER;	5	LAZY_INSTANCE_INITIALIZER;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_extensions_command.cc (-2 / +2 lines)
1	--- chrome/common/extensions/command.cc.orig 2016-05-11 19:02:17 UTC	1	--- chrome/common/extensions/command.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/extensions/command.cc	2	+++ chrome/common/extensions/command.cc
3	@@ -306,7 +306,7 @@ std::string Command::CommandPlatform() {	3	@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() {
4	return values::kKeybindingPlatformMac;	4	return values::kKeybindingPlatformMac;
5	#elif defined(OS_CHROMEOS)	5	#elif defined(OS_CHROMEOS)
6	return values::kKeybindingPlatformChromeOs;	6	return values::kKeybindingPlatformChromeOs;

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_features.gni (-3 / +3 lines)
1	--- chrome/common/features.gni.orig 2016-10-06 04:02:14.000000000 +0300	1	--- chrome/common/features.gni.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/features.gni 2016-10-13 06:19:10.348914000 +0300	2	+++ chrome/common/features.gni
3	@@ -21,7 +21,7 @@	3	@@ -19,7 +19,7 @@ declare_args() {
4	enable_background = !is_ios && !is_android && !is_chromecast	4	enable_background = !is_ios && !is_android && !is_chromecast
5		5
6	enable_one_click_signin =	6	enable_one_click_signin =




--- chrome/common/pref_names.cc.orig	2016-12-09 05:04:16 UTC
+++ chrome/common/pref_names.cc
@@ -940,7 +940,7 @@ const char kForceSessionSync[] = "settin
 // 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
@@ -1027,7 +1027,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";
@@ -1400,7 +1400,7 @@ const char kDownloadDefaultDirectory[] =
 // upgrade a unsafe location to a safe location.
 const char kDownloadDirUpgraded[] = "download.directory_upgrade";
 

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_common_pref__names.h (-1 / +1 lines)
1	--- chrome/common/pref_names.h.orig 2016-12-01 23:02:09 UTC	1	--- chrome/common/pref_names.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/pref_names.h	2	+++ chrome/common/pref_names.h
3	@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch	3	@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch
4	extern const char kForceYouTubeRestrict[];	4	extern const char kForceYouTubeRestrict[];

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc (-3 / +3 lines)
1	--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2016-05-11 19:02:17 UTC	1	--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2	+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
3	@@ -14,7 +14,7 @@	3	@@ -14,7 +14,7 @@
4	#include "ppapi/proxy/ppapi_messages.h"	4	#include "ppapi/proxy/ppapi_messages.h"
Lines 19-26 Link Here
19	description.face,	19	description.face,
20	description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,	20	description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
21	@@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont	21	@@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont
22	skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault());	22	sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
23	typeface_ = skia::AdoptRef(	23	typeface_ = sk_sp<SkTypeface>(
24	font_mgr->matchFamilyStyle(description.face.c_str(), style));	24	font_mgr->matchFamilyStyle(description.face.c_str(), style));
25	-#endif // defined(OS_LINUX) \|\| defined(OS_OPENBSD)	25	-#endif // defined(OS_LINUX) \|\| defined(OS_OPENBSD)
26	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)	26	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h (-3 / +3 lines)
1	--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/renderer/pepper/pepper_flash_font_file_host.h	2	+++ chrome/renderer/pepper/pepper_flash_font_file_host.h
3	@@ -14,7 +14,7 @@	3	@@ -14,7 +14,7 @@
4	#include "ppapi/c/private/pp_private_font_charset.h"	4	#include "ppapi/c/private/pp_private_font_charset.h"
Lines 8-14 Link Here
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include "base/files/scoped_file.h"	9	#include "base/files/scoped_file.h"
10	#elif defined(OS_WIN)	10	#elif defined(OS_WIN)
11	#include "skia/ext/refptr.h"	11	#include "third_party/skia/include/core/SkRefCnt.h"
12	@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p	12	@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p
13	uint32_t table);	13	uint32_t table);
14	bool GetFontData(uint32_t table, void* buffer, size_t* length);	14	bool GetFontData(uint32_t table, void* buffer, size_t* length);
Lines 17-20 Link Here
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
18	base::ScopedFD fd_;	18	base::ScopedFD fd_;
19	#elif defined(OS_WIN)	19	#elif defined(OS_WIN)
20	skia::RefPtr<SkTypeface> typeface_;	20	sk_sp<SkTypeface> typeface_;

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_test_BUILD.gn (-1 / +1 lines)
1	--- chrome/test/BUILD.gn.orig 2016-12-01 23:02:09 UTC	1	--- chrome/test/BUILD.gn.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/test/BUILD.gn	2	+++ chrome/test/BUILD.gn
3	@@ -179,7 +179,7 @@ static_library("test_support") {	3	@@ -179,7 +179,7 @@ static_library("test_support") {
4	]	4	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (-2 / +2 lines)
1	--- chrome/test/base/in_process_browser_test.cc.orig 2016-05-11 19:02:17 UTC	1	--- chrome/test/base/in_process_browser_test.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/test/base/in_process_browser_test.cc	2	+++ chrome/test/base/in_process_browser_test.cc
3	@@ -90,6 +90,10 @@	3	@@ -92,6 +92,10 @@
4		4
5	namespace {	5	namespace {
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_test_base_testing__browser__process.h (-2 / +2 lines)
1	--- chrome/test/base/testing_browser_process.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/test/base/testing_browser_process.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/test/base/testing_browser_process.h	2	+++ chrome/test/base/testing_browser_process.h
3	@@ -104,8 +104,8 @@ class TestingBrowserProcess : public Bro	3	@@ -105,8 +105,8 @@ class TestingBrowserProcess : public Bro
4	DownloadStatusUpdater* download_status_updater() override;	4	DownloadStatusUpdater* download_status_updater() override;
5	DownloadRequestLimiter* download_request_limiter() override;	5	DownloadRequestLimiter* download_request_limiter() override;
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc (-1 / +1 lines)
1	--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2016-03-25 13:04:46 UTC	1	--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/test/chromedriver/chrome/chrome_finder.cc	2	+++ chrome/test/chromedriver/chrome/chrome_finder.cc
3	@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base	3	@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base
4	installation_locations[i].Append(L"Chromium\\Application"));	4	installation_locations[i].Append(L"Chromium\\Application"));

Lines 1-8 Link Here

(-)www/chromium/files/patch-chromecast_BUILD.gn (-5 / +5 lines)
1	--- chromecast/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300	1	--- chromecast/BUILD.gn.orig 2016-12-09 05:04:17 UTC
2	+++ chromecast/BUILD.gn 2016-09-03 01:38:51.775473000 +0300	2	+++ chromecast/BUILD.gn
3	@@ -44,7 +44,7 @@	3	@@ -50,7 +50,7 @@ cast_test_group("cast_tests") {
4	"//ui/base:ui_base_unittests",	4	tests += [ "//gpu:gpu_unittests" ]
5	]	5	}
6		6
7	- if (is_linux) {	7	- if (is_linux) {
8	+ if (is_linux \|\| is_bsd) {	8	+ if (is_linux \|\| is_bsd) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-chromecast_browser_BUILD.gn (-3 / +3 lines)
1	--- chromecast/browser/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300	1	--- chromecast/browser/BUILD.gn.orig 2016-12-09 05:04:17 UTC
2	+++ chromecast/browser/BUILD.gn 2016-09-03 01:39:34.973425000 +0300	2	+++ chromecast/browser/BUILD.gn
3	@@ -114,7 +114,7 @@	3	@@ -120,7 +120,7 @@ source_set("browser") {
4	"//ui/gl",	4	"//ui/gl",
5	]	5	]
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn (-3 / +3 lines)
1	--- chromecast/browser/metrics/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300	1	--- chromecast/browser/metrics/BUILD.gn.orig 2016-12-09 05:04:17 UTC
2	+++ chromecast/browser/metrics/BUILD.gn 2016-09-03 01:39:05.920888000 +0300	2	+++ chromecast/browser/metrics/BUILD.gn
3	@@ -26,7 +26,7 @@	3	@@ -26,7 +26,7 @@ source_set("metrics") {
4	"//content/public/common",	4	"//content/public/common",
5	]	5	]
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-chromecast_crash_BUILD.gn (-3 / +3 lines)
1	--- chromecast/crash/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300	1	--- chromecast/crash/BUILD.gn.orig 2016-12-09 05:04:17 UTC
2	+++ chromecast/crash/BUILD.gn 2016-09-03 01:38:37.198322000 +0300	2	+++ chromecast/crash/BUILD.gn
3	@@ -48,7 +48,7 @@	3	@@ -78,7 +78,7 @@ source_set("test_support") {
4	]	4	]
5	}	5	}
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_BUILD.gn (-1 / +1 lines)
1	--- components/BUILD.gn.orig 2016-12-01 23:02:10 UTC	1	--- components/BUILD.gn.orig 2016-12-09 05:04:17 UTC
2	+++ components/BUILD.gn	2	+++ components/BUILD.gn
3	@@ -174,8 +174,8 @@ test("components_unittests") {	3	@@ -174,8 +174,8 @@ test("components_unittests") {
4	"//components/certificate_reporting:unit_tests",	4	"//components/certificate_reporting:unit_tests",

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc (-2 / +2 lines)
1	--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2016-05-11 19:02:18 UTC	1	--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2016-12-09 05:04:17 UTC
2	+++ components/autofill/content/renderer/password_form_conversion_utils.cc	2	+++ components/autofill/content/renderer/password_form_conversion_utils.cc
3	@@ -26,7 +26,11 @@	3	@@ -25,7 +25,11 @@
4	#include "third_party/WebKit/public/web/WebFormControlElement.h"	4	#include "third_party/WebKit/public/web/WebFormControlElement.h"
5	#include "third_party/WebKit/public/web/WebFrame.h"	5	#include "third_party/WebKit/public/web/WebFrame.h"
6	#include "third_party/WebKit/public/web/WebInputElement.h"	6	#include "third_party/WebKit/public/web/WebInputElement.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc (-3 / +3 lines)
1	--- components/content_settings/core/browser/website_settings_registry.cc.orig 2016-10-06 04:02:16.000000000 +0300	1	--- components/content_settings/core/browser/website_settings_registry.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/content_settings/core/browser/website_settings_registry.cc 2016-10-13 13:04:35.828985000 +0300	2	+++ components/content_settings/core/browser/website_settings_registry.cc
3	@@ -88,6 +88,9 @@	3	@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin
4	// doesn't allow the settings to be managed in the same way. See	4	// doesn't allow the settings to be managed in the same way. See
5	// crbug.com/642184.	5	// crbug.com/642184.
6	sync_status = WebsiteSettingsInfo::UNSYNCABLE;	6	sync_status = WebsiteSettingsInfo::UNSYNCABLE;

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h (-3 / +3 lines)
1	--- components/content_settings/core/browser/website_settings_registry.h.orig 2016-10-06 04:02:16.000000000 +0300	1	--- components/content_settings/core/browser/website_settings_registry.h.orig 2016-12-09 05:04:18 UTC
2	+++ components/content_settings/core/browser/website_settings_registry.h 2016-10-13 13:24:49.647706000 +0300	2	+++ components/content_settings/core/browser/website_settings_registry.h
3	@@ -36,10 +36,11 @@	3	@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry {
4	PLATFORM_MAC = 1 << 3,	4	PLATFORM_MAC = 1 << 3,
5	PLATFORM_ANDROID = 1 << 4,	5	PLATFORM_ANDROID = 1 << 4,
6	PLATFORM_IOS = 1 << 5,	6	PLATFORM_IOS = 1 << 5,

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_cookie__config_cookie__store__util.cc (-1 / +1 lines)
1	--- components/cookie_config/cookie_store_util.cc.orig 2016-03-25 13:04:47 UTC	1	--- components/cookie_config/cookie_store_util.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/cookie_config/cookie_store_util.cc	2	+++ components/cookie_config/cookie_store_util.cc
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@
4		4

Lines 1-8 Link Here

(-)www/chromium/files/patch-components_crash_content_app_BUILD.gn (-5 / +5 lines)
1	--- components/crash/content/app/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300	1	--- components/crash/content/app/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/crash/content/app/BUILD.gn 2016-09-18 01:39:59.921593000 +0300	2	+++ components/crash/content/app/BUILD.gn
3	@@ -141,7 +141,7 @@	3	@@ -145,7 +145,7 @@ source_set("app_non_mac_win") {
4		4	"//breakpad:breakpad_handler",
5	#'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP)	5	"//sandbox",
6	]	6	]
7	- } else if (is_posix && !is_ios) {	7	- } else if (is_posix && !is_ios) {
8	+ } else if (is_posix && !is_ios && !is_bsd) {	8	+ } else if (is_posix && !is_ios && !is_bsd) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_crash_content_browser_BUILD.gn (-4 / +4 lines)
1	--- components/crash/content/browser/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300	1	--- components/crash/content/browser/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/crash/content/browser/BUILD.gn 2016-09-13 13:38:48.133784000 +0300	2	+++ components/crash/content/browser/BUILD.gn
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@ source_set("browser") {
4		4
5	deps = [	5	deps = [
6	"//base",	6	"//base",
Lines 9-15 Link Here
9	"//components/crash/content/app",	9	"//components/crash/content/app",
10	"//content/public/browser",	10	"//content/public/browser",
11	"//content/public/common",	11	"//content/public/common",
12	@@ -39,7 +39,7 @@	12	@@ -39,7 +39,7 @@ source_set("browser") {
13	# This is not in the GYP build but this target includes breakpad client	13	# This is not in the GYP build but this target includes breakpad client
14	# headers, so add the dependency here.	14	# headers, so add the dependency here.
15	if (is_posix && !is_ios) {	15	if (is_posix && !is_ios) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_drive_drive__api__util.cc (-1 / +1 lines)
1	--- components/drive/drive_api_util.cc.orig 2016-05-11 19:02:18 UTC	1	--- components/drive/drive_api_util.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/drive/drive_api_util.cc	2	+++ components/drive/drive_api_util.cc
3	@@ -22,7 +22,11 @@	3	@@ -22,7 +22,11 @@
4	#include "google_apis/drive/drive_api_parser.h"	4	#include "google_apis/drive/drive_api_parser.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_feedback_anonymizer__tool.cc (-2 / +2 lines)
1	--- components/feedback/anonymizer_tool.cc.orig 2016-05-11 19:02:18 UTC	1	--- components/feedback/anonymizer_tool.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/feedback/anonymizer_tool.cc	2	+++ components/feedback/anonymizer_tool.cc
3	@@ -9,7 +9,11 @@	3	@@ -10,7 +10,11 @@
4	#include "base/strings/string_number_conversions.h"	4	#include "base/strings/string_number_conversions.h"
5	#include "base/strings/string_util.h"	5	#include "base/strings/string_util.h"
6	#include "base/strings/stringprintf.h"	6	#include "base/strings/stringprintf.h"

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 2016-03-25 13:04:47 UTC	1	--- components/flags_ui/flags_state.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/flags_ui/flags_state.cc	2	+++ components/flags_ui/flags_state.cc
3	@@ -450,7 +450,7 @@ int FlagsState::GetCurrentPlatform() {	3	@@ -544,7 +544,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 (-3 / +3 lines)
1	--- components/gcm_driver/gcm_client.h.orig 2016-10-06 04:02:16.000000000 +0300	1	--- components/gcm_driver/gcm_client.h.orig 2016-12-09 05:04:18 UTC
2	+++ components/gcm_driver/gcm_client.h 2016-10-13 13:05:38.414560000 +0300	2	+++ components/gcm_driver/gcm_client.h
3	@@ -80,6 +80,7 @@	3	@@ -80,6 +80,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 (-3 / +3 lines)
1	--- components/gcm_driver/gcm_client_impl.cc.orig 2016-10-06 04:02:16.000000000 +0300	1	--- components/gcm_driver/gcm_client_impl.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/gcm_driver/gcm_client_impl.cc 2016-10-13 13:07:14.340338000 +0300	2	+++ components/gcm_driver/gcm_client_impl.cc
3	@@ -137,6 +137,9 @@	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_json__schema_json__schema__validator.cc (-2 / +2 lines)
1	--- components/json_schema/json_schema_validator.cc.orig 2016-05-11 19:02:18 UTC	1	--- components/json_schema/json_schema_validator.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/json_schema/json_schema_validator.cc	2	+++ components/json_schema/json_schema_validator.cc
3	@@ -20,7 +20,11 @@	3	@@ -21,7 +21,11 @@
4	#include "base/strings/stringprintf.h"	4	#include "base/strings/stringprintf.h"
5	#include "base/values.h"	5	#include "base/values.h"
6	#include "components/json_schema/json_schema_constants.h"	6	#include "components/json_schema/json_schema_constants.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc (-1 / +1 lines)
1	--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-03-25 13:04:47 UTC	1	--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/keyed_service/core/dependency_graph_unittest.cc	2	+++ components/keyed_service/core/dependency_graph_unittest.cc
3	@@ -9,7 +9,11 @@	3	@@ -9,7 +9,11 @@
4	#include "components/keyed_service/core/dependency_graph.h"	4	#include "components/keyed_service/core/dependency_graph.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_metrics_BUILD.gn (-1 / +1 lines)
1	--- components/metrics/BUILD.gn.orig 2016-12-12 20:38:32 UTC	1	--- components/metrics/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/metrics/BUILD.gn	2	+++ components/metrics/BUILD.gn
3	@@ -107,6 +107,13 @@ static_library("metrics") {	3	@@ -107,6 +107,13 @@ static_library("metrics") {
4	if (is_win) {	4	if (is_win) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc (-1 / +1 lines)
1	--- components/metrics/drive_metrics_provider_linux.cc.orig 2016-03-25 13:04:47 UTC	1	--- components/metrics/drive_metrics_provider_linux.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/metrics/drive_metrics_provider_linux.cc	2	+++ components/metrics/drive_metrics_provider_linux.cc
3	@@ -4,7 +4,13 @@	3	@@ -4,7 +4,13 @@
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc (-1 / +1 lines)
1	--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2016-03-25 13:04:47 UTC	1	--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/metrics/system_memory_stats_recorder_linux.cc	2	+++ components/metrics/system_memory_stats_recorder_linux.cc
3	@@ -30,6 +30,7 @@ namespace metrics {	3	@@ -30,6 +30,7 @@ namespace metrics {
4	UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)	4	UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_neterror_resources_neterror.js (-2 / +2 lines)
1	--- components/neterror/resources/neterror.js.orig 2016-05-11 19:02:18 UTC	1	--- components/neterror/resources/neterror.js.orig 2016-12-09 05:04:18 UTC
2	+++ components/neterror/resources/neterror.js	2	+++ components/neterror/resources/neterror.js
3	@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings	3	@@ -147,7 +147,7 @@ function setUpCachedButton(buttonStrings
4	}	4	}
5		5
6	var primaryControlOnLeft = true;	6	var primaryControlOnLeft = true;

Lines 1-5 Link Here

(-)www/chromium/files/patch-components_os__crypt_os__crypt.h (-2 / +2 lines)
1	--- components/os_crypt/os_crypt.h.orig 2016-10-06 04:02:17.000000000 +0300	1	--- components/os_crypt/os_crypt.h.orig 2016-12-09 05:04:18 UTC
2	+++ components/os_crypt/os_crypt.h 2016-10-13 11:41:26.429931000 +0300	2	+++ components/os_crypt/os_crypt.h
3	@@ -13,7 +13,7 @@	3	@@ -13,7 +13,7 @@
4	#include "base/strings/string16.h"	4	#include "base/strings/string16.h"
5	#include "build/build_config.h"	5	#include "build/build_config.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc (-1 / +1 lines)
1	--- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-03-25 13:04:48 UTC	1	--- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/password_manager/core/browser/import/csv_reader.cc	2	+++ components/password_manager/core/browser/import/csv_reader.cc
3	@@ -9,7 +9,11 @@	3	@@ -9,7 +9,11 @@
4	#include "base/logging.h"	4	#include "base/logging.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_plugins_renderer_BUILD.gn (-4 / +4 lines)
1	--- components/plugins/renderer/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300	1	--- components/plugins/renderer/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/plugins/renderer/BUILD.gn 2016-09-26 06:14:10.664010000 +0300	2	+++ components/plugins/renderer/BUILD.gn
3	@@ -25,6 +25,7 @@	3	@@ -25,6 +25,7 @@ static_library("renderer") {
4	}	4	}
5		5
6	deps = [	6	deps = [
Lines 8-14 Link Here
8	"//content/public/child",	8	"//content/public/child",
9	"//content/public/common",	9	"//content/public/common",
10	"//content/public/renderer",	10	"//content/public/renderer",
11	@@ -33,6 +34,5 @@	11	@@ -33,6 +34,5 @@ static_library("renderer") {
12	"//third_party/WebKit/public:blink",	12	"//third_party/WebKit/public:blink",
13	"//third_party/re2",	13	"//third_party/re2",
14	"//ui/base",	14	"//ui/base",

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc (-1 / +1 lines)
1	--- components/plugins/renderer/plugin_placeholder.cc.orig 2016-03-25 13:04:48 UTC	1	--- components/plugins/renderer/plugin_placeholder.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/plugins/renderer/plugin_placeholder.cc	2	+++ components/plugins/renderer/plugin_placeholder.cc
3	@@ -11,7 +11,11 @@	3	@@ -11,7 +11,11 @@
4	#include "gin/object_template_builder.h"	4	#include "gin/object_template_builder.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_policy_BUILD.gn (-3 / +3 lines)
1	--- components/policy/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300	1	--- components/policy/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/policy/BUILD.gn 2016-09-03 01:58:22.866259000 +0300	2	+++ components/policy/BUILD.gn
3	@@ -141,7 +141,7 @@	3	@@ -109,7 +109,7 @@ if (enable_configuration_policy) {
4	if (is_android) {	4	if (is_android) {
5	outputs += policy_templates_android_outputs	5	outputs += policy_templates_android_outputs
6	}	6	}

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_policy_core_common_schema.cc (-1 / +1 lines)
1	--- components/policy/core/common/schema.cc.orig 2016-05-11 19:02:18 UTC	1	--- components/policy/core/common/schema.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/policy/core/common/schema.cc	2	+++ components/policy/core/common/schema.cc
3	@@ -21,7 +21,11 @@	3	@@ -21,7 +21,11 @@
4	#include "components/json_schema/json_schema_constants.h"	4	#include "components/json_schema/json_schema_constants.h"




--- components/policy/resources/policy_templates.json.orig	2016-12-09 05:04:18 UTC
+++ components/policy/resources/policy_templates.json
@@ -932,7 +932,7 @@
           'name': 'RemoteAccessHostMatchUsername',
           'type': 'main',
           'schema': { 'type': 'boolean' },

           'features': {
             'dynamic_refresh': True,
             'per_profile': False,
@@ -2056,7 +2056,7 @@
           'name': 'GSSAPILibraryName',
           'type': 'string',
           'schema': { 'type': 'string' },

           'features': {
             'dynamic_refresh': False,
             'per_profile': False,
@@ -4733,7 +4733,7 @@
       'name': 'RequireOnlineRevocationChecksForLocalAnchors',
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'dynamic_refresh': True,
         'per_profile': False,
@@ -5618,7 +5618,7 @@
       'name': 'BackgroundModeEnabled',
       'type': 'main',
       'schema': { 'type': 'boolean' },

       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -6141,7 +6141,7 @@
       'name': 'FullscreenAllowed',
       '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 2016-08-03 22:02:16.000000000 +0300	1	--- components/policy/tools/generate_policy_source.py.orig 2016-12-09 05:04:18 UTC
2	+++ components/policy/tools/generate_policy_source.py 2016-09-20 17:13:04.971596000 +0300	2	+++ components/policy/tools/generate_policy_source.py
3	@@ -102,7 +102,7 @@	3	@@ -102,7 +102,7 @@ class PolicyDetails:
4	if platform.startswith('chrome.'):	4	if platform.startswith('chrome.'):
5	platform_sub = platform[7:]	5	platform_sub = platform[7:]
6	if platform_sub == '*':	6	if platform_sub == '*':

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_storage__monitor_BUILD.gn (-1 / +1 lines)
1	--- components/storage_monitor/BUILD.gn.orig 2016-12-01 23:02:12 UTC	1	--- components/storage_monitor/BUILD.gn.orig 2016-12-09 05:04:18 UTC
2	+++ components/storage_monitor/BUILD.gn	2	+++ components/storage_monitor/BUILD.gn
3	@@ -65,6 +65,21 @@ static_library("storage_monitor") {	3	@@ -65,6 +65,21 @@ static_library("storage_monitor") {
4	]	4	]

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_storage__monitor_storage__monitor.cc (-1 / +1 lines)
1	--- components/storage_monitor/storage_monitor.cc.orig 2016-12-01 23:02:12 UTC	1	--- components/storage_monitor/storage_monitor.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/storage_monitor/storage_monitor.cc	2	+++ components/storage_monitor/storage_monitor.cc
3	@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:	3	@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc (-1 / +1 lines)
1	--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2016-05-20 17:18:26 UTC	1	--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-01-24 00:07:06 UTC
2	+++ components/storage_monitor/storage_monitor_freebsd.cc	2	+++ components/storage_monitor/storage_monitor_freebsd.cc
3	@@ -0,0 +1,101 @@	3	@@ -0,0 +1,101 @@
4	+// Copyright 2014 The Chromium Authors. All rights reserved.	4	+// Copyright 2014 The Chromium Authors. All rights reserved.

Lines 1-5 Link Here

(-)www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h (-2 / +2 lines)
1	--- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-08-04 10:46:30.556442000 -0400	1	--- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-01-24 00:07:06 UTC
2	+++ components/storage_monitor/storage_monitor_freebsd.h 2016-08-04 14:57:59.255434000 -0400	2	+++ components/storage_monitor/storage_monitor_freebsd.h
3	@@ -0,0 +1,45 @@	3	@@ -0,0 +1,45 @@
4	+// Copyright 2014 The Chromium Authors. All rights reserved.	4	+// Copyright 2014 The Chromium Authors. All rights reserved.
5	+// Use of this source code is governed by a BSD-style license that can be	5	+// Use of this source code is governed by a BSD-style license that can be

Lines 1-5 Link Here

(-)www/chromium/files/patch-components_sync_base_get__session__name__linux.cc (-3 / +3 lines)
1	--- components/sync/base/get_session_name_linux.cc.orig 2016-10-06 04:02:17.000000000 +0300	1	--- components/sync/base/get_session_name_linux.cc.orig 2016-12-09 05:04:18 UTC
2	+++ components/sync/base/get_session_name_linux.cc 2016-10-13 13:40:16.075193000 +0300	2	+++ components/sync/base/get_session_name_linux.cc
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	#include "components/sync/base/get_session_name_linux.h"	5	#include "components/sync/base/get_session_name_linux.h"
Lines 9-15 Link Here
9	#include <unistd.h> // for gethostname()	9	#include <unistd.h> // for gethostname()
10		10
11	#include "base/linux_util.h"	11	#include "base/linux_util.h"
12	@@ -13,8 +13,8 @@	12	@@ -13,8 +13,8 @@ namespace syncer {
13	namespace internal {	13	namespace internal {
14		14
15	std::string GetHostname() {	15	std::string GetHostname() {

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_update__client_update__query__params.cc (-1 / +1 lines)
1	--- components/update_client/update_query_params.cc.orig 2016-05-11 19:02:20 UTC	1	--- components/update_client/update_query_params.cc.orig 2016-12-09 05:04:19 UTC
2	+++ components/update_client/update_query_params.cc	2	+++ components/update_client/update_query_params.cc
3	@@ -31,6 +31,8 @@ const char kOs[] =	3	@@ -31,6 +31,8 @@ const char kOs[] =
4	"linux";	4	"linux";

Lines 1-8 Link Here

(-)www/chromium/files/patch-components_url__formatter_url__formatter.cc (-3 / +3 lines)
1	https://chromium.googlesource.com/chromium/src.git/+/424584b4984bde7c831f42e9fb47f1ad583a1c46%5E%21/	1	https://chromium.googlesource.com/chromium/src.git/+/424584b4984bde7c831f42e9fb47f1ad583a1c46%5E%21/
2		2
3	--- components/url_formatter/url_formatter.cc.orig 2016-08-03 19:02:17 UTC	3	--- components/url_formatter/url_formatter.cc.orig 2016-12-09 05:04:19 UTC
4	+++ components/url_formatter/url_formatter.cc	4	+++ components/url_formatter/url_formatter.cc
5	@@ -429,9 +429,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS	5	@@ -428,9 +428,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS
6	// section at	6	// section at
7	// http://www.unicode.org/Public/security/latest/xidmodifications.txt) are	7	// http://www.unicode.org/Public/security/latest/xidmodifications.txt) are
8	// are added to the allowed set. The list has to be updated when a new	8	// are added to the allowed set. The list has to be updated when a new
Lines 15-21 Link Here
15	const icu::UnicodeSet aspirational_scripts(	15	const icu::UnicodeSet aspirational_scripts(
16	icu::UnicodeString(	16	icu::UnicodeString(
17	// Unified Canadian Syllabics	17	// Unified Canadian Syllabics
18	@@ -445,13 +445,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS	18	@@ -444,13 +444,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS
19	// Yi	19	// Yi
20	"\\uA000-\\uA48C"	20	"\\uA000-\\uA48C"
21	// Miao	21	// Miao

Lines 1-4 Link Here

(-)www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc (-1 / +1 lines)
1	--- components/url_matcher/regex_set_matcher.cc.orig 2016-03-25 13:04:48 UTC	1	--- components/url_matcher/regex_set_matcher.cc.orig 2016-12-09 05:04:19 UTC
2	+++ components/url_matcher/regex_set_matcher.cc	2	+++ components/url_matcher/regex_set_matcher.cc
3	@@ -10,8 +10,13 @@	3	@@ -10,8 +10,13 @@
4	#include "base/stl_util.h"	4	#include "base/stl_util.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc (-2 / +2 lines)
1	--- components/url_matcher/url_matcher_factory.cc.orig 2016-05-11 19:02:20 UTC	1	--- components/url_matcher/url_matcher_factory.cc.orig 2016-12-09 05:04:19 UTC
2	+++ components/url_matcher/url_matcher_factory.cc	2	+++ components/url_matcher/url_matcher_factory.cc
3	@@ -15,7 +15,11 @@	3	@@ -16,7 +16,11 @@
4	#include "base/values.h"	4	#include "base/values.h"
5	#include "components/url_matcher/url_matcher_constants.h"	5	#include "components/url_matcher/url_matcher_constants.h"
6	#include "components/url_matcher/url_matcher_helpers.h"	6	#include "components/url_matcher/url_matcher_helpers.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_variations_proto_study.proto (-3 / +3 lines)
1	--- components/variations/proto/study.proto.orig 2016-10-06 04:02:18.000000000 +0300	1	--- components/variations/proto/study.proto.orig 2016-12-09 05:04:19 UTC
2	+++ components/variations/proto/study.proto 2016-10-13 13:02:20.586397000 +0300	2	+++ components/variations/proto/study.proto
3	@@ -189,6 +189,7 @@	3	@@ -189,6 +189,7 @@ message Study {
4	PLATFORM_CHROMEOS = 3;	4	PLATFORM_CHROMEOS = 3;
5	PLATFORM_ANDROID = 4;	5	PLATFORM_ANDROID = 4;
6	PLATFORM_IOS = 5;	6	PLATFORM_IOS = 5;

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc (-2 / +2 lines)
1	--- components/webcrypto/algorithms/test_helpers.cc.orig 2016-05-11 19:02:20 UTC	1	--- components/webcrypto/algorithms/test_helpers.cc.orig 2016-12-09 05:04:19 UTC
2	+++ components/webcrypto/algorithms/test_helpers.cc	2	+++ components/webcrypto/algorithms/test_helpers.cc
3	@@ -26,7 +26,11 @@	3	@@ -25,7 +25,11 @@
4	#include "components/webcrypto/status.h"	4	#include "components/webcrypto/status.h"
5	#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"	5	#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
6	#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"	6	#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_app_BUILD.gn (-3 / +3 lines)
1	--- content/app/BUILD.gn.orig 2016-10-06 04:02:18.000000000 +0300	1	--- content/app/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/app/BUILD.gn 2016-10-13 06:35:58.585406000 +0300	2	+++ content/app/BUILD.gn
3	@@ -66,7 +66,7 @@	3	@@ -68,7 +68,7 @@ template("implement_content_app") {
4	]	4	]
5	}	5	}
6		6




--- content/app/content_main_runner.cc.orig	2016-12-09 05:04:19 UTC
+++ content/app/content_main_runner.cc
@@ -96,10 +96,10 @@
 #include "base/posix/global_descriptors.h"
 #include "content/public/common/content_descriptors.h"
 

 #include "content/zygote/zygote_main.h"
 #endif
 
@@ -293,7 +293,7 @@ struct MainFunction {
   int (*function)(const MainFunctionParams&);
 };
 

 // On platforms that use the zygote, we have a special subset of
 // subprocesses that are launched via the zygote.  This function
 // fills in some process-launching bits around ZygoteMain().
@@ -345,7 +345,7 @@ int RunZygote(const MainFunctionParams& 
   NOTREACHED() << "Unknown zygote process type: " << process_type;
   return 1;
 }

-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
 
 #if !defined(OS_IOS)
 static void RegisterMainThreadFactories() {
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
@@ -412,7 +412,7 @@ int RunNamedProcessTypeMain(
     }
   }
 




--- content/browser/BUILD.gn.orig	2016-12-09 05:04:19 UTC
+++ content/browser/BUILD.gn
@@ -1399,6 +1399,12 @@ source_set("browser") {
     ]
   }
 

   if (!is_win) {
     sources += [
       "file_descriptor_info_impl.cc",
@@ -1462,7 +1468,7 @@ source_set("browser") {
     if (!is_ios) {
       defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
     }

       sources += [
         "media/capture/desktop_capture_device.cc",
         "media/capture/desktop_capture_device.h",
@@ -1629,7 +1635,7 @@ source_set("browser") {
     }
   }
 

     deps += [ "//build/linux:fontconfig" ]
   }
 
@@ -1782,6 +1788,17 @@ source_set("browser") {
       "//chromeos",
       "//chromeos:power_manager_proto",
     ]

   }
 
   if (use_aura) {
@@ -1899,11 +1916,11 @@ source_set("browser") {
     deps += [ "//third_party/flac" ]
   }
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h (-3 / +3 lines)
1	--- content/browser/accessibility/browser_accessibility.h.orig 2016-05-25 15:01:01.000000000 -0400	1	--- content/browser/accessibility/browser_accessibility.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/accessibility/browser_accessibility.h 2016-05-27 10:16:53.216804000 -0400	2	+++ content/browser/accessibility/browser_accessibility.h
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	#define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1	4	#define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
5	#endif	5	#endif
Lines 9-15 Link Here
9	#define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1	9	#define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
10	#endif	10	#endif
11		11
12	@@ -50,7 +50,7 @@	12	@@ -50,7 +50,7 @@ namespace content {
13	class BrowserAccessibilityManager;	13	class BrowserAccessibilityManager;
14	#if defined(OS_WIN)	14	#if defined(OS_WIN)
15	class BrowserAccessibilityWin;	15	class BrowserAccessibilityWin;

Lines 1-5 Link Here

(-)www/chromium/files/patch-content_browser_browser__main__loop.cc (-3 / +3 lines)
1	--- content/browser/browser_main_loop.cc.orig 2016-12-15 13:00:14.708308000 +0000	1	--- content/browser/browser_main_loop.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/browser_main_loop.cc 2016-12-15 13:05:18.516426000 +0000	2	+++ content/browser/browser_main_loop.cc
3	@@ -196,6 +196,10 @@	3	@@ -196,6 +196,10 @@
4	#include "gpu/vulkan/vulkan_implementation.h"	4	#include "gpu/vulkan/vulkan_implementation.h"
5	#endif	5	#endif
Lines 20-26 Link Here
20	void SetupSandbox(const base::CommandLine& parsed_command_line) {	20	void SetupSandbox(const base::CommandLine& parsed_command_line) {
21	TRACE_EVENT0("startup", "SetupSandbox");	21	TRACE_EVENT0("startup", "SetupSandbox");
22	if (parsed_command_line.HasSwitch(switches::kNoZygote)) {	22	if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
23	@@ -475,10 +479,15 @@	23	@@ -475,10 +479,15 @@ void BrowserMainLoop::Init() {
24	void BrowserMainLoop::EarlyInitialization() {	24	void BrowserMainLoop::EarlyInitialization() {
25	TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");	25	TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
26		26

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_browser_child__process__launcher.cc (-1 / +1 lines)
1	--- content/browser/child_process_launcher.cc.orig 2016-12-12 21:01:52 UTC	1	--- content/browser/child_process_launcher.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/child_process_launcher.cc	2	+++ content/browser/child_process_launcher.cc
3	@@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const Notify	3	@@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const Notify
4	// We need to close the client end of the IPC channel to reliably detect	4	// We need to close the client end of the IPC channel to reliably detect

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h (-3 / +3 lines)
1	--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2016-10-06 04:02:18.000000000 +0300	1	--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/device_sensors/data_fetcher_shared_memory.h 2016-10-14 15:15:34.071484000 +0300	2	+++ content/browser/device_sensors/data_fetcher_shared_memory.h
3	@@ -45,7 +45,7 @@	3	@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMe
4	bool Start(ConsumerType consumer_type, void* buffer) override;	4	bool Start(ConsumerType consumer_type, void* buffer) override;
5	bool Stop(ConsumerType consumer_type) override;	5	bool Stop(ConsumerType consumer_type) override;
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc (-3 / +3 lines)
1	--- content/browser/devtools/protocol/color_picker.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/devtools/protocol/color_picker.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/devtools/protocol/color_picker.cc 2016-08-18 02:35:16.268652000 +0300	2	+++ content/browser/devtools/protocol/color_picker.cc
3	@@ -151,7 +151,7 @@	3	@@ -151,7 +151,7 @@ void ColorPicker::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

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_browser_download_base__file.cc (-1 / +1 lines)
1	--- content/browser/download/base_file.cc.orig 2016-12-12 21:09:50 UTC	1	--- content/browser/download/base_file.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/download/base_file.cc	2	+++ content/browser/download/base_file.cc
3	@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt	3	@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt
4	return reason;	4	return reason;




--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-12-09 05:04:19 UTC
+++ content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -358,7 +358,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
     // strings even if all features are blacklisted. If all GPU features are
     // disabled, the GPU process will only initialize GL bindings, create a GL
     // context, and collect full GPU info.

     if (reason) {
       *reason = "All GPU features are blacklisted.";
     }
@@ -475,8 +475,10 @@ void GpuDataManagerImplPrivate::SetGLStr
   gpu_info.gl_renderer = gl_renderer;
   gpu_info.gl_version = gl_version;
 

 
   UpdateGpuInfo(gpu_info);
   UpdateGpuSwitchingManager(gpu_info);
@@ -531,10 +533,12 @@ void GpuDataManagerImplPrivate::Initiali
     // Skip collecting the basic driver info if SetGpuInfo() is already called.
     if (IsCompleteGpuInfoAvailable()) {
       gpu_info = gpu_info_;

     }
 
     if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
@@ -646,7 +650,9 @@ void GpuDataManagerImplPrivate::UpdateGp
     return;
 
   bool was_info_available = IsCompleteGpuInfoAvailable();

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h (-3 / +3 lines)
1	--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/gpu/gpu_data_manager_impl_private.h 2016-08-18 02:42:16.971805000 +0300	2	+++ content/browser/gpu/gpu_data_manager_impl_private.h
3	@@ -154,7 +154,7 @@	3	@@ -154,7 +154,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
4	UnblockOtherDomainFrom3DAPIs);	4	UnblockOtherDomainFrom3DAPIs);
5	FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,	5	FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
6	UnblockThisDomainFrom3DAPIs);	6	UnblockThisDomainFrom3DAPIs);




--- content/browser/gpu/gpu_internals_ui.cc.orig	2016-12-09 05:04:19 UTC
+++ content/browser/gpu/gpu_internals_ui.cc
@@ -42,7 +42,7 @@
 #include "third_party/skia/include/core/SkMilestone.h"
 #include "ui/gl/gpu_switching_manager.h"
 
-#if defined(OS_LINUX) && defined(USE_X11)

 #include <X11/Xlib.h>
 #endif
 #if defined(OS_WIN)
@@ -50,7 +50,7 @@
 #include "ui/gfx/win/physical_size.h"
 #endif
 

 #include "ui/base/x/x11_util.h"       // nogncheck
 #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
 #endif
@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona
                                              gpu_info.gl_ws_version));
   basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
                                              gpu_info.gl_ws_extensions));

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (-3 / +3 lines)
1	--- content/browser/gpu/gpu_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/gpu/gpu_process_host.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/gpu/gpu_process_host.cc 2016-08-18 02:45:06.533983000 +0300	2	+++ content/browser/gpu/gpu_process_host.cc
3	@@ -968,7 +968,7 @@	3	@@ -980,7 +980,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
4	base::CommandLine* cmd_line =	4	base::CommandLine* cmd_line =
5	new base::CommandLine(base::CommandLine::NO_PROGRAM);	5	new 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 (-3 / +3 lines)
1	--- content/browser/media/media_internals.cc.orig 2016-10-06 04:02:18.000000000 +0300	1	--- content/browser/media/media_internals.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/media/media_internals.cc 2016-10-13 06:53:50.938946000 +0300	2	+++ content/browser/media/media_internals.cc
3	@@ -724,7 +724,7 @@	3	@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureD
4	device_dict->SetString("name", descriptor.GetNameAndModel());	4	device_dict->SetString("name", descriptor.GetNameAndModel());
5	device_dict->Set("formats", format_list);	5	device_dict->Set("formats", format_list);
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \




--- content/browser/ppapi_plugin_process_host.cc.orig	2016-12-09 05:04:19 UTC
+++ content/browser/ppapi_plugin_process_host.cc
@@ -52,7 +52,7 @@
 
 namespace content {
 

 ZygoteHandle g_ppapi_zygote;
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
@@ -119,7 +119,7 @@ class PpapiPluginSandboxedProcessLaunche
   }
 
 #elif defined(OS_POSIX)

   ZygoteHandle* GetZygote() override {
     const base::CommandLine& browser_command_line =
         *base::CommandLine::ForCurrentProcess();
@@ -222,7 +222,7 @@ PpapiPluginProcessHost* PpapiPluginProce
   return NULL;
 }
 

 // static
 void PpapiPluginProcessHost::EarlyZygoteLaunch() {
   DCHECK(!g_ppapi_zygote);
@@ -380,7 +380,7 @@ bool PpapiPluginProcessHost::Init(const 
   base::CommandLine::StringType plugin_launcher =
       browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
 




--- content/browser/renderer_host/render_process_host_impl.cc.orig	2016-12-09 05:04:19 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -381,7 +381,7 @@ class AssociatedInterfaceHolder : public
   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfaceHolder);
 };
 
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)

 // This static member variable holds the zygote communication information for
 // the renderer.
 ZygoteHandle g_render_zygote;
@@ -414,7 +414,7 @@ class RendererSandboxedProcessLauncherDe
   }
 
 #elif defined(OS_POSIX)

   ZygoteHandle* GetZygote() override {
     const base::CommandLine& browser_command_line =
         *base::CommandLine::ForCurrentProcess();
@@ -661,7 +661,7 @@ void RenderProcessHost::SetMaxRendererPr
   g_max_renderer_count_override = count;
 }
 

 // static
 void RenderProcessHostImpl::EarlyZygoteLaunch() {
   DCHECK(!g_render_zygote);
@@ -859,7 +859,7 @@ bool RenderProcessHostImpl::Init() {
   renderer_prefix =
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (-4 / +4 lines)
1	--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-10-06 04:02:18.000000000 +0300	1	--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-10-13 07:01:47.728403000 +0300	2	+++ content/browser/renderer_host/render_widget_host_view_aura.cc
3	@@ -106,7 +106,7 @@	3	@@ -106,7 +106,7 @@
4	#include "ui/gfx/gdi_util.h"	4	#include "ui/gfx/gdi_util.h"
5	#endif	5	#endif
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	@@ -2479,7 +2479,7 @@	12	@@ -2504,7 +2504,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
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	@@ -2711,7 +2711,7 @@	21	@@ -2735,7 +2735,7 @@ void RenderWidgetHostViewAura::ForwardKe
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_tracing_tracing__controller__impl.cc (-3 / +3 lines)
1	--- content/browser/tracing/tracing_controller_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/tracing/tracing_controller_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/tracing/tracing_controller_impl.cc 2016-08-18 02:46:09.991782000 +0300	2	+++ content/browser/tracing/tracing_controller_impl.cc
3	@@ -496,7 +496,7 @@	3	@@ -515,7 +515,7 @@ void TracingControllerImpl::AddTraceMess
4	return;	4	return;
5	}	5	}
6		6




--- content/browser/utility_process_host_impl.cc.orig	2016-12-09 05:04:19 UTC
+++ content/browser/utility_process_host_impl.cc
@@ -43,7 +43,7 @@
 #include "services/shell/public/cpp/interface_provider.h"
 #include "ui/base/ui_base_switches.h"
 
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)

 #include "content/public/browser/zygote_handle_linux.h"
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
@@ -54,7 +54,7 @@
 
 namespace content {
 

 namespace {
 ZygoteHandle g_utility_zygote;
 }  // namespace
@@ -74,7 +74,7 @@ class UtilitySandboxedProcessLauncherDel
         launch_elevated_(launch_elevated)
 #elif defined(OS_POSIX)
         env_(env),

         no_sandbox_(no_sandbox),
 #endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID)
         ipc_fd_(host->TakeClientFileDescriptor())
@@ -106,7 +106,7 @@ class UtilitySandboxedProcessLauncherDel
 
 #elif defined(OS_POSIX)
 

   ZygoteHandle* GetZygote() override {
     if (no_sandbox_ || !exposed_dir_.empty())
       return nullptr;
@@ -128,7 +128,7 @@ class UtilitySandboxedProcessLauncherDel
   bool launch_elevated_;
 #elif defined(OS_POSIX)
   base::EnvironmentMap env_;

   bool no_sandbox_;
 #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
   base::ScopedFD ipc_fd_;
@@ -156,7 +156,7 @@ UtilityProcessHostImpl::UtilityProcessHo
       is_batch_mode_(false),
       no_sandbox_(false),
       run_elevated_(false),

       child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
 #else
       child_flags_(ChildProcessHost::CHILD_NORMAL),
@@ -237,7 +237,7 @@ void UtilityProcessHostImpl::SetName(con
   name_ = name;
 }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_common_BUILD.gn (-4 / +4 lines)
1	--- content/common/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- content/common/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/common/BUILD.gn 2016-10-09 05:21:51.439131000 +0300	2	+++ content/common/BUILD.gn
3	@@ -179,7 +179,7 @@	3	@@ -503,7 +503,7 @@ source_set("common") {
4	if (use_seccomp_bpf) {	4	if (use_seccomp_bpf) {
5	defines += [ "USE_SECCOMP_BPF" ]	5	defines += [ "USE_SECCOMP_BPF" ]
6	} else {	6	} else {
Lines 9-15 Link Here
9	sources -= [	9	sources -= [
10	"sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",	10	"sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
11	"sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",	11	"sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
12	@@ -193,6 +193,15 @@	12	@@ -517,6 +517,15 @@ source_set("common") {
13	"sandbox_linux/bpf_utility_policy_linux.h",	13	"sandbox_linux/bpf_utility_policy_linux.h",
14	"sandbox_linux/sandbox_bpf_base_policy_linux.cc",	14	"sandbox_linux/sandbox_bpf_base_policy_linux.cc",
15	"sandbox_linux/sandbox_bpf_base_policy_linux.h",	15	"sandbox_linux/sandbox_bpf_base_policy_linux.h",

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc (-1 / +1 lines)
1	--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2016-03-25 13:04:48 UTC	1	--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc	2	+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc
3	@@ -7,7 +7,9 @@	3	@@ -7,7 +7,9 @@
4	#include <errno.h>	4	#include <errno.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_common_set__process__title__linux.cc (-1 / +1 lines)
1	--- content/common/set_process_title_linux.cc.orig 2016-03-25 13:04:48 UTC	1	--- content/common/set_process_title_linux.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/common/set_process_title_linux.cc	2	+++ content/common/set_process_title_linux.cc
3	@@ -49,6 +49,8 @@	3	@@ -49,6 +49,8 @@
4	extern char** environ;	4	extern char** environ;

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_common_set__process__title__linux.h (-1 / +1 lines)
1	--- content/common/set_process_title_linux.h.orig 2016-03-25 13:04:48 UTC	1	--- content/common/set_process_title_linux.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/common/set_process_title_linux.h	2	+++ content/common/set_process_title_linux.h
3	@@ -5,6 +5,9 @@	3	@@ -5,6 +5,9 @@
4	#ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_	4	#ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_gpu_BUILD.gn (-3 / +3 lines)
1	--- content/gpu/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300	1	--- content/gpu/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/gpu/BUILD.gn 2016-10-15 10:05:38.417673000 +0300	2	+++ content/gpu/BUILD.gn
3	@@ -98,6 +98,7 @@	3	@@ -97,6 +97,7 @@ target(link_target_type, "gpu_sources")
4		4
5	if (use_x11) {	5	if (use_x11) {
6	deps += [ "//ui/events/platform/x11" ]	6	deps += [ "//ui/events/platform/x11" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_gpu_gpu__child__thread.cc (-4 / +4 lines)
1	--- content/gpu/gpu_child_thread.cc.orig 2016-10-06 04:02:19.000000000 +0300	1	--- content/gpu/gpu_child_thread.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/gpu/gpu_child_thread.cc 2016-10-14 15:27:34.081648000 +0300	2	+++ content/gpu/gpu_child_thread.cc
3	@@ -419,6 +419,7 @@	3	@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn
4	if (dead_on_arrival_)	4	if (dead_on_arrival_)
5	return;	5	return;
6		6
Lines 8-14 Link Here
8	#if defined(OS_WIN)	8	#if defined(OS_WIN)
9	// GPU full info collection should only happen on un-sandboxed GPU process	9	// GPU full info collection should only happen on un-sandboxed GPU process
10	// or single process/in-process gpu mode on Windows.	10	// or single process/in-process gpu mode on Windows.
11	@@ -461,6 +462,7 @@	11	@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn
12	base::MessageLoop::current()->QuitWhenIdle();	12	base::MessageLoop::current()->QuitWhenIdle();
13	}	13	}
14	#endif // OS_WIN	14	#endif // OS_WIN




--- content/gpu/gpu_main.cc.orig	2016-12-09 05:04:19 UTC
+++ content/gpu/gpu_main.cc
@@ -92,7 +92,7 @@ namespace content {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread*);
 #elif defined(OS_WIN)
 bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu:
 
   bool EnsureSandboxInitialized(
       gpu::GpuWatchdogThread* watchdog_thread) override {

     return StartSandboxLinux(watchdog_thread);
 #elif defined(OS_WIN)
     return StartSandboxWindows(sandbox_info_);
@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa
 
 namespace {
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_public_common_child__process__host.h (-4 / +4 lines)
1	--- ./content/public/common/child_process_host.h.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/public/common/child_process_host.h.orig 2016-12-09 05:04:19 UTC
2	+++ ./content/public/common/child_process_host.h 2016-08-18 02:52:30.173927000 +0300	2	+++ content/public/common/child_process_host.h
3	@@ -50,7 +50,7 @@	3	@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost :
4	// No special behavior requested.	4	// No special behavior requested.
5	CHILD_NORMAL = 0,	5	CHILD_NORMAL = 0,
6		6
Lines 9-15 Link Here
9	// Indicates that the child execed after forking may be execced from	9	// Indicates that the child execed after forking may be execced from
10	// /proc/self/exe rather than using the "real" app path. This prevents	10	// /proc/self/exe rather than using the "real" app path. This prevents
11	// autoupdate from confusing us if it changes the file out from under us.	11	// autoupdate from confusing us if it changes the file out from under us.
12	@@ -59,7 +59,7 @@	12	@@ -63,7 +63,7 @@ class CONTENT_EXPORT ChildProcessHost :
13	// gdb). In this case, you'd use GetChildPath to get the real executable	13	// gdb). In this case, you'd use GetChildPath to get the real executable
14	// file name, and then prepend the GDB command to the command line.	14	// file name, and then prepend the GDB command to the command line.
15	CHILD_ALLOW_SELF = 1 << 0,	15	CHILD_ALLOW_SELF = 1 << 0,

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 2016-05-11 19:02:21 UTC	1	--- content/public/common/content_switches.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/public/common/content_switches.cc	2	+++ content/public/common/content_switches.cc
3	@@ -978,7 +978,7 @@ const char kDisableVaapiAcceleratedVideo	3	@@ -991,7 +991,7 @@ const char kDisableVaapiAcceleratedVideo
4	"disable-vaapi-accelerated-video-encode";	4	"disable-vaapi-accelerated-video-encode";
5	#endif	5	#endif
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 2016-05-11 19:02:21 UTC	1	--- content/public/common/content_switches.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/public/common/content_switches.h	2	+++ content/public/common/content_switches.h
3	@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kDisabl	3	@@ -291,7 +291,7 @@ CONTENT_EXPORT extern const char kDisabl
4	CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];	4	CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
5	#endif	5	#endif
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_public_test_browser__test__base.cc (-1 / +1 lines)
1	--- content/public/test/browser_test_base.cc.orig 2016-05-11 19:02:21 UTC	1	--- content/public/test/browser_test_base.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/public/test/browser_test_base.cc	2	+++ content/public/test/browser_test_base.cc
3	@@ -6,6 +6,10 @@	3	@@ -6,6 +6,10 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (-3 / +3 lines)
1	--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-01 03:25:27.013281000 +0300	2	+++ content/renderer/media/webrtc/processed_local_audio_source.cc
3	@@ -269,8 +269,8 @@	3	@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture(
4	bool key_pressed) {	4	bool key_pressed) {
5	#if defined(OS_WIN) \|\| defined(OS_MACOSX)	5	#if defined(OS_WIN) \|\| defined(OS_MACOSX)
6	DCHECK_LE(volume, 1.0);	6	DCHECK_LE(volume, 1.0);

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_renderer_render__thread__impl.cc (-3 / +3 lines)
1	--- content/renderer/render_thread_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/renderer/render_thread_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/renderer/render_thread_impl.cc 2016-08-01 04:09:35.329085000 +0300	2	+++ content/renderer/render_thread_impl.cc
3	@@ -1424,7 +1424,7 @@	3	@@ -1492,7 +1492,7 @@ media::GpuVideoAcceleratorFactories* Ren
4	const bool enable_video_accelerator =	4	const bool enable_video_accelerator =
5	!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);	5	!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
6	const bool enable_gpu_memory_buffer_video_frames =	6	const bool enable_gpu_memory_buffer_video_frames =




--- content/renderer/renderer_blink_platform_impl.cc.orig	2016-12-09 05:04:19 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -113,7 +113,7 @@
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"

 #include <map>
 #include <string>
 
@@ -219,7 +219,7 @@ class RendererBlinkPlatformImpl::FileUti
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 };
 

 class RendererBlinkPlatformImpl::SandboxSupport
     : public blink::WebSandboxSupport {
  public:
@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::RendererBlink
       renderer_scheduler_(renderer_scheduler),
       blink_interface_provider_(
           new BlinkInterfaceProviderImpl(remote_interfaces)) {

   if (g_sandbox_enabled && sandboxEnabled()) {
     sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
   } else {
@@ -300,7 +300,7 @@ RendererBlinkPlatformImpl::~RendererBlin
 }
 
 void RendererBlinkPlatformImpl::Shutdown() {

   // SandboxSupport contains a map of WebFontFamily objects, which hold
   // WebCStrings, which become invalidated when blink is shut down. Hence, we
   // need to clear that map now, just before blink::shutdown() is called.
@@ -352,7 +352,7 @@ blink::WebFileUtilities* RendererBlinkPl
 }
 
 blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {

   // These platforms do not require sandbox support.
   return NULL;
 #else
@@ -601,7 +601,7 @@ bool RendererBlinkPlatformImpl::SandboxS
   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
 }
 

Lines 1-11 Link Here

(-)www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (-4 / +4 lines)
1	--- content/renderer/renderer_blink_platform_impl.h.orig 2016-05-11 19:02:22 UTC	1	--- content/renderer/renderer_blink_platform_impl.h.orig 2016-12-09 05:04:19 UTC
2	+++ content/renderer/renderer_blink_platform_impl.h	2	+++ content/renderer/renderer_blink_platform_impl.h
3	@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo	3	@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
4	class MimeRegistry;	4	class MimeRegistry;
5	scoped_ptr<MimeRegistry> mime_registry_;	5	std::unique_ptr<MimeRegistry> mime_registry_;
6		6
7	-#if !defined(OS_ANDROID) && !defined(OS_WIN)	7	-#if !defined(OS_ANDROID) && !defined(OS_WIN)
8	+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)	8	+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
9	class SandboxSupport;	9	class SandboxSupport;
10	scoped_ptr<SandboxSupport> sandbox_support_;	10	std::unique_ptr<SandboxSupport> sandbox_support_;
11	#endif	11	#endif

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc (-1 / +1 lines)
1	--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2016-04-08 16:02:09 UTC	1	--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/renderer/renderer_main_platform_delegate_linux.cc	2	+++ content/renderer/renderer_main_platform_delegate_linux.cc
3	@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf	3	@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf
4	}	4	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc (-4 / +4 lines)
1	--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2016-10-06 04:02:19.000000000 +0300	1	--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc 2016-10-13 07:18:08.506709000 +0300	2	+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
3	@@ -14,7 +14,7 @@	3	@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen
4	blink::WebPointerProperties::Button mouseButton,	4	blink::WebPointerProperties::Button mouseButton,
5	bool shiftKeyPressed,	5	bool shiftKeyPressed,
6	bool altKeyPressed) {	6	bool altKeyPressed) {
Lines 9-15 Link Here
9	if (mouseButton == blink::WebPointerProperties::Button::Middle)	9	if (mouseButton == blink::WebPointerProperties::Button::Middle)
10	return true;	10	return true;
11	#endif	11	#endif
12	@@ -50,7 +50,7 @@	12	@@ -50,7 +50,7 @@ bool WebScrollbarBehaviorImpl::shouldSna
13	// On most platforms, we should snap iff the event is outside our calculated	13	// On most platforms, we should snap iff the event is outside our calculated
14	// rect. On Linux, however, we should not snap for events off the ends, but	14	// rect. On Linux, however, we should not snap for events off the ends, but
15	// not the sides, of the rect.	15	// not the sides, of the rect.




--- content/shell/BUILD.gn.orig	2016-12-09 05:04:19 UTC
+++ content/shell/BUILD.gn
@@ -287,7 +287,7 @@ static_library("content_shell_lib") {
     ]
   }
 

     deps += [
       "//build/linux:fontconfig",
       "//ui/gfx:test_support",
@@ -308,7 +308,7 @@ static_library("content_shell_lib") {
     deps += [ "//content/shell/android:content_shell_jni_headers" ]
   }
 

     deps += [
       "//components/crash/content/app",
       "//components/crash/content/browser",
@@ -356,7 +356,7 @@ static_library("content_shell_lib") {
     ]
   }
 

     deps += [ "//third_party/freetype2" ]
   }
 
@@ -520,7 +520,7 @@ if (is_android) {
       }
     }
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (-3 / +3 lines)
1	--- content/shell/browser/shell_browser_context.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/shell/browser/shell_browser_context.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/shell/browser/shell_browser_context.cc 2016-08-01 04:13:15.131738000 +0300	2	+++ content/shell/browser/shell_browser_context.cc
3	@@ -24,7 +24,7 @@	3	@@ -24,7 +24,7 @@
4		4
5	#if defined(OS_WIN)	5	#if defined(OS_WIN)
Lines 9-15 Link Here
9	#include "base/nix/xdg_util.h"	9	#include "base/nix/xdg_util.h"
10	#elif defined(OS_MACOSX)	10	#elif defined(OS_MACOSX)
11	#include "base/base_paths_mac.h"	11	#include "base/base_paths_mac.h"
12	@@ -80,7 +80,7 @@	12	@@ -92,7 +92,7 @@ void ShellBrowserContext::InitWhileIOAll
13	#if defined(OS_WIN)	13	#if defined(OS_WIN)
14	CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));	14	CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
15	path_ = path_.Append(std::wstring(L"content_shell"));	15	path_ = path_.Append(std::wstring(L"content_shell"));

Lines 1-4 Link Here

(-)www/chromium/files/patch-content_test_BUILD.gn (-1 / +1 lines)
1	--- content/test/BUILD.gn.orig 2016-12-01 23:02:13 UTC	1	--- content/test/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/test/BUILD.gn	2	+++ content/test/BUILD.gn
3	@@ -661,7 +661,7 @@ test("content_browsertests") {	3	@@ -661,7 +661,7 @@ test("content_browsertests") {
4	"../test/webui_resource_browsertest.cc",	4	"../test/webui_resource_browsertest.cc",

Lines 1-5 Link Here

(-)www/chromium/files/patch-crypto_nss__util.cc (-3 / +3 lines)
1	--- crypto/nss_util.cc.orig 2016-10-06 04:02:19.000000000 +0300	1	--- crypto/nss_util.cc.orig 2016-12-09 05:04:19 UTC
2	+++ crypto/nss_util.cc 2016-10-13 07:19:30.151634000 +0300	2	+++ crypto/nss_util.cc
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@
4	#include "base/threading/thread_task_runner_handle.h"	4	#include "base/threading/thread_task_runner_handle.h"
5	#include "crypto/nss_util_internal.h"	5	#include "crypto/nss_util_internal.h"
Lines 9-15 Link Here
9	#include <sys/mount.h>	9	#include <sys/mount.h>
10	#include <sys/param.h>	10	#include <sys/param.h>
11	#endif	11	#endif
12	@@ -150,10 +150,10 @@	12	@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con
13	base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;	13	base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
14	if (base::GetFileSystemType(database_dir, &fs_type))	14	if (base::GetFileSystemType(database_dir, &fs_type))
15	db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);	15	db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_BUILD.gn (-3 / +3 lines)
1	--- device/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- device/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ device/BUILD.gn 2016-09-03 02:02:55.005651000 +0300	2	+++ device/BUILD.gn
3	@@ -162,7 +162,7 @@	3	@@ -176,7 +176,7 @@ test("device_unittests") {
4	]	4	]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_battery_BUILD.gn (-3 / +3 lines)
1	--- device/battery/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- device/battery/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ device/battery/BUILD.gn 2016-09-03 02:03:11.489591000 +0300	2	+++ device/battery/BUILD.gn
3	@@ -47,7 +47,7 @@	3	@@ -47,7 +47,7 @@ if (!is_android) {
4	]	4	]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_geolocation_BUILD.gn (-3 / +3 lines)
1	--- device/geolocation/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300	1	--- device/geolocation/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ device/geolocation/BUILD.gn 2016-10-13 13:27:05.983826000 +0300	2	+++ device/geolocation/BUILD.gn
3	@@ -93,7 +93,7 @@	3	@@ -90,7 +90,7 @@ component("geolocation") {
4	if (is_android) {	4	if (is_android) {
5	sources -= [ "wifi_data_provider_common.cc" ]	5	sources -= [ "wifi_data_provider_common.cc" ]
6	}	6	}

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_geolocation_location__arbitrator.cc (-1 / +1 lines)
1	--- device/geolocation/location_arbitrator.cc.orig 2016-12-12 22:00:04 UTC	1	--- device/geolocation/location_arbitrator.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/geolocation/location_arbitrator.cc	2	+++ device/geolocation/location_arbitrator.cc
3	@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr	3	@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_hid_BUILD.gn (-3 / +3 lines)
1	--- device/hid/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- device/hid/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ device/hid/BUILD.gn 2016-09-24 04:03:54.837948000 +0300	2	+++ device/hid/BUILD.gn
3	@@ -57,6 +57,13 @@	3	@@ -56,6 +56,13 @@ source_set("hid") {
4	deps += [ "//device/udev_linux" ]	4	deps += [ "//device/udev_linux" ]
5	}	5	}
6		6

Lines 1-5 Link Here

(-)www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h (-2 / +2 lines)
1	--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2016-07-17 14:17:13.836047000 +0300	1	--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2016-12-09 05:04:19 UTC
2	+++ device/media_transfer_protocol/media_transfer_protocol_manager.h 2016-07-17 14:16:48.004323000 +0300	2	+++ device/media_transfer_protocol/media_transfer_protocol_manager.h
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	#include "base/memory/ref_counted.h"	4	#include "base/memory/ref_counted.h"
5	#include "build/build_config.h"	5	#include "build/build_config.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_serial_BUILD.gn (-4 / +4 lines)
1	--- device/serial/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- device/serial/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ device/serial/BUILD.gn 2016-09-24 04:10:00.137337000 +0300	2	+++ device/serial/BUILD.gn
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@ import("//build/config/features.gni")
4	import("//mojo/public/tools/bindings/mojom.gni")	4	import("//mojo/public/tools/bindings/mojom.gni")
5		5
6	# Library works only on desktop platforms.	6	# Library works only on desktop platforms.
Lines 9-15 Link Here
9		9
10	config("platform_support") {	10	config("platform_support") {
11	visibility = [ ":serial" ]	11	visibility = [ ":serial" ]
12	@@ -70,6 +70,12 @@	12	@@ -69,6 +69,12 @@ static_library("serial") {
13	if (use_udev) {	13	if (use_udev) {
14	deps += [ "//device/udev_linux" ]	14	deps += [ "//device/udev_linux" ]
15	}	15	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_serial_serial__io__handler__posix.cc (-2 / +2 lines)
1	--- device/serial/serial_io_handler_posix.cc.orig 2016-04-08 16:02:09 UTC	1	--- device/serial/serial_io_handler_posix.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/serial/serial_io_handler_posix.cc	2	+++ device/serial/serial_io_handler_posix.cc
3	@@ -60,7 +60,7 @@ bool BitrateToSpeedConstant(int bitrate,	3	@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate,
4	BITRATE_TO_SPEED_CASE(9600)	4	BITRATE_TO_SPEED_CASE(9600)
5	BITRATE_TO_SPEED_CASE(19200)	5	BITRATE_TO_SPEED_CASE(19200)
6	BITRATE_TO_SPEED_CASE(38400)	6	BITRATE_TO_SPEED_CASE(38400)

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_serial_serial__service__impl.cc (-2 / +2 lines)
1	--- device/serial/serial_service_impl.cc.orig 2016-05-11 19:02:22 UTC	1	--- device/serial/serial_service_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/serial/serial_service_impl.cc	2	+++ device/serial/serial_service_impl.cc
3	@@ -74,9 +74,14 @@ void SerialServiceImpl::Connect(	3	@@ -71,9 +71,14 @@ void SerialServiceImpl::Connect(
4	}	4	}
5		5
6	SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {	6	SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc (-1 / +1 lines)
1	--- device/time_zone_monitor/time_zone_monitor.cc.orig 2016-12-12 21:25:46 UTC	1	--- device/time_zone_monitor/time_zone_monitor.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/time_zone_monitor/time_zone_monitor.cc	2	+++ device/time_zone_monitor/time_zone_monitor.cc
3	@@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() {	3	@@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() {
4	std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());	4	std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc (-1 / +1 lines)
1	--- device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2016-12-12 21:26:07 UTC	1	--- device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/time_zone_monitor/time_zone_monitor_linux.cc	2	+++ device/time_zone_monitor/time_zone_monitor_linux.cc
3	@@ -58,6 +58,9 @@ class TimeZoneMonitorLinuxImpl	3	@@ -58,6 +58,9 @@ class TimeZoneMonitorLinuxImpl
4	main_task_runner_(base::ThreadTaskRunnerHandle::Get()),	4	main_task_runner_(base::ThreadTaskRunnerHandle::Get()),

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_usb_usb__context.cc (-1 / +1 lines)
1	--- device/usb/usb_context.cc.orig 2016-03-25 13:04:49 UTC	1	--- device/usb/usb_context.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_context.cc	2	+++ device/usb/usb_context.cc
3	@@ -9,8 +9,13 @@	3	@@ -9,8 +9,13 @@
4	#include "base/macros.h"	4	#include "base/macros.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_usb_usb__context__unittest.cc (-1 / +1 lines)
1	--- device/usb/usb_context_unittest.cc.orig 2016-03-25 13:04:49 UTC	1	--- device/usb/usb_context_unittest.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_context_unittest.cc	2	+++ device/usb/usb_context_unittest.cc
3	@@ -7,7 +7,11 @@	3	@@ -7,7 +7,11 @@
4	#include "build/build_config.h"	4	#include "build/build_config.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_usb_usb__device__handle__impl.cc (-2 / +2 lines)
1	--- device/usb/usb_device_handle_impl.cc.orig 2016-05-11 19:02:22 UTC	1	--- device/usb/usb_device_handle_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_device_handle_impl.cc	2	+++ device/usb/usb_device_handle_impl.cc
3	@@ -24,7 +24,11 @@	3	@@ -25,7 +25,11 @@
4	#include "device/usb/usb_error.h"	4	#include "device/usb/usb_error.h"
5	#include "device/usb/usb_service.h"	5	#include "device/usb/usb_service.h"
6	#include "net/base/io_buffer.h"	6	#include "net/base/io_buffer.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_usb_usb__device__handle__impl.h (-2 / +2 lines)
1	--- device/usb/usb_device_handle_impl.h.orig 2016-05-11 19:02:22 UTC	1	--- device/usb/usb_device_handle_impl.h.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_device_handle_impl.h	2	+++ device/usb/usb_device_handle_impl.h
3	@@ -17,7 +17,12 @@	3	@@ -18,7 +18,12 @@
4	#include "base/memory/ref_counted.h"	4	#include "base/memory/ref_counted.h"
5	#include "base/threading/thread_checker.h"	5	#include "base/threading/thread_checker.h"
6	#include "device/usb/usb_device_handle.h"	6	#include "device/usb/usb_device_handle.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-device_usb_usb__device__impl.cc (-4 / +4 lines)
1	--- device/usb/usb_device_impl.cc.orig 2016-05-11 19:02:22 UTC	1	--- device/usb/usb_device_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_device_impl.cc	2	+++ device/usb/usb_device_impl.cc
3	@@ -20,7 +20,11 @@	3	@@ -22,7 +22,11 @@
4	#include "device/usb/usb_descriptors.h"	4	#include "device/usb/usb_descriptors.h"
5	#include "device/usb/usb_device_handle_impl.h"	5	#include "device/usb/usb_device_handle_impl.h"
6	#include "device/usb/usb_error.h"	6	#include "device/usb/usb_error.h"
Lines 10-14 Link Here
10	#include "third_party/libusb/src/libusb/libusb.h"	10	#include "third_party/libusb/src/libusb/libusb.h"
11	+#endif	11	+#endif
12		12
13	#if defined(OS_CHROMEOS)	13	namespace device {
14	#include "chromeos/dbus/dbus_thread_manager.h"	14

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_usb_usb__error.cc (-1 / +1 lines)
1	--- device/usb/usb_error.cc.orig 2016-03-25 13:04:49 UTC	1	--- device/usb/usb_error.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_error.cc	2	+++ device/usb/usb_error.cc
3	@@ -4,7 +4,11 @@	3	@@ -4,7 +4,11 @@
4		4




--- device/usb/usb_service_impl.cc.orig	2016-12-09 05:04:19 UTC
+++ device/usb/usb_service_impl.cc
@@ -26,7 +26,11 @@
 #include "device/usb/usb_error.h"
 #include "device/usb/webusb_descriptors.h"

 
 #if defined(OS_WIN)
 #include <setupapi.h>
@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl(
   }
   context_ = new UsbContext(platform_context);
 

   rv = libusb_hotplug_register_callback(
       context_->context(),
       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl(
   }
 
   RefreshDevices();

 #if defined(OS_WIN)
   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
   if (device_monitor) {
@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl(
 }
 
 UsbServiceImpl::~UsbServiceImpl() {

   for (auto* platform_device : ignored_devices_)
     libusb_unref_device(platform_device);
 }
@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped
   device->OnDisconnect();
 }
 

 // static
 int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
                                                 PlatformUsbDevice device,
@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
 
   return 0;
 }

Lines 1-4 Link Here

(-)www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc (-1 / +1 lines)
1	--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2016-05-11 19:02:22 UTC	1	--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2016-12-09 05:04:20 UTC
2	+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc	2	+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
3	@@ -28,7 +28,11 @@	3	@@ -28,7 +28,11 @@
4	#include "net/base/registry_controlled_domains/registry_controlled_domain.h"	4	#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc (-3 / +3 lines)
1	--- extensions/browser/api/serial/serial_api.cc.orig 2016-08-12 04:05:07.712438000 +0300	1	--- extensions/browser/api/serial/serial_api.cc.orig 2016-12-09 05:04:20 UTC
2	+++ extensions/browser/api/serial/serial_api.cc 2016-08-12 04:06:56.974572000 +0300	2	+++ extensions/browser/api/serial/serial_api.cc
3	@@ -85,12 +85,13 @@	3	@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare()
4		4
5	void SerialGetDevicesFunction::Work() {	5	void SerialGetDevicesFunction::Work() {
6	DCHECK_CURRENTLY_ON(BrowserThread::FILE);	6	DCHECK_CURRENTLY_ON(BrowserThread::FILE);

Lines 1-4 Link Here

(-)www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc (-1 / +1 lines)
1	--- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-05-11 19:02:22 UTC	1	--- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-12-09 05:04:20 UTC
2	+++ extensions/browser/api/web_request/form_data_parser.cc	2	+++ extensions/browser/api/web_request/form_data_parser.cc
3	@@ -15,7 +15,11 @@	3	@@ -15,7 +15,11 @@
4	#include "base/values.h"	4	#include "base/values.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-extensions_common_image__util.cc (-2 / +2 lines)
1	--- extensions/common/image_util.cc.orig 2016-05-11 19:02:22 UTC	1	--- extensions/common/image_util.cc.orig 2016-12-09 05:04:20 UTC
2	+++ extensions/common/image_util.cc	2	+++ extensions/common/image_util.cc
3	@@ -11,7 +11,11 @@	3	@@ -11,7 +11,11 @@
4	#include "base/strings/string_number_conversions.h"	4	#include "base/strings/string_number_conversions.h"
Lines 10-14 Link Here
10	#include "third_party/re2/src/re2/re2.h"	10	#include "third_party/re2/src/re2/re2.h"
11	+#endif	11	+#endif
12	#include "third_party/skia/include/core/SkColor.h"	12	#include "third_party/skia/include/core/SkColor.h"
		13	#include "third_party/skia/include/utils/SkParse.h"
13	#include "ui/gfx/color_utils.h"	14	#include "ui/gfx/color_utils.h"
14

Lines 1-4 Link Here

(-)www/chromium/files/patch-extensions_common_stack__frame.cc (-1 / +1 lines)
1	--- extensions/common/stack_frame.cc.orig 2016-05-11 19:02:22 UTC	1	--- extensions/common/stack_frame.cc.orig 2016-12-09 05:04:20 UTC
2	+++ extensions/common/stack_frame.cc	2	+++ extensions/common/stack_frame.cc
3	@@ -7,7 +7,11 @@	3	@@ -7,7 +7,11 @@
4	#include <string>	4	#include <string>

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_BUILD.gn (-3 / +3 lines)
1	--- gpu/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- gpu/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/BUILD.gn 2016-09-02 23:58:15.934039000 +0300	2	+++ gpu/BUILD.gn
3	@@ -122,7 +122,7 @@	3	@@ -92,7 +92,7 @@ test("command_buffer_gles2_tests") {
4	libs += [ "android" ]	4	libs += [ "android" ]
5	deps += [ "//ui/android:ui_java" ]	5	deps += [ "//ui/android:ui_java" ]
6	}	6	}

Lines 1-8 Link Here

(-)www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc (-3 / +3 lines)
1	--- gpu/command_buffer/service/program_manager.cc.orig 2016-05-11 19:02:23 UTC	1	--- gpu/command_buffer/service/program_manager.cc.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/command_buffer/service/program_manager.cc	2	+++ gpu/command_buffer/service/program_manager.cc
3	@@ -29,7 +29,11 @@	3	@@ -30,7 +30,11 @@
4	#include "gpu/command_buffer/service/gpu_switches.h"
5	#include "gpu/command_buffer/service/program_cache.h"	4	#include "gpu/command_buffer/service/program_cache.h"
		5	#include "gpu/command_buffer/service/progress_reporter.h"
6	#include "gpu/command_buffer/service/shader_manager.h"	6	#include "gpu/command_buffer/service/shader_manager.h"
7	+#if defined(OS_BSD)	7	+#if defined(OS_BSD)
8	+#include <re2/re2.h>	8	+#include <re2/re2.h>

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_config_BUILD.gn (-4 / +4 lines)
1	--- gpu/config/BUILD.gn.orig 2016-10-06 04:02:20.000000000 +0300	1	--- gpu/config/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/config/BUILD.gn 2016-10-29 18:18:32.848959000 +0300	2	+++ gpu/config/BUILD.gn
3	@@ -8,7 +8,8 @@	3	@@ -8,7 +8,8 @@ import("//build/config/ui.gni")
4		4
5	declare_args() {	5	declare_args() {
6	# Use the PCI lib to collect GPU information on Linux.	6	# Use the PCI lib to collect GPU information on Linux.
Lines 10-16 Link Here
10	(use_x11 \|\| use_ozone)	10	(use_x11 \|\| use_ozone)
11	}	11	}
12		12
13	@@ -97,6 +98,14 @@	13	@@ -97,6 +98,14 @@ source_set("config_sources") {
14	]	14	]
15	}	15	}
16	}	16	}




--- gpu/config/gpu_control_list.cc.orig	2016-12-09 05:04:20 UTC
+++ gpu/config/gpu_control_list.cc
@@ -19,7 +19,11 @@
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_util.h"

+#else
 #include "third_party/re2/src/re2/re2.h"
+#endif
 
 namespace gpu {
 namespace {
@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT
 GpuControlList::GpuControlListEntry::GetDefaultGLType() {
 #if defined(OS_CHROMEOS)
   return kGLTypeGL;

   return kGLTypeGL;
 #elif defined(OS_MACOSX)
   return kGLTypeGL;
@@ -1595,7 +1599,7 @@ GpuControlList::OsType GpuControlList::G
   return kOsWin;
 #elif defined(OS_ANDROID)
   return kOsAndroid;

Lines 1-4 Link Here

(-)www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc (-1 / +1 lines)
1	--- gpu/config/gpu_control_list_unittest.cc.orig 2016-05-11 19:02:23 UTC	1	--- gpu/config/gpu_control_list_unittest.cc.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/config/gpu_control_list_unittest.cc	2	+++ gpu/config/gpu_control_list_unittest.cc
3	@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs	3	@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs
4	features = control_list->MakeDecision(	4	features = control_list->MakeDecision(

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_config_gpu__info__collector.cc (-2 / +2 lines)
1	--- gpu/config/gpu_info_collector.cc.orig 2016-05-11 19:02:23 UTC	1	--- gpu/config/gpu_info_collector.cc.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/config/gpu_info_collector.cc	2	+++ gpu/config/gpu_info_collector.cc
3	@@ -167,8 +167,10 @@ CollectInfoResult CollectGraphicsInfoGL(	3	@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL(
4	gpu_info->pixel_shader_version = glsl_version;	4	gpu_info->pixel_shader_version = glsl_version;
5	gpu_info->vertex_shader_version = glsl_version;	5	gpu_info->vertex_shader_version = glsl_version;
6		6




--- gpu/config/gpu_test_config.cc.orig	2016-12-09 05:04:20 UTC
+++ gpu/config/gpu_test_config.cc
@@ -24,7 +24,7 @@ namespace {
 GPUTestConfig::OS GetCurrentOS() {
 #if defined(OS_CHROMEOS)
   return GPUTestConfig::kOsChromeOS;

   return GPUTestConfig::kOsLinux;
 #elif defined(OS_WIN)
   int32_t major_version = 0;
@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
   bool rt;
   if (gpu_info == NULL) {
     GPUInfo my_gpu_info;

     CollectInfoResult result = CollectGpuID(
         &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
     if (result != kCollectInfoSuccess) {
@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
     } else {
       rt = SetGPUInfo(my_gpu_info);
     }

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn (-4 / +4 lines)
1	--- gpu/gles2_conform_support/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- gpu/gles2_conform_support/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/gles2_conform_support/BUILD.gn 2016-09-02 23:59:14.071065000 +0300	2	+++ gpu/gles2_conform_support/BUILD.gn
3	@@ -62,7 +62,7 @@	3	@@ -60,7 +60,7 @@ executable("gles2_conform_support") {
4	"//gpu/gles2_conform_support/egl",	4	"//gpu/gles2_conform_support/egl",
5	"//ui/gl",	5	"//ui/gl",
6	]	6	]
Lines 9-15 Link Here
9	sources += [	9	sources += [
10	"native/egl_native_aura.cc",	10	"native/egl_native_aura.cc",
11	"native/egl_native_x11.cc",	11	"native/egl_native_x11.cc",
12	@@ -132,7 +132,7 @@	12	@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) {
13	# Must be done this way for warning flags to be ordered correctly.	13	# Must be done this way for warning flags to be ordered correctly.
14	":gles2_conform_test_warnings",	14	":gles2_conform_test_warnings",
15	]	15	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn (-3 / +3 lines)
1	--- gpu/gles2_conform_support/native/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- gpu/gles2_conform_support/native/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/gles2_conform_support/native/BUILD.gn 2016-09-02 23:58:43.787930000 +0300	2	+++ gpu/gles2_conform_support/native/BUILD.gn
3	@@ -21,7 +21,7 @@	3	@@ -20,7 +20,7 @@ source_set("native") {
4	"//gpu/gles2_conform_support/egl",	4	"//gpu/gles2_conform_support/egl",
5	"//ui/gl",	5	"//ui/gl",
6	]	6	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_ipc_client_BUILD.gn (-3 / +3 lines)
1	--- gpu/ipc/client/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- gpu/ipc/client/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/ipc/client/BUILD.gn 2016-10-10 14:54:17.518422000 +0300	2	+++ gpu/ipc/client/BUILD.gn
3	@@ -53,6 +53,7 @@	3	@@ -51,6 +51,7 @@ source_set("ipc_client_sources") {
4	configs += [	4	configs += [
5	"//build/config/compiler:no_size_t_to_int_warning",	5	"//build/config/compiler:no_size_t_to_int_warning",
6	"//gpu:gpu_implementation",	6	"//gpu:gpu_implementation",

Lines 1-4 Link Here

(-)www/chromium/files/patch-gpu_ipc_service_BUILD.gn (-1 / +1 lines)
1	--- gpu/ipc/service/BUILD.gn.orig 2016-12-13 11:53:02 UTC	1	--- gpu/ipc/service/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/ipc/service/BUILD.gn	2	+++ gpu/ipc/service/BUILD.gn
3	@@ -102,11 +102,12 @@ target(link_target_type, "ipc_service_so	3	@@ -102,11 +102,12 @@ target(link_target_type, "ipc_service_so
4	]	4	]

Lines 1-4 Link Here

(-)www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn (-1 / +1 lines)
1	--- gpu/tools/compositor_model_bench/BUILD.gn.orig 2016-12-12 22:09:19 UTC	1	--- gpu/tools/compositor_model_bench/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/tools/compositor_model_bench/BUILD.gn	2	+++ gpu/tools/compositor_model_bench/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-gpu_vulkan_BUILD.gn (-3 / +3 lines)
1	--- gpu/vulkan/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- gpu/vulkan/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ gpu/vulkan/BUILD.gn 2016-09-02 23:57:07.910753000 +0300	2	+++ gpu/vulkan/BUILD.gn
3	@@ -13,7 +13,7 @@	3	@@ -13,7 +13,7 @@ if (enable_vulkan) {
4	component("vulkan") {	4	component("vulkan") {
5	output_name = "vulkan_wrapper"	5	output_name = "vulkan_wrapper"
6		6

Lines 1-9 Link Here

(-)www/chromium/files/patch-ipc_ipc__channel.h (-6 / +6 lines)
1	--- ipc/ipc_channel.h.orig 2016-08-13 00:25:04.291611000 +0300	1	--- ipc/ipc_channel.h.orig 2016-12-09 05:04:20 UTC
2	+++ ipc/ipc_channel.h 2016-08-13 00:09:06.758895000 +0300	2	+++ ipc/ipc_channel.h
3	@@ -223,7 +223,7 @@	3	@@ -308,7 +308,7 @@ class IPC_EXPORT Channel : public Endpoi
4	static std::string GenerateVerifiedChannelID(const std::string& prefix);	4	IPC::ChannelHandle* handle0,
5	#endif	5	IPC::ChannelHandle* handle1);
6		6
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	// Sandboxed processes live in a PID namespace, so when sending the IPC hello	9	// Sandboxed processes live in a PID namespace, so when sending the IPC hello




--- ipc/ipc_channel_posix.cc.orig	2016-12-09 05:04:20 UTC
+++ ipc/ipc_channel_posix.cc
@@ -182,9 +182,9 @@ void Channel::NotifyProcessForkedForTest
 
 //------------------------------------------------------------------------------
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 int ChannelPosix::global_pid_ = 0;
-#endif  // OS_LINUX
+#endif  // OS_LINUX || defined(OS_BSD)
 
 ChannelPosix::ChannelPosix(const IPC::ChannelHandle& channel_handle,
                            Mode mode,
@@ -612,7 +612,7 @@ bool ChannelPosix::IsNamedServerInitiali
   return base::PathExists(base::FilePath(channel_id));
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 // static
 void ChannelPosix::SetGlobalPid(int pid) {
   global_pid_ = pid;
@@ -621,7 +621,7 @@ void ChannelPosix::SetGlobalPid(int pid)
 int ChannelPosix::GetGlobalPid() {
   return global_pid_;
 }
-#endif  // OS_LINUX
+#endif  // OS_LINUX || defined(OS_BSD)
 
 // Called by libevent when we can read from the pipe without blocking.
 void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) {
@@ -810,12 +810,12 @@ int ChannelPosix::GetHelloMessageProcId(
   return -1;
 #else
   int pid = base::GetCurrentProcId();

   return pid;
 #endif  // defined(OS_NACL_NONSFI)
 }
@@ -1132,7 +1132,7 @@ bool Channel::IsNamedServerInitialized(
   return ChannelPosix::IsNamedServerInitialized(channel_id);
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 // static
 void Channel::SetGlobalPid(int pid) {
   ChannelPosix::SetGlobalPid(pid);
@@ -1140,6 +1140,6 @@ void Channel::SetGlobalPid(int pid) {
 int Channel::GetGlobalPid() {
   return ChannelPosix::GetGlobalPid();
 }
-#endif  // OS_LINUX
+#endif  // OS_LINUX || defined(OS_BSD)
 
 }  // namespace IPC




--- ipc/ipc_channel_posix.h.orig	2016-12-09 05:04:20 UTC
+++ ipc/ipc_channel_posix.h
@@ -63,10 +63,10 @@ class IPC_EXPORT ChannelPosix : public C
   void CloseClientFileDescriptor();
 
   static bool IsNamedServerInitialized(const std::string& channel_id);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)

   static int GetGlobalPid();
-#endif  // OS_LINUX
+#endif  // OS_LINUX || defined(OS_BSD)
 
  private:
   bool CreatePipe(const IPC::ChannelHandle& channel_handle);
@@ -209,10 +209,10 @@ class IPC_EXPORT ChannelPosix : public C
   // True if we are responsible for unlinking the unix domain socket file.
   bool must_unlink_;
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // If non-zero, overrides the process ID sent in the hello message.

   static int global_pid_;
-#endif  // OS_LINUX
+#endif  // OS_LINUX || defined(OS_BSD)
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelPosix);
 };

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__message__utils.cc (-2 / +2 lines)
1	--- ipc/ipc_message_utils.cc.orig 2016-05-20 21:47:31 UTC	1	--- ipc/ipc_message_utils.cc.orig 2016-12-09 05:04:20 UTC
2	+++ ipc/ipc_message_utils.cc	2	+++ ipc/ipc_message_utils.cc
3	@@ -414,7 +414,7 @@ void ParamTraits<unsigned int>::Log(cons	3	@@ -424,7 +424,7 @@ void ParamTraits<unsigned int>::Log(cons
4	l->append(base::UintToString(p));	4	l->append(base::UintToString(p));
5	}	5	}
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ipc_ipc__message__utils.h (-2 / +2 lines)
1	--- ipc/ipc_message_utils.h.orig 2016-05-20 21:46:12 UTC	1	--- ipc/ipc_message_utils.h.orig 2016-12-09 05:04:20 UTC
2	+++ ipc/ipc_message_utils.h	2	+++ ipc/ipc_message_utils.h
3	@@ -193,7 +193,7 @@ struct ParamTraits<unsigned int> {	3	@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {
4	// 3) Android 64 bit also has int64_t typedef'd to long.	4	// 3) Android 64 bit also has 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.




--- media/audio/alsa/audio_manager_alsa.cc.orig	2016-12-09 05:04:20 UTC
+++ media/audio/alsa/audio_manager_alsa.cc
@@ -135,7 +135,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
   int card = -1;
 
   // Loop through the sound cards to get ALSA device hints.

     void** hints = NULL;
     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
     if (!error) {
@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
       DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
                     << wrapper_->StrError(error);
     }

 }
 
 void AudioManagerAlsa::GetAlsaDevicesInfo(
@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
     // goes through software conversion if needed (e.g. incompatible
     // sample rate).
     // TODO(joi): Should we prefer "hw" instead?

     return strncmp(kDeviceTypeDesired,
                    device_name,
                    arraysize(kDeviceTypeDesired) - 1) == 0;
@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
   // Loop through the sound cards.
   // Don't use snd_device_name_hint(-1,..) since there is a access violation
   // inside this ALSA API with libasound.so.2.0.0.

     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
     if (!error) {
       for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
       DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
                     << wrapper_->StrError(error);
     }

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_audio_BUILD.gn (-4 / +4 lines)
1	--- media/audio/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- media/audio/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ media/audio/BUILD.gn 2016-09-25 15:11:18.731892000 +0300	2	+++ media/audio/BUILD.gn
3	@@ -202,7 +202,7 @@	3	@@ -206,7 +206,7 @@ source_set("audio") {
4	deps += [ "//media/base/android:media_jni_headers" ]	4	deps += [ "//media/base/android:media_jni_headers" ]
5	}	5	}
6		6
Lines 9-15 Link Here
9	sources += [ "linux/audio_manager_linux.cc" ]	9	sources += [ "linux/audio_manager_linux.cc" ]
10	}	10	}
11		11
12	@@ -251,10 +251,12 @@	12	@@ -255,10 +255,12 @@ source_set("audio") {
13	configs += [ ":libpulse" ]	13	configs += [ ":libpulse" ]
14	} else {	14	} else {
15	# TODO(ajwong): Technically, this dl should go in the action.	15	# TODO(ajwong): Technically, this dl should go in the action.




--- media/audio/audio_manager.cc.orig	2016-12-09 05:04:20 UTC
+++ media/audio/audio_manager.cc
@@ -95,7 +95,7 @@ class AudioManagerHelper : public base::
   }
 #endif
 

   void set_app_name(const std::string& app_name) { app_name_ = app_name; }
   const std::string& app_name() const { return app_name_; }
 #endif
@@ -253,7 +253,7 @@ class AudioManagerHelper : public base::
   std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
 #endif
 

   std::string app_name_;
 #endif
 
@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging
   g_helper.Pointer()->enable_crash_key_logging();
 }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_audio_audio__manager.h (-2 / +2 lines)
1	--- media/audio/audio_manager.h.orig 2016-05-11 19:02:23 UTC	1	--- media/audio/audio_manager.h.orig 2016-12-09 05:04:20 UTC
2	+++ media/audio/audio_manager.h	2	+++ media/audio/audio_manager.h
3	@@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager {	3	@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager {
4	// See http://crbug.com/422522	4	// See http://crbug.com/422522
5	static void EnableCrashKeyLoggingForAudioThreadHangs();	5	static void EnableCrashKeyLoggingForAudioThreadHangs();
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_base_BUILD.gn (-4 / +4 lines)
1	--- media/base/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300	1	--- media/base/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ media/base/BUILD.gn 2016-09-03 01:53:50.754526000 +0300	2	+++ media/base/BUILD.gn
3	@@ -281,7 +281,7 @@	3	@@ -296,7 +296,7 @@ target(link_target_type, "base") {
4	allow_circular_includes_from += [ "//media/base/android" ]	4	allow_circular_includes_from += [ "//media/base/android" ]
5	}	5	}
6		6
Lines 9-15 Link Here
9	configs += [	9	configs += [
10	"//build/config/linux:x11",	10	"//build/config/linux:x11",
11	"//build/config/linux:xext",	11	"//build/config/linux:xext",
12	@@ -317,7 +317,7 @@	12	@@ -332,7 +332,7 @@ target(link_target_type, "base") {
13	deps += [ ":media_yasm" ]	13	deps += [ ":media_yasm" ]
14	}	14	}
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_capture_BUILD.gn (-5 / +5 lines)
1	--- media/capture/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300	1	--- media/capture/BUILD.gn.orig 2016-12-09 05:04:20 UTC
2	+++ media/capture/BUILD.gn 2016-10-10 16:10:21.736539000 +0300	2	+++ media/capture/BUILD.gn
3	@@ -114,6 +114,16 @@	3	@@ -123,6 +123,16 @@ component("capture") {
4	]	4	]
5	}	5	}
6		6
Lines 15-19 Link Here
15	+ }	15	+ }
16	+	16	+
17	if (is_win) {	17	if (is_win) {
18	public_deps += [ "//media/base/win" ]	18	deps += [
19	libs = [	19	"//media/base", # For media_switches.

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc (-3 / +3 lines)
1	--- media/capture/video/fake_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300	1	--- media/capture/video/fake_video_capture_device_factory.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/capture/video/fake_video_capture_device_factory.cc 2016-10-13 07:39:17.908794000 +0300	2	+++ media/capture/video/fake_video_capture_device_factory.cc
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetD
4	for (int n = 0; n < number_of_devices_; ++n) {	4	for (int n = 0; n < number_of_devices_; ++n) {
5	device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n),	5	device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n),
6	base::StringPrintf("/dev/video%d", n),	6	base::StringPrintf("/dev/video%d", n),

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc (-3 / +3 lines)
1	--- media/capture/video/file_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300	1	--- media/capture/video/file_video_capture_device_factory.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/capture/video/file_video_capture_device_factory.cc 2016-10-13 07:41:41.678945000 +0300	2	+++ media/capture/video/file_video_capture_device_factory.cc
3	@@ -49,7 +49,7 @@	3	@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD
4	#elif defined(OS_MACOSX)	4	#elif defined(OS_MACOSX)
5	command_line_file_path.value(), kFileVideoCaptureDeviceName,	5	command_line_file_path.value(), kFileVideoCaptureDeviceName,
6	VideoCaptureApi::MACOSX_AVFOUNDATION	6	VideoCaptureApi::MACOSX_AVFOUNDATION




--- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-12-09 05:04:20 UTC
+++ media/capture/video/linux/video_capture_device_linux.cc
@@ -21,6 +21,7 @@
 
 namespace media {

 // Translates Video4Linux pixel formats to Chromium pixel formats.
 // static
 VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
     bool favour_mjpeg) {
   return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
 }

 
 VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
     const VideoCaptureDeviceDescriptor& device_descriptor)
@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
   v4l2_thread_.Stop();
 }
 

 void VideoCaptureDeviceLinux::AllocateAndStart(
     const VideoCaptureParams& params,
     std::unique_ptr<VideoCaptureDevice::Client> client) {
@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn
                  params.requested_format.frame_size.height(),
                  params.requested_format.frame_rate, base::Passed(&client)));
 }

 void VideoCaptureDeviceLinux::StopAndDeAllocate() {
   if (!v4l2_thread_.IsRunning())
     return;  // Wrong state.
@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
       base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_,
                  base::Passed(&settings), base::Passed(&callback)));
 }
+#else // !defined(OS_FREEBSD)
+void VideoCaptureDeviceLinux::StopAndDeAllocate() {}

 void VideoCaptureDeviceLinux::SetRotation(int rotation) {
   if (v4l2_thread_.IsRunning()) {
     v4l2_thread_.task_runner()->PostTask(
@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio
         base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
   }
 }

Lines 1-4 Link Here

(-)www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (-1 / +1 lines)
1	--- media/capture/video/video_capture_device_client.cc.orig 2016-12-12 21:21:34 UTC	1	--- media/capture/video/video_capture_device_client.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/capture/video/video_capture_device_client.cc	2	+++ media/capture/video/video_capture_device_client.cc
3	@@ -184,7 +184,7 @@ void VideoCaptureDeviceClient::OnIncomin	3	@@ -184,7 +184,7 @@ void VideoCaptureDeviceClient::OnIncomin
4	// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.	4	// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.




--- media/capture/video/video_capture_device_factory.cc.orig	2016-12-09 05:04:20 UTC
+++ media/capture/video/video_capture_device_factory.cc
@@ -18,6 +18,10 @@ namespace media {
 std::unique_ptr<VideoCaptureDeviceFactory>
 VideoCaptureDeviceFactory::CreateFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {

   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   // Use a Fake or File Video Device Factory if the command line flags are
@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory
     return std::unique_ptr<VideoCaptureDeviceFactory>(
         CreateVideoCaptureDeviceFactory(ui_task_runner));
   }
+#endif
 }
 
 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat
   callback.Run(std::move(device_descriptors));
 }
 
-#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \
+#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \
     !defined(OS_WIN)




--- media/cast/BUILD.gn.orig	2016-12-09 05:04:20 UTC
+++ media/cast/BUILD.gn
@@ -343,7 +343,7 @@ test("cast_unittests") {
   }
 }
 

   # This is a target for the collection of cast development tools.  They are
   # not built/linked into the Chromium browser.
   group("testing_tools") {
@@ -388,7 +388,7 @@ if (is_win || is_mac || (is_linux && !is
       "//build/win:default_exe_manifest",
     ]
 

       sources += [
         "test/linux_output_window.cc",
         "test/linux_output_window.h",
@@ -483,7 +483,7 @@ if (is_win || is_mac || (is_linux && !is
   }
 }
 

Lines 1-8 Link Here

(-)www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni (-6 / +6 lines)
1	--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2016-08-03 22:02:20.000000000 +0300	1	--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2016-12-09 05:04:20 UTC
2	+++ media/cdm/ppapi/ppapi_cdm_adapter.gni 2016-09-03 01:55:54.607135000 +0300	2	+++ media/cdm/ppapi/ppapi_cdm_adapter.gni
3	@@ -7,7 +7,7 @@	3	@@ -5,7 +5,7 @@
4	# depend on media/media_cdm_adapter.gyp:cdmadapter which would in turn modify	4	# This template defines a CDM adapter target. Just use this as you would a
5	# your target with direct_dependent_settings.	5	# normal target and everything should work correctly.
6	template("ppapi_cdm_adapter") {	6	template("ppapi_cdm_adapter") {
7	- if (is_mac \|\| is_linux) {	7	- if (is_mac \|\| is_linux) {
8	+ if (is_mac \|\| is_linux \|\| is_bsd) {	8	+ if (is_mac \|\| is_linux \|\| is_bsd) {
Lines 9-15 Link Here
9	_target_type = "loadable_module"	9	_target_type = "loadable_module"
10	} else {	10	} else {
11	_target_type = "shared_library"	11	_target_type = "shared_library"
12	@@ -59,7 +59,7 @@	12	@@ -57,7 +57,7 @@ template("ppapi_cdm_adapter") {
13	libs += [ "rt" ]	13	libs += [ "rt" ]
14	}	14	}
15		15




--- media/ffmpeg/ffmpeg_common.h.orig	2016-12-09 05:04:20 UTC
+++ media/ffmpeg/ffmpeg_common.h
@@ -25,7 +25,7 @@ extern "C" {
 // Disable deprecated features which result in spammy compile warnings.  This
 // list of defines must mirror those in the 'defines' section of FFmpeg's
 // BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
+//#define FF_API_CONVERGENCE_DURATION 0
 // Upstream libavcodec/utils.c still uses the deprecated
 // av_dup_packet(), causing deprecation warnings.
 // The normal fix for such things is to disable the feature as below,
@@ -39,7 +39,6 @@ extern "C" {
 MSVC_PUSH_DISABLE_WARNING(4244);
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/internal.h>
 #include <libavformat/avio.h>
 #include <libavutil/avutil.h>
 #include <libavutil/imgutils.h>




--- media/filters/ffmpeg_demuxer.cc.orig	2016-12-09 05:04:20 UTC
+++ media/filters/ffmpeg_demuxer.cc
@@ -1186,24 +1186,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
   // If no estimate is found, the stream entry will be kInfiniteDuration.
   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                     kInfiniteDuration);
-  const AVFormatInternal* internal = format_context->internal;
-  if (internal && internal->packet_buffer &&
-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-    struct AVPacketList* packet_buffer = internal->packet_buffer;
-    while (packet_buffer != internal->packet_buffer_end) {
-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-                start_time_estimates.size());
-      const AVStream* stream =
-          format_context->streams[packet_buffer->pkt.stream_index];
-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-        const base::TimeDelta packet_pts =
-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-        if (packet_pts < start_time_estimates[stream->index])
-          start_time_estimates[stream->index] = packet_pts;
-      }
-      packet_buffer = packet_buffer->next;
-    }
-  }
 
   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-media_filters_vp9__parser.h (-2 / +2 lines)
1	--- media/filters/vp9_parser.h.orig 2016-05-25 15:01:03.000000000 -0400	1	--- media/filters/vp9_parser.h.orig 2016-12-09 05:04:20 UTC
2	+++ media/filters/vp9_parser.h 2016-05-27 11:13:20.498371000 -0400	2	+++ media/filters/vp9_parser.h
3	@@ -14,6 +14,7 @@	3	@@ -14,6 +14,7 @@
4		4
5	#include <stddef.h>	5	#include <stddef.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-media_formats_common_offset__byte__queue.cc (-1 / +1 lines)
1	--- media/formats/common/offset_byte_queue.cc.orig 2016-03-25 13:04:49 UTC	1	--- media/formats/common/offset_byte_queue.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/formats/common/offset_byte_queue.cc	2	+++ media/formats/common/offset_byte_queue.cc
3	@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off	3	@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off
4	*size = tail() - offset;	4	*size = tail() - offset;

Lines 1-4 Link Here

(-)www/chromium/files/patch-media_formats_common_offset__byte__queue.h (-1 / +1 lines)
1	--- media/formats/common/offset_byte_queue.h.orig 2016-03-25 13:04:49 UTC	1	--- media/formats/common/offset_byte_queue.h.orig 2016-12-09 05:04:20 UTC
2	+++ media/formats/common/offset_byte_queue.h	2	+++ media/formats/common/offset_byte_queue.h
3	@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {	3	@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
4	// a null \|buf\| and a \|size\| of zero.	4	// a null \|buf\| and a \|size\| of zero.

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc (-3 / +3 lines)
1	--- media/formats/mp2t/es_parser_adts.cc.orig 2016-05-11 19:02:24 UTC	1	--- media/formats/mp2t/es_parser_adts.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/formats/mp2t/es_parser_adts.cc	2	+++ media/formats/mp2t/es_parser_adts.cc
3	@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts	3	@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
4	const uint8_t* es;	4	const uint8_t* es;
5	es_queue_->Peek(&es, &es_size);	5	es_queue_->Peek(&es, &es_size);
6		6
Lines 15-21 Link Here
15	const uint8_t* cur_buf = &es[offset];	15	const uint8_t* cur_buf = &es[offset];
16	if (!isAdtsSyncWord(cur_buf))	16	if (!isAdtsSyncWord(cur_buf))
17	continue;	17	continue;
18	@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts	18	@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
19	return true;	19	return true;
20	}	20	}
21		21

Lines 1-6 Link Here

(-)www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc (-3 / +3 lines)
1	--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2016-05-11 19:02:24 UTC	1	--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2016-12-09 05:04:20 UTC
2	+++ media/formats/mp2t/es_parser_mpeg1audio.cc	2	+++ media/formats/mp2t/es_parser_mpeg1audio.cc
3	@@ -110,11 +110,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud	3	@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
4	const uint8_t* es;	4	const uint8_t* es;
5	es_queue_->Peek(&es, &es_size);	5	es_queue_->Peek(&es, &es_size);
6		6
Lines 15-21 Link Here
15	const uint8_t* cur_buf = &es[offset];	15	const uint8_t* cur_buf = &es[offset];
16	if (cur_buf[0] != 0xff)	16	if (cur_buf[0] != 0xff)
17	continue;	17	continue;
18	@@ -155,7 +155,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud	18	@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
19	return true;	19	return true;
20	}	20	}
21		21

Lines 1-4 Link Here

(-)www/chromium/files/patch-mojo_BUILD.gn (-1 / +1 lines)
1	--- mojo/BUILD.gn.orig 2016-12-12 22:10:20 UTC	1	--- mojo/BUILD.gn.orig 2016-12-09 05:04:21 UTC
2	+++ mojo/BUILD.gn	2	+++ mojo/BUILD.gn
3	@@ -12,7 +12,7 @@ group("mojo") {	3	@@ -12,7 +12,7 @@ group("mojo") {
4	"//mojo/common",	4	"//mojo/common",

Lines 1-6 Link Here

(-)www/chromium/files/patch-mojo_edk_test_BUILD.gn (-4 / +4 lines)
1	--- mojo/edk/test/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300	1	--- mojo/edk/test/BUILD.gn.orig 2016-12-09 05:04:21 UTC
2	+++ mojo/edk/test/BUILD.gn 2016-09-02 23:44:49.826221000 +0300	2	+++ mojo/edk/test/BUILD.gn
3	@@ -43,7 +43,7 @@	3	@@ -48,7 +48,7 @@ source_set("run_all_unittests") {
4	"//testing/gtest",	4	"//testing/gtest",
5	]	5	]
6		6
Lines 9-15 Link Here
9	public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]	9	public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
10	}	10	}
11	}	11	}
12	@@ -63,7 +63,7 @@	12	@@ -68,7 +68,7 @@ source_set("run_all_perftests") {
13	"run_all_perftests.cc",	13	"run_all_perftests.cc",
14	]	14	]
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-native__client__sdk_src_BUILD.gn (-4 / +4 lines)
1	--- native_client_sdk/src/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300	1	--- native_client_sdk/src/BUILD.gn.orig 2016-12-09 05:04:21 UTC
2	+++ native_client_sdk/src/BUILD.gn 2016-09-02 23:46:03.429042000 +0300	2	+++ native_client_sdk/src/BUILD.gn
3	@@ -7,7 +7,7 @@	3	@@ -7,7 +7,7 @@ import("//build/config/features.gni")
4	declare_args() {	4	declare_args() {
5	# Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)	5	# Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)
6	# binaries is supported.	6	# binaries is supported.
Lines 9-15 Link Here
9		9
10	# Build the nacl SDK untrusted components. This is disabled by default since	10	# Build the nacl SDK untrusted components. This is disabled by default since
11	# not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc)	11	# not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc)
12	@@ -28,7 +28,7 @@	12	@@ -28,7 +28,7 @@ if (enable_nacl) {
13	"//native_client/src/trusted/service_runtime:sel_ldr",	13	"//native_client/src/trusted/service_runtime:sel_ldr",
14	"//native_client/src/trusted/validator/driver:ncval_new",	14	"//native_client/src/trusted/validator/driver:ncval_new",
15	]	15	]




--- net/BUILD.gn.orig	2016-12-09 05:04:21 UTC
+++ net/BUILD.gn
@@ -158,6 +158,11 @@ component("net") {
       ]
       if (is_android) {
         sources -= [ "base/openssl_private_key_store_android.cc" ]

       }
     } else {
       if (is_android) {
@@ -283,6 +288,13 @@ component("net") {
       sources -= [ "disk_cache/blockfile/file_posix.cc" ]
     }
 

     if (is_ios || is_mac) {
       sources += gypi_values.net_base_mac_ios_sources
     }
@@ -1013,7 +1025,7 @@ if (!is_ios && !is_android) {
   }
 }
 

   executable("cachetool") {
     testonly = true
     sources = [
@@ -1042,7 +1054,7 @@ if (is_linux || is_mac) {
   }
 }
 

   static_library("epoll_server") {
     sources = [
       "tools/epoll_server/epoll_server.cc",
@@ -1148,7 +1160,7 @@ if (is_android) {
   }
 }
 

   executable("disk_cache_memory_test") {
     testonly = true
     sources = [
@@ -1357,7 +1369,7 @@ test("net_unittests") {
     "third_party/nist-pkits/",
   ]
 

     deps += [
       "//third_party/pyftpdlib/",
       "//third_party/pywebsocket/",
@@ -1380,7 +1392,7 @@ test("net_unittests") {
   if (is_desktop_linux) {
     deps += [ ":epoll_quic_tools" ]
   }

     sources += gypi_values.net_linux_test_sources
     deps += [
       ":epoll_quic_tools",
@@ -1400,6 +1412,12 @@ test("net_unittests") {
     sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
   }
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-net_base_address__tracker__linux.h (-3 / +3 lines)
1	--- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400	1	--- net/base/address_tracker_linux.h.orig 2016-12-09 05:04:21 UTC
2	+++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400	2	+++ net/base/address_tracker_linux.h
3	@@ -6,10 +6,12 @@	3	@@ -6,10 +6,12 @@
4	#define NET_BASE_ADDRESS_TRACKER_LINUX_H_	4	#define NET_BASE_ADDRESS_TRACKER_LINUX_H_
5		5
Lines 13-19 Link Here
13	#include <stddef.h>	13	#include <stddef.h>
14		14
15	#include <map>	15	#include <map>
16	@@ -33,8 +35,11 @@	16	@@ -34,8 +36,11 @@ namespace internal {
17	class NET_EXPORT_PRIVATE AddressTrackerLinux :	17	class NET_EXPORT_PRIVATE AddressTrackerLinux :
18	public base::MessageLoopForIO::Watcher {	18	public base::MessageLoopForIO::Watcher {
19	public:	19	public:

Lines 1-7 Link Here

(-)www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc (-5 / +5 lines)
1	--- net/base/address_tracker_linux_unittest.cc.orig 2016-05-11 19:02:24 UTC	1	--- net/base/address_tracker_linux_unittest.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/base/address_tracker_linux_unittest.cc	2	+++ net/base/address_tracker_linux_unittest.cc
3	@@ -8,7 +8,11 @@	3	@@ -4,7 +4,11 @@
4	#include "base/threading/simple_thread.h"	4
5	#include "net/base/address_tracker_linux.h"	5	#include "net/base/address_tracker_linux.h"
6		6
7	+#if defined(__linux__)	7	+#if defined(__linux__)
Lines 10-14 Link Here
10	+#include <net/if.h>	10	+#include <net/if.h>
11	+#endif	11	+#endif
12		12
13	#include <vector>	13	#include <memory>
14		14	#include <unordered_set>

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_base_mime__util__unittest.cc (-1 / +1 lines)
1	--- net/base/mime_util_unittest.cc.orig 2016-03-25 13:04:50 UTC	1	--- net/base/mime_util_unittest.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/base/mime_util_unittest.cc	2	+++ net/base/mime_util_unittest.cc
3	@@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM	3	@@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM
4	{ "MeSsAge/*", 1, "eml" },	4	{ "MeSsAge/*", 1, "eml" },




--- net/base/network_change_notifier.cc.orig	2016-12-09 05:04:21 UTC
+++ net/base/network_change_notifier.cc
@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti
 #elif defined(OS_MACOSX)
   return new NetworkChangeNotifierMac();
 #else

   return NULL;
 #endif
 }
@@ -753,7 +752,7 @@ void NetworkChangeNotifier::LogOperatorC
 #endif
 }
 

 // static
 const internal::AddressTrackerLinux*
 NetworkChangeNotifier::GetAddressTracker() {
@@ -978,7 +977,7 @@ NetworkChangeNotifier::NetworkChangeNoti
   network_change_calculator_->Init();
 }
 




--- net/base/network_change_notifier.h.orig	2016-12-09 05:04:21 UTC
+++ net/base/network_change_notifier.h
@@ -26,7 +26,7 @@ struct NetworkInterface;
 typedef std::vector<NetworkInterface> NetworkInterfaceList;
 class URLRequest;
 

 namespace internal {
 class AddressTrackerLinux;
 }
@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier {
   // a large HOSTS file.
   static void GetDnsConfig(DnsConfig* config);
 

   // Returns the AddressTrackerLinux if present.
   static const internal::AddressTrackerLinux* GetAddressTracker();
 #endif
@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier {
       const NetworkChangeCalculatorParams& params =
           NetworkChangeCalculatorParams());
 




--- net/base/network_interfaces_linux.cc.orig	2016-12-09 05:04:21 UTC
+++ net/base/network_interfaces_linux.cc
@@ -6,12 +6,14 @@
 
 #include <memory>
 
+#if !defined(OS_FREEBSD)
 #if !defined(OS_ANDROID)

 #include <set>
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -49,6 +51,7 @@ bool TryConvertNativeToNetIPAttributes(i
   // are still progressing through duplicated address detection (DAD)
   // and shouldn't be used by the application layer until DAD process
   // is completed.

   if (native_attributes & (
 #if !defined(OS_ANDROID)
                               IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
@@ -66,6 +69,10 @@ bool TryConvertNativeToNetIPAttributes(i
   }
 
   return true;

 }
 
 }  // namespace
@@ -80,13 +87,15 @@ NetworkChangeNotifier::ConnectionType Ge
   if (!s.is_valid())
     return NetworkChangeNotifier::CONNECTION_UNKNOWN;
 

   // Test ethtool for CONNECTION_ETHERNET
   struct ethtool_cmd ecmd = {};
   ecmd.cmd = ETHTOOL_GSET;
@@ -95,12 +104,13 @@ NetworkChangeNotifier::ConnectionType Ge
   strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
   if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
     return NetworkChangeNotifier::CONNECTION_ETHERNET;

   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
   if (!ioctl_socket.is_valid())
     return "";
@@ -112,9 +122,11 @@ std::string GetInterfaceSSID(const std::
   wreq.u.essid.length = IW_ESSID_MAX_SIZE;
   if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
     return ssid;

 bool GetNetworkListImpl(
     NetworkInterfaceList* networks,
     int policy,
@@ -183,6 +195,7 @@ bool GetNetworkListImpl(
 
   return true;
 }

 
 std::string GetWifiSSIDFromInterfaceListInternal(
     const NetworkInterfaceList& interfaces,
@@ -207,12 +220,16 @@ bool GetNetworkList(NetworkInterfaceList
   if (networks == NULL)
     return false;
 

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_base_network__interfaces__posix.cc (-1 / +1 lines)
1	--- net/base/network_interfaces_posix.cc.orig 2016-05-11 19:02:24 UTC	1	--- net/base/network_interfaces_posix.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/base/network_interfaces_posix.cc	2	+++ net/base/network_interfaces_posix.cc
3	@@ -20,6 +20,7 @@ namespace net {	3	@@ -20,6 +20,7 @@ namespace net {
4	#if !defined(OS_NACL)	4	#if !defined(OS_NACL)

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_dns_address__sorter__posix.cc (-2 / +2 lines)
1	--- net/dns/address_sorter_posix.cc.orig 2016-05-11 19:02:24 UTC	1	--- net/dns/address_sorter_posix.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/dns/address_sorter_posix.cc	2	+++ net/dns/address_sorter_posix.cc
3	@@ -11,6 +11,7 @@	3	@@ -13,6 +13,7 @@
4	#include <sys/socket.h> // Must be included before ifaddrs.h.	4	#include <sys/socket.h> // Must be included before ifaddrs.h.
5	#include <ifaddrs.h>	5	#include <ifaddrs.h>
6	#include <net/if.h>	6	#include <net/if.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc (-1 / +1 lines)
1	--- net/dns/dns_config_service_posix_unittest.cc.orig 2016-12-12 22:12:11 UTC	1	--- net/dns/dns_config_service_posix_unittest.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/dns/dns_config_service_posix_unittest.cc	2	+++ net/dns/dns_config_service_posix_unittest.cc
3	@@ -2,8 +2,6 @@	3	@@ -2,8 +2,6 @@
4	// Use of this source code is governed by a BSD-style license that can be	4	// Use of this source code is governed by a BSD-style license that can be

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_dns_dns__reloader.cc (-1 / +1 lines)
1	--- net/dns/dns_reloader.cc.orig 2016-03-25 13:04:50 UTC	1	--- net/dns/dns_reloader.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/dns/dns_reloader.cc	2	+++ net/dns/dns_reloader.cc
3	@@ -7,6 +7,10 @@	3	@@ -7,6 +7,10 @@
4	#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \	4	#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (-1 / +1 lines)
1	--- net/http/http_auth_gssapi_posix.cc.orig 2016-05-11 19:02:24 UTC	1	--- net/http/http_auth_gssapi_posix.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/http/http_auth_gssapi_posix.cc	2	+++ net/http/http_auth_gssapi_posix.cc
3	@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:	3	@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:
4	static const char* const kDefaultLibraryNames[] = {	4	static const char* const kDefaultLibraryNames[] = {




--- net/proxy/proxy_config_service_linux.cc.orig	2016-12-09 05:04:21 UTC
+++ net/proxy/proxy_config_service_linux.cc
@@ -11,7 +11,14 @@
 #include <limits.h>
 #include <stdio.h>

 #include <unistd.h>
 
 #include <map>
@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox
  public:
   explicit SettingGetterImplKDE(base::Environment* env_var_getter)
       : inotify_fd_(-1),

         notify_delegate_(nullptr),
         debounce_timer_(new base::OneShotTimer()),
         indirect_manual_(false),
@@ -937,9 +945,10 @@ class SettingGetterImplKDE : public Prox
     // and pending tasks may then be deleted without being run.
     // Here in the KDE version, we can safely close the file descriptor
     // anyway. (Not that it really matters; the process is exiting.)

   }
 
   bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
@@ -948,9 +957,17 @@ class SettingGetterImplKDE : public Prox
     // This has to be called on the UI thread (http://crbug.com/69057).
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     DCHECK_LT(inotify_fd_, 0);

       return false;
     }
     if (!base::SetNonBlocking(inotify_fd_)) {
@@ -974,22 +991,40 @@ class SettingGetterImplKDE : public Prox
       close(inotify_fd_);
       inotify_fd_ = -1;
     }

     notify_delegate_ = delegate;
     if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
             inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
@@ -1010,7 +1045,19 @@ class SettingGetterImplKDE : public Prox
   void OnFileCanReadWithoutBlocking(int fd) override {
     DCHECK_EQ(fd, inotify_fd_);
     DCHECK(file_task_runner_->BelongsToCurrentThread());

   }
   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
@@ -1283,8 +1330,11 @@ class SettingGetterImplKDE : public Prox
   void OnChangeNotification() {
     DCHECK_GE(inotify_fd_,  0);
     DCHECK(file_task_runner_->BelongsToCurrentThread());

     ssize_t r;
     while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
       // inotify returns variable-length structures, which is why we have
@@ -1321,6 +1371,7 @@ class SettingGetterImplKDE : public Prox
         inotify_fd_ = -1;
       }
     }

     if (kioslaverc_touched) {
       // We don't use Reset() because the timer may not yet be running.
       // (In that case Stop() is a no-op.)
@@ -1336,6 +1387,7 @@ class SettingGetterImplKDE : public Prox
                    std::vector<std::string> > strings_map_type;
 
   int inotify_fd_;

Lines 1-4 Link Here

(-)www/chromium/files/patch-net_socket_socks5__client__socket.cc (-1 / +1 lines)
1	--- net/socket/socks5_client_socket.cc.orig 2016-05-11 19:02:24 UTC	1	--- net/socket/socks5_client_socket.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/socket/socks5_client_socket.cc	2	+++ net/socket/socks5_client_socket.cc
3	@@ -4,6 +4,10 @@	3	@@ -4,6 +4,10 @@
4		4




--- net/udp/udp_socket_posix.cc.orig	2016-12-09 05:04:21 UTC
+++ net/udp/udp_socket_posix.cc
@@ -51,7 +51,7 @@ const int kBindRetries = 10;
 const int kPortStart = 1024;
 const int kPortEnd = 65535;
 

 
 // Returns IPv4 address in network order.
 int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) {
@@ -679,7 +679,7 @@ int UDPSocketPosix::SetMulticastOptions(
   if (multicast_interface_ != 0) {
     switch (addr_family_) {
       case AF_INET: {

         ip_mreqn mreq;
         mreq.imr_ifindex = multicast_interface_;
         mreq.imr_address.s_addr = htonl(INADDR_ANY);
@@ -754,7 +754,7 @@ int UDPSocketPosix::JoinGroup(const IPAd
       if (addr_family_ != AF_INET)
         return ERR_ADDRESS_INVALID;
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-net_udp_udp__socket__unittest.cc (-2 / +2 lines)
1	--- net/udp/udp_socket_unittest.cc.orig 2016-05-11 19:02:25 UTC	1	--- net/udp/udp_socket_unittest.cc.orig 2016-12-09 05:04:21 UTC
2	+++ net/udp/udp_socket_unittest.cc	2	+++ net/udp/udp_socket_unittest.cc
3	@@ -266,7 +266,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking	3	@@ -280,7 +280,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking
4	}	4	}
5	#endif	5	#endif
6		6




--- pdf/pdfium/pdfium_engine.cc.orig	2016-12-09 05:04:21 UTC
+++ pdf/pdfium/pdfium_engine.cc
@@ -123,7 +123,7 @@ std::vector<uint32_t> GetPageNumbersFrom
   return page_numbers;
 }
 

 
 PP_Instance g_last_instance_id;
 
@@ -509,7 +509,7 @@ bool InitializeSDK() {
   config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
   FPDF_InitLibraryWithConfig(&config);
 

   // Font loading doesn't work in the renderer sandbox in Linux.
   FPDF_SetSystemFontInfo(&g_font_info);
 #endif
@@ -623,7 +623,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
   IFSDK_PAUSE::user = nullptr;
   IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
 

   // PreviewModeClient does not know its pp::Instance.
   pp::Instance* instance = client_->GetPluginInstance();
   if (instance)
@@ -1332,7 +1332,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
     FPDF_ClosePage(pdf_page);
   }
 

   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
 #endif
 
@@ -2751,7 +2751,7 @@ bool PDFiumEngine::ContinuePaint(int pro
   DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
   DCHECK(image_data);
 

   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
 #endif
 
@@ -3210,7 +3210,7 @@ void PDFiumEngine::SetCurrentPage(int in
     FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
   }
   most_visible_page_ = index;

Lines 1-4 Link Here

(-)www/chromium/files/patch-ppapi_proxy_file__io__resource.cc (-1 / +1 lines)
1	--- ppapi/proxy/file_io_resource.cc.orig 2016-05-11 19:02:25 UTC	1	--- ppapi/proxy/file_io_resource.cc.orig 2016-12-09 05:04:21 UTC
2	+++ ppapi/proxy/file_io_resource.cc	2	+++ ppapi/proxy/file_io_resource.cc
3	@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of	3	@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc (-1 / +1 lines)
1	--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2016-05-11 19:02:25 UTC	1	--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2016-12-09 05:04:21 UTC
2	+++ ppapi/shared_impl/private/net_address_private_impl.cc	2	+++ ppapi/shared_impl/private/net_address_private_impl.cc
3	@@ -26,9 +26,12 @@	3	@@ -26,9 +26,12 @@
4	#include <arpa/inet.h>	4	#include <arpa/inet.h>

Lines 1-6 Link Here

(-)www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn (-3 / +3 lines)
1	--- ppapi/tests/extensions/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300	1	--- ppapi/tests/extensions/BUILD.gn.orig 2016-12-09 05:04:22 UTC
2	+++ ppapi/tests/extensions/BUILD.gn 2016-10-13 08:10:32.687869000 +0300	2	+++ ppapi/tests/extensions/BUILD.gn
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@ group("extensions") {
4	":ppapi_tests_extensions_popup($newlib)",	4	":ppapi_tests_extensions_popup($newlib)",
5	":ppapi_tests_extensions_socket_permissions($newlib)",	5	":ppapi_tests_extensions_socket_permissions($newlib)",
6	]	6	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-printing_BUILD.gn (-4 / +4 lines)
1	--- printing/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300	1	--- printing/BUILD.gn.orig 2016-12-09 05:04:22 UTC
2	+++ printing/BUILD.gn 2016-10-13 08:13:38.178051000 +0300	2	+++ printing/BUILD.gn
3	@@ -125,7 +125,7 @@	3	@@ -125,7 +125,7 @@ component("printing") {
4	if (use_cups) {	4	if (use_cups) {
5	configs += [ ":cups" ]	5	configs += [ ":cups" ]
6		6
Lines 9-15 Link Here
9	# rebase_path does not accept an empty string	9	# rebase_path does not accept an empty string
10	if (use_sysroot) {	10	if (use_sysroot) {
11	cups_sysroot = rebase_path(sysroot)	11	cups_sysroot = rebase_path(sysroot)
12	@@ -202,7 +202,7 @@	12	@@ -202,7 +202,7 @@ component("printing") {
13	"printing_context_no_system_dialog.cc",	13	"printing_context_no_system_dialog.cc",
14	"printing_context_no_system_dialog.h",	14	"printing_context_no_system_dialog.h",
15	]	15	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-printing_cups__config__helper.py (-3 / +3 lines)
1	--- printing/cups_config_helper.py.orig 2016-08-03 22:02:22.000000000 +0300	1	--- printing/cups_config_helper.py.orig 2016-12-09 05:04:22 UTC
2	+++ printing/cups_config_helper.py 2016-09-02 22:48:48.706284000 +0300	2	+++ printing/cups_config_helper.py
3	@@ -65,7 +65,7 @@	3	@@ -65,7 +65,7 @@ def main():
4	mode = sys.argv[1]	4	mode = sys.argv[1]
5	if len(sys.argv) > 2 and sys.argv[2]:	5	if len(sys.argv) > 2 and sys.argv[2]:
6	sysroot = sys.argv[2]	6	sysroot = sys.argv[2]




--- remoting/host/BUILD.gn.orig	2016-12-09 05:04:22 UTC
+++ remoting/host/BUILD.gn
@@ -325,7 +325,7 @@ static_library("host") {
     deps += [ "//components/policy:generated" ]
   }
 

     libs += [ "pam" ]
   }
 
@@ -348,7 +348,7 @@ static_library("host") {
       "input_injector_x11.cc",
       "local_input_monitor_x11.cc",
     ]

       # These will already be filtered out on non-Linux.
       sources -= [
         "linux/unicode_to_keysym.cc",
@@ -537,7 +537,7 @@ source_set("unit_tests") {
     "touch_injector_win_unittest.cc",
   ]
 
-  if (!use_x11 && is_linux) {

     sources -= [ "linux/unicode_to_keysym_unittest.cc" ]
   }
   if (use_ozone || is_chromeos) {
@@ -770,7 +770,7 @@ if (enable_me2me_host) {
         deps += [ "//build/config/linux/gtk2" ]
       }
     }
-    if ((is_linux && !is_chromeos) || is_mac) {
+    if ((is_linux && !is_chromeos) || is_mac || is_bsd) {

       libs = [ "pam" ]
     }
 
@@ -886,7 +886,7 @@ if (enable_me2me_host) {
       }
     }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-sdch_BUILD.gn (-4 / +4 lines)
1	--- sdch/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300	1	--- sdch/BUILD.gn.orig 2016-12-09 05:04:22 UTC
2	+++ sdch/BUILD.gn 2016-09-13 17:24:52.015350000 +0300	2	+++ sdch/BUILD.gn
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@ config("sdch_config") {
4	# from a config and can't be on the target directly.	4	# from a config and can't be on the target directly.
5	config("sdch_warnings") {	5	config("sdch_warnings") {
6	cflags = []	6	cflags = []
Lines 9-15 Link Here
9	# TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:	9	# TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:
10	cflags += [ "-Wno-deprecated-declarations" ]	10	cflags += [ "-Wno-deprecated-declarations" ]
11	}	11	}
12	@@ -61,7 +61,7 @@	12	@@ -59,7 +59,7 @@ static_library("sdch") {
13	"//third_party/zlib",	13	"//third_party/zlib",
14	]	14	]
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_shell_standalone_context.cc (-3 / +3 lines)
1	--- services/shell/standalone/context.cc.orig 2016-10-06 04:02:24.000000000 +0300	1	--- services/shell/standalone/context.cc.orig 2016-12-09 05:04:22 UTC
2	+++ services/shell/standalone/context.cc 2016-10-23 13:44:14.656275000 +0300	2	+++ services/shell/standalone/context.cc
3	@@ -198,7 +198,7 @@	3	@@ -196,7 +196,7 @@ void Context::Init(std::unique_ptr<InitP
4	tracing_remote_interfaces->GetInterface(	4	tracing_remote_interfaces->GetInterface(
5	tracing::mojom::StartupPerformanceDataCollector::Name_,	5	tracing::mojom::StartupPerformanceDataCollector::Name_,
6	mojo::GetProxy(&collector).PassMessagePipe());	6	mojo::GetProxy(&collector).PassMessagePipe());

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_ui_BUILD.gn (-4 / +4 lines)
1	--- services/ui/BUILD.gn.orig 2016-12-09 05:04:22.000000000 +0000	1	--- services/ui/BUILD.gn.orig 2016-12-09 05:04:22 UTC
2	+++ services/ui/BUILD.gn 2016-12-19 19:02:41.332230000 +0000	2	+++ services/ui/BUILD.gn
3	@@ -13,7 +13,6 @@	3	@@ -13,7 +13,6 @@ group("all") {
4	testonly = true	4	testonly = true
5	deps = [	5	deps = [
6	":ui",	6	":ui",
Lines 8-14 Link Here
8	"//services/ui/test_wm",	8	"//services/ui/test_wm",
9	]	9	]
10	}	10	}
11	@@ -38,7 +37,6 @@	11	@@ -38,7 +37,6 @@ service("ui") {
12		12
13	data_deps = [	13	data_deps = [
14	":manifest",	14	":manifest",

Lines 1-6 Link Here

(-)www/chromium/files/patch-services_ui_ime_BUILD.gn (-3 / +3 lines)
1	--- services/ui/ime/BUILD.gn.orig 2016-12-19 15:26:06.098748000 +0000	1	--- services/ui/ime/BUILD.gn.orig 2016-12-09 05:04:22 UTC
2	+++ services/ui/ime/BUILD.gn 2016-12-19 15:26:20.556851000 +0000	2	+++ services/ui/ime/BUILD.gn
3	@@ -49,7 +49,6 @@	3	@@ -49,7 +49,6 @@ test("mus_ime_unittests") {
4	":test_manifest",	4	":test_manifest",
5	":lib",	5	":lib",
6	"//services/ui",	6	"//services/ui",




--- skia/BUILD.gn.orig	2016-12-09 05:04:22 UTC
+++ skia/BUILD.gn
@@ -134,7 +134,7 @@ config("skia_library_config") {
   }
 
   # Settings for text blitting, chosen to approximate the system browser.

     defines += [
       "SK_GAMMA_EXPONENT=1.2",
       "SK_GAMMA_CONTRAST=0.2",
@@ -359,7 +359,7 @@ component("skia") {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 

-  if (!is_linux) {
+  if (!is_linux && !is_bsd) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
@@ -371,14 +371,14 @@ component("skia") {
 
   # Add the files for the SkFontMgr_Android. This is used to emulate android
   # fonts on linux. See content/zygote/zygote_main_linux.cc

     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
@@ -417,7 +417,7 @@ component("skia") {
     "//base/third_party/dynamic_annotations",
   ]
 
-  if (is_linux) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp (-3 / +3 lines)
1	--- skia/ext/SkMemory_new_handler.cpp.orig 2016-04-08 16:02:10 UTC	1	--- skia/ext/SkMemory_new_handler.cpp.orig 2016-12-09 05:04:22 UTC
2	+++ skia/ext/SkMemory_new_handler.cpp	2	+++ skia/ext/SkMemory_new_handler.cpp
3	@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t si	3	@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si
4	// TODO(b.kelemen): we should always use UncheckedMalloc but currently it	4	// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
5	// doesn't work as intended everywhere.	5	// doesn't work as intended everywhere.
6	void* result;	6	void* result;
Lines 9-15 Link Here
9	result = malloc(size);	9	result = malloc(size);
10	#else	10	#else
11	// It's the responsibility of the caller to check the return value.	11	// It's the responsibility of the caller to check the return value.
12	@@ -89,7 +89,7 @@ void* sk_calloc(size_t size) {	12	@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) {
13	// TODO(b.kelemen): we should always use UncheckedCalloc but currently it	13	// TODO(b.kelemen): we should always use UncheckedCalloc but currently it
14	// doesn't work as intended everywhere.	14	// doesn't work as intended everywhere.
15	void* result;	15	void* result;

Lines 1-4 Link Here

(-)www/chromium/files/patch-testing_gtest_src_gtest.cc (-1 / +1 lines)
1	--- testing/gtest/src/gtest.cc.orig 2016-05-11 19:03:10 UTC	1	--- testing/gtest/src/gtest.cc.orig 2016-12-09 05:05:02 UTC
2	+++ testing/gtest/src/gtest.cc	2	+++ testing/gtest/src/gtest.cc
3	@@ -122,6 +122,10 @@	3	@@ -122,6 +122,10 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp (-2 / +2 lines)
1	--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2016-05-11 19:02:30 UTC	1	--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2016-12-09 05:04:31 UTC
2	+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp	2	+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
3	@@ -44,6 +44,8 @@	3	@@ -46,6 +46,8 @@
4		4
5	#if OS(WIN)	5	#if OS(WIN)
6	#include <malloc.h>	6	#include <malloc.h>

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn (-3 / +3 lines)
1	--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2016-12-15 15:07:51.031899000 +0000	1	--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2016-12-09 05:04:31 UTC
2	+++ third_party/WebKit/Source/core/layout/BUILD.gn 2016-12-15 15:08:04.975660000 +0000	2	+++ third_party/WebKit/Source/core/layout/BUILD.gn
3	@@ -341,7 +341,7 @@	3	@@ -341,7 +341,7 @@ blink_core_sources("layout") {
4	sources += [ "LayoutThemeFontProviderDefault.cpp" ]	4	sources += [ "LayoutThemeFontProviderDefault.cpp" ]
5	}	5	}
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2016-12-13 00:43:16 UTC	1	--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp	2	+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp
3	@@ -61,9 +61,9 @@ using namespace WTF;	3	@@ -61,9 +61,9 @@ using namespace WTF;
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2016-12-13 00:42:58 UTC	1	--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/FontCache.h	2	+++ third_party/WebKit/Source/platform/fonts/FontCache.h
3	@@ -217,7 +217,7 @@ class PLATFORM_EXPORT FontCache {	3	@@ -217,7 +217,7 @@ class PLATFORM_EXPORT FontCache {
4	const FontFaceCreationParams&,	4	const FontFaceCreationParams&,

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-12-13 00:46:20 UTC	1	--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp	2	+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
3	@@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const	3	@@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const
4	m_syntheticBold(source.m_syntheticBold),	4	m_syntheticBold(source.m_syntheticBold),

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-12-13 00:46:30 UTC	1	--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h	2	+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h
3	@@ -47,9 +47,9 @@	3	@@ -47,9 +47,9 @@
4	#include "wtf/text/CString.h"	4	#include "wtf/text/CString.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2016-12-13 00:50:37 UTC	1	--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp	2	+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
3	@@ -51,7 +51,7 @@ namespace blink {	3	@@ -51,7 +51,7 @@ namespace blink {
4	const float smallCapsFontSizeMultiplier = 0.7f;	4	const float smallCapsFontSizeMultiplier = 0.7f;

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-12-13 00:51:35 UTC	1	--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp	2	+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
3	@@ -63,7 +63,7 @@ static sk_sp<SkTypeface> typefaceForFont	3	@@ -63,7 +63,7 @@ static sk_sp<SkTypeface> typefaceForFont
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2016-04-08 16:02:13 UTC	1	--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/heap/GCInfo.cpp	2	+++ third_party/WebKit/Source/platform/heap/GCInfo.cpp
3	@@ -7,6 +7,8 @@	3	@@ -7,6 +7,8 @@
4	#include "platform/heap/Handle.h"	4	#include "platform/heap/Handle.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2016-05-11 19:02:33 UTC	1	--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp	2	+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
3	@@ -6,6 +6,8 @@	3	@@ -6,6 +6,8 @@
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig 2016-12-13 00:53:03 UTC	1	--- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2	+++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
3	@@ -28,6 +28,9 @@	3	@@ -28,6 +28,9 @@
4	#include "wtf/StdLibExtras.h"	4	#include "wtf/StdLibExtras.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2016-12-13 00:40:36 UTC	1	--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp	2	+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp
3	@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex	3	@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex
4	m_isInGroup(false),	4	m_isInGroup(false),

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-12-13 00:15:09 UTC	1	--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/Assertions.cpp	2	+++ third_party/WebKit/Source/wtf/Assertions.cpp
3	@@ -60,7 +60,7 @@	3	@@ -60,7 +60,7 @@
4	#include <windows.h>	4	#include <windows.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h (-1 / +1 lines)
1	--- third_party/WebKit/Source/wtf/Atomics.h.orig 2016-12-13 00:13:22 UTC	1	--- third_party/WebKit/Source/wtf/Atomics.h.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/Atomics.h	2	+++ third_party/WebKit/Source/wtf/Atomics.h
3	@@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in	3	@@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in
4	#if defined(THREAD_SANITIZER)	4	#if defined(THREAD_SANITIZER)

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn (-3 / +3 lines)
1	--- third_party/WebKit/Source/wtf/BUILD.gn.orig 2016-12-14 18:31:06.308889000 +0000	1	--- third_party/WebKit/Source/wtf/BUILD.gn.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/BUILD.gn 2016-12-14 18:32:07.771435000 +0000	2	+++ third_party/WebKit/Source/wtf/BUILD.gn
3	@@ -286,6 +286,10 @@	3	@@ -286,6 +286,10 @@ component("wtf") {
4	libs = [ "dl" ]	4	libs = [ "dl" ]
5	}	5	}
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h (-1 / +1 lines)
1	--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2016-12-13 00:09:55 UTC	1	--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/ByteSwap.h	2	+++ third_party/WebKit/Source/wtf/ByteSwap.h
3	@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t	3	@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h (-1 / +1 lines)
1	--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2016-12-13 00:24:56 UTC	1	--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/ContainerAnnotations.h	2	+++ third_party/WebKit/Source/wtf/ContainerAnnotations.h
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp (-1 / +1 lines)
1	--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2016-12-13 00:19:49 UTC	1	--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2016-12-09 05:04:32 UTC
2	+++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp	2	+++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp
3	@@ -49,11 +49,15 @@	3	@@ -49,11 +49,15 @@
4	#include <objc/objc-auto.h>	4	#include <objc/objc-auto.h>




--- third_party/angle/BUILD.gn.orig	2016-12-09 05:05:03 UTC
+++ third_party/angle/BUILD.gn
@@ -16,6 +16,12 @@ if (ozone_platform_gbm) {
   }
 }
 

 angle_git_is_present = exec_script("src/commit_id.py",
                                    [
                                      "check",
@@ -381,11 +387,7 @@ static_library("libANGLE") {
     if (use_x11) {
       sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
       deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]

     }
     if (is_mac) {
       sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
@@ -527,7 +529,7 @@ util_gypi = exec_script("//build/gypi_to
 
 config("angle_util_config") {
   include_dirs = [ "util" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_angle_build_angle__common.gni (-3 / +3 lines)
1	--- third_party/angle/build/angle_common.gni.orig 2016-10-06 04:04:51.000000000 +0300	1	--- third_party/angle/build/angle_common.gni.orig 2016-12-09 05:05:03 UTC
2	+++ third_party/angle/build/angle_common.gni 2016-10-13 08:24:01.038996000 +0300	2	+++ third_party/angle/build/angle_common.gni
3	@@ -18,6 +18,8 @@	3	@@ -19,6 +19,8 @@ if (is_win) {
4	import("//build/config/win/visual_studio_version.gni")	4	import("//build/config/win/visual_studio_version.gni")
5	} else if (is_linux && use_x11 && !is_chromeos) {	5	} else if (is_linux && use_x11 && !is_chromeos) {
6	angle_enable_gl = true	6	angle_enable_gl = true




--- third_party/angle/src/tests/BUILD.gn.orig	2016-12-09 05:05:03 UTC
+++ third_party/angle/src/tests/BUILD.gn
@@ -41,7 +41,7 @@ test("angle_unittests") {
   ]
 }
 

   end2end_gypi = exec_script("//build/gypi_to_gn.py",
                              [
                                rebase_path("angle_end2end_tests.gypi"),
@@ -82,7 +82,7 @@ if (is_win || is_linux || is_mac || is_a
       "//third_party/angle:libANGLE_config",
     ]
 

       # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
     }
@@ -175,7 +175,7 @@ if (build_angle_deqp_tests) {
     # Ask the system headers to expose all the regular function otherwise
     # dEQP doesn't compile and produces warnings about implicitly defined
     # functions.

       # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
       defines += [ "_GNU_SOURCE" ]
     }
@@ -198,7 +198,7 @@ if (build_angle_deqp_tests) {
     ]
   }
 

     deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
   }
 
@@ -234,7 +234,7 @@ if (build_angle_deqp_tests) {
     if (is_win) {
       sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
     }

       sources +=
           rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
     }
@@ -262,7 +262,7 @@ if (build_angle_deqp_tests) {
 
     # Taken from gpu/BUILD.gn
     # TODO(jmadill): this should be in a shared location

       libs = [ "pci" ]
     }
   }
@@ -335,7 +335,7 @@ if (build_angle_deqp_tests) {
         "../../../deqp/src/data/",
       ]
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_boringssl_BUILD.gn (-6 / +6 lines)
1	--- third_party/boringssl/BUILD.gn.orig 2016-08-03 22:02:37.000000000 +0300	1	--- third_party/boringssl/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/boringssl/BUILD.gn 2016-09-03 01:48:31.761556000 +0300	2	+++ third_party/boringssl/BUILD.gn
3	@@ -83,7 +83,7 @@	3	@@ -88,7 +88,7 @@ if (is_win && !is_msan) {
4	} else if (current_cpu == "x64") {	4	} else if (current_cpu == "x64") {
5	if (is_mac) {	5	if (is_mac) {
6	sources += crypto_sources_mac_x86_64	6	sources += crypto_sources_mac_x86_64
Lines 9-15 Link Here
9	sources += crypto_sources_linux_x86_64	9	sources += crypto_sources_linux_x86_64
10	} else {	10	} else {
11	public_configs = [ ":no_asm_config" ]	11	public_configs = [ ":no_asm_config" ]
12	@@ -91,14 +91,14 @@	12	@@ -96,14 +96,14 @@ if (is_win && !is_msan) {
13	} else if (current_cpu == "x86") {	13	} else if (current_cpu == "x86") {
14	if (is_mac) {	14	if (is_mac) {
15	sources += crypto_sources_mac_x86	15	sources += crypto_sources_mac_x86
Lines 25-29 Link Here
25	- } else if (current_cpu == "arm64" && (is_linux \|\| is_android)) {	25	- } else if (current_cpu == "arm64" && (is_linux \|\| is_android)) {
26	+ } else if (current_cpu == "arm64" && (is_linux \|\| is_bsd \|\| is_android)) {	26	+ } else if (current_cpu == "arm64" && (is_linux \|\| is_bsd \|\| is_android)) {
27	sources += crypto_sources_linux_aarch64	27	sources += crypto_sources_linux_aarch64
28		28	} else {
29	# TODO(davidben): Remove explicit arch flag once https://crbug.com/576858	29	public_configs = [ ":no_asm_config" ]

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c (-3 / +3 lines)
1	--- third_party/boringssl/src/crypto/ex_data.c.orig 2016-08-03 22:03:20.000000000 +0300	1	--- third_party/boringssl/src/crypto/ex_data.c.orig 2016-12-09 05:05:03 UTC
2	+++ third_party/boringssl/src/crypto/ex_data.c 2016-09-17 04:02:25.959140000 +0300	2	+++ third_party/boringssl/src/crypto/ex_data.c
3	@@ -188,7 +188,9 @@	3	@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a
4	}	4	}
5	}	5	}
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h (-1 / +1 lines)
1	--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2016-05-20 23:45:41 UTC	1	--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h	2	+++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
3	@@ -334,6 +334,8 @@ class Status {	3	@@ -334,6 +334,8 @@ class Status {
4	*/	4	*/

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_expat_BUILD.gn (-3 / +3 lines)
1	--- third_party/expat/BUILD.gn.orig 2016-10-06 04:02:41.000000000 +0300	1	--- third_party/expat/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/expat/BUILD.gn 2016-10-13 08:30:21.841353000 +0300	2	+++ third_party/expat/BUILD.gn
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test.
4	# let's not pull it in twice.	4	# let's not pull it in twice.
5	# Chromecast doesn't ship expat as a system library.	5	# Chromecast doesn't ship expat as a system library.
6	# Libfuzzer and AFL need to build library from sources.	6	# Libfuzzer and AFL need to build library from sources.

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_ffmpeg_BUILD.gn (-3 / +3 lines)
1	--- third_party/ffmpeg/BUILD.gn.orig 2016-08-03 22:03:29.000000000 +0300	1	--- third_party/ffmpeg/BUILD.gn.orig 2016-12-09 05:05:04 UTC
2	+++ third_party/ffmpeg/BUILD.gn 2016-10-10 14:53:20.790578000 +0300	2	+++ third_party/ffmpeg/BUILD.gn
3	@@ -6,8 +6,13 @@	3	@@ -6,8 +6,13 @@ import("ffmpeg_options.gni")
4	import("ffmpeg_generated.gni")	4	import("ffmpeg_generated.gni")
5		5
6	# Path to platform configuration files.	6	# Path to platform configuration files.




--- third_party/ffmpeg/ffmpeg_generated.gni.orig	2016-12-09 05:05:04 UTC
+++ third_party/ffmpeg/ffmpeg_generated.gni
@@ -12,7 +12,7 @@ ffmpeg_c_sources = []
 ffmpeg_gas_sources = []

   ffmpeg_c_sources += [
     "libavcodec/allcodecs.c",
     "libavcodec/autorename_libavcodec_utils.c",
@@ -146,7 +146,7 @@ if ((is_android && current_cpu == "arm" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/h264pred.c",
     "libavcodec/hpeldsp.c",
@@ -161,13 +161,13 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/aac_ac3_parser.c",
     "libavcodec/aac_parser.c",
@@ -209,7 +209,7 @@ if ((is_android && current_cpu == "arm" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
     "libavcodec/x86/constants.c",
@@ -221,7 +221,7 @@ if ((is_android && current_cpu == "x64" 
   ]
 }
 

   ffmpeg_yasm_sources += [
     "libavcodec/x86/fft.asm",
     "libavcodec/x86/vorbisdsp.asm",
@@ -232,7 +232,7 @@ if ((is_android && current_cpu == "x64" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/cabac.c",
     "libavcodec/h264.c",
@@ -255,7 +255,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/fft_fixed_init_arm.c",
     "libavcodec/arm/fft_init_arm.c",
@@ -271,7 +271,7 @@ if ((is_android && current_cpu == "arm" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/flac.c",
     "libavcodec/flac_parser.c",
@@ -282,7 +282,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/h264pred_init_arm.c",
     "libavcodec/arm/hpeldsp_init_arm.c",
@@ -302,7 +302,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavutil/arm/float_dsp_init_neon.c",
   ]
@@ -317,7 +317,7 @@ if ((is_android && current_cpu == "arm" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
     "libavcodec/x86/h264_intrapred_init.c",
@@ -337,13 +337,13 @@ if ((is_linux && current_cpu == "x64" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/aacpsdsp_init.c",
     "libavcodec/x86/dct_init.c",
@@ -352,7 +352,7 @@ if ((is_android && current_cpu == "x64" 
   ]
 }
 

   ffmpeg_yasm_sources += [
     "libavcodec/x86/aacpsdsp.asm",
     "libavcodec/x86/dct32.asm",
@@ -361,7 +361,7 @@ if ((is_android && current_cpu == "x64" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/aacpsdsp_init_arm.c",
     "libavcodec/arm/mpegaudiodsp_init_arm.c",
@@ -372,7 +372,7 @@ if ((is_android && current_cpu == "arm" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/acelp_filters.c",
     "libavcodec/acelp_pitch_delay.c",
@@ -427,7 +427,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/mips/h264pred_init_mips.c",
     "libavcodec/mips/hpeldsp_init_mips.c",
@@ -435,7 +435,7 @@ if ((is_linux && current_cpu == "mipsel"
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/aarch64/fft_init_aarch64.c",
     "libavcodec/aarch64/vorbisdsp_init.c",
@@ -450,7 +450,7 @@ if ((is_android && current_cpu == "arm64
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/aarch64/h264pred_init.c",
     "libavcodec/aarch64/hpeldsp_init_aarch64.c",
@@ -463,7 +463,7 @@ if ((is_linux && current_cpu == "arm64" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/flacdsp_init_arm.c",
   ]
@@ -472,7 +472,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/h264chroma_init_arm.c",
     "libavcodec/arm/h264dsp_init_arm.c",
@@ -483,7 +483,7 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/hpeldsp_init_neon.c",
     "libavcodec/arm/vp8dsp_init_neon.c",
@@ -496,14 +496,14 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/h264_qpel.c",
     "libavcodec/x86/h264chroma_init.c",
@@ -524,7 +524,7 @@ if ((is_linux && current_cpu == "x64" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/mips/aacdec_mips.c",
     "libavcodec/mips/aacpsdsp_mips.c",
@@ -533,7 +533,7 @@ if ((is_android && current_cpu == "mips6
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/flacdsp_init.c",
   ]
@@ -548,7 +548,7 @@ if ((is_win && current_cpu == "x64" && f
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/mips/h264chroma_init_mips.c",
     "libavcodec/mips/h264dsp_init_mips.c",
@@ -556,7 +556,7 @@ if ((is_linux && current_cpu == "mipsel"
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/aarch64/imdct15_init.c",
     "libavcodec/aarch64/mpegaudiodsp_init.c",
@@ -567,7 +567,7 @@ if ((is_android && current_cpu == "arm64
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/aarch64/h264chroma_init_aarch64.c",
     "libavcodec/aarch64/h264dsp_init_aarch64.c",
@@ -581,7 +581,7 @@ if ((is_linux && current_cpu == "arm64" 
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/arm/blockdsp_init_arm.c",
     "libavcodec/arm/idctdsp_init_arm.c",
@@ -605,13 +605,13 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 

   ffmpeg_gas_sources += [
     "libavcodec/arm/h264cmc_neon.S",
     "libavcodec/arm/h264dsp_neon.S",
@@ -626,7 +626,7 @@ if ((is_win && current_cpu == "x64" && f
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/x86/blockdsp_init.c",
     "libavcodec/x86/fdct.c",
@@ -653,7 +653,7 @@ if ((is_linux && current_cpu == "x64" &&
   ]
 }
 

   ffmpeg_c_sources += [
     "libavcodec/mips/blockdsp_init_mips.c",
     "libavcodec/mips/h263dsp_init_mips.c",
@@ -666,7 +666,7 @@ if (is_linux && current_cpu == "mipsel" 
   ]
 }
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c (-2 / +2 lines)
1	--- third_party/ffmpeg/libavutil/mem.c.orig 2016-08-03 22:03:29.000000000 +0300	1	--- third_party/ffmpeg/libavutil/mem.c.orig 2016-12-09 05:05:05 UTC
2	+++ third_party/ffmpeg/libavutil/mem.c 2016-10-11 02:40:34.765488000 +0300	2	+++ third_party/ffmpeg/libavutil/mem.c
3	@@ -32,9 +32,6 @@	3	@@ -32,9 +32,6 @@
4	#include <stdint.h>	4	#include <stdint.h>
5	#include <stdlib.h>	5	#include <stdlib.h>

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_fontconfig_BUILD.gn (-2 / +2 lines)
1	--- third_party/fontconfig/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/fontconfig/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/fontconfig/BUILD.gn 2016-09-03 01:45:52.485587000 +0300	2	+++ third_party/fontconfig/BUILD.gn
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4	# Use of this source code is governed by a BSD-style license that can be	4	# Use of this source code is governed by a BSD-style license that can be
5	# found in the LICENSE file.	5	# found in the LICENSE file.

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_freetype2_BUILD.gn (-2 / +2 lines)
1	--- third_party/freetype2/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/freetype2/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/freetype2/BUILD.gn 2016-09-03 01:41:52.625191000 +0300	2	+++ third_party/freetype2/BUILD.gn
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4	# Use of this source code is governed by a BSD-style license that can be	4	# Use of this source code is governed by a BSD-style license that can be
5	# found in the LICENSE file.	5	# found in the LICENSE file.

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_glslang_BUILD.gn (-4 / +4 lines)
1	--- third_party/glslang/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/glslang/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/glslang/BUILD.gn 2016-09-03 01:42:51.603010000 +0300	2	+++ third_party/glslang/BUILD.gn
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@ config("glslang_config") {
4	include_dirs = [ "src" ]	4	include_dirs = [ "src" ]
5		5
6	defines = []	6	defines = []
Lines 9-15 Link Here
9	defines += [ "GLSLANG_OSINCLUDE_UNIX" ]	9	defines += [ "GLSLANG_OSINCLUDE_UNIX" ]
10	} else if (is_win) {	10	} else if (is_win) {
11	defines += [ "GLSLANG_OSINCLUDE_WIN32" ]	11	defines += [ "GLSLANG_OSINCLUDE_WIN32" ]
12	@@ -132,7 +132,7 @@	12	@@ -132,7 +132,7 @@ static_library("glslang") {
13	"src/glslang/Public/ShaderLang.h",	13	"src/glslang/Public/ShaderLang.h",
14	]	14	]
15		15

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn (-4 / +4 lines)
1	--- third_party/harfbuzz-ng/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/harfbuzz-ng/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/harfbuzz-ng/BUILD.gn 2016-09-03 01:51:35.889144000 +0300	2	+++ third_party/harfbuzz-ng/BUILD.gn
3	@@ -48,7 +48,7 @@	3	@@ -50,7 +50,7 @@ if (use_system_harfbuzz) {
4		4
5	# See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this.	5	# See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this.
6	config("pangoft2_link_hack") {	6	config("pangoft2_link_hack") {
Lines 9-15 Link Here
9	current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {	9	current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {
10	# These symbols are referenced from libpangoft2, which will be	10	# These symbols are referenced from libpangoft2, which will be
11	# dynamically linked later.	11	# dynamically linked later.
12	@@ -186,7 +186,7 @@	12	@@ -193,7 +193,7 @@ if (use_system_harfbuzz) {
13	# in the tree, all symbols pango needs must be included, or	13	# in the tree, all symbols pango needs must be included, or
14	# pango uses mixed versions of harfbuzz and leads to crash.	14	# pango uses mixed versions of harfbuzz and leads to crash.
15	# See crbug.com/462689.	15	# See crbug.com/462689.

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc (-3 / +3 lines)
1	--- third_party/leveldatabase/env_chromium.cc.orig 2016-10-06 04:02:41.000000000 +0300	1	--- third_party/leveldatabase/env_chromium.cc.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/leveldatabase/env_chromium.cc 2016-10-13 08:33:43.174604000 +0300	2	+++ third_party/leveldatabase/env_chromium.cc
3	@@ -23,7 +23,11 @@	3	@@ -24,7 +24,11 @@
4	#include "base/trace_event/trace_event.h"	4	#include "base/trace_event/trace_event.h"
5	#include "third_party/leveldatabase/chromium_logger.h"	5	#include "third_party/leveldatabase/chromium_logger.h"
6	#include "third_party/leveldatabase/src/include/leveldb/options.h"	6	#include "third_party/leveldatabase/src/include/leveldb/options.h"

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h (-2 / +2 lines)
1	--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2016-05-27 10:38:59.514474000 -0400	1	--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2016-12-09 05:05:07 UTC
2	+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h 2016-05-27 10:40:19.234261000 -0400	2	+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4	// user of the library know that it can't be used in a thread-safe manner when	4	// user of the library know that it can't be used in a thread-safe manner when
5	// it is not depending on Boost.	5	// it is not depending on Boost.




--- third_party/libusb/BUILD.gn.orig	2016-12-09 05:04:33 UTC
+++ third_party/libusb/BUILD.gn
@@ -6,8 +6,25 @@ assert(!is_android && !is_ios)
 
 import("//build/config/features.gni")
 

 }
 
 config("libusb_warnings") {
@@ -21,118 +38,119 @@ config("libusb_warnings") {
   }
 }
 

-  ]
-  deps = []
-  include_dirs = [ "src/libusb/os" ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-
-    # Must be after no_chromium_code for warning flags to be ordered correctly.
-    ":libusb_warnings",
-  ]
-
-  public_configs = [ ":libusb_config" ]
-
-  if (is_posix) {
-    defines = [
-      "DEFAULT_VISIBILITY=",
-      "HAVE_GETTIMEOFDAY=1",
-      "HAVE_POLL_H=1",
-      "HAVE_SYS_TIME_H=1",
-      "LIBUSB_DESCRIBE=\"1.0.16\"",
-      "POLL_NFDS_TYPE=nfds_t",
-      "THREADS_POSIX=1",
-    ]
-  }
-
-  if (is_mac) {
-    defines += [
-      "OS_DARWIN=1",
+if (!use_system_libusb) {
+  static_library("libusb") {
+    sources = [

+      ]
+        deps = []
+        include_dirs = [ "src/libusb/os" ]
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
+        configs -= [ "//build/config/compiler:chromium_code" ]
+        configs += [
+        "//build/config/compiler:no_chromium_code",
 
-    # Must be after no_chromium_code for warning flags to be ordered correctly.
-    ":libusb_warnings",
-  ]
+# Must be after no_chromium_code for warning flags to be ordered correctly.
+      ":libusb_warnings",
+        ]
 
-  public_configs = [ ":libusb_config" ]
+          public_configs = [ ":libusb_config" ]
 
-  if (is_posix) {
-    defines = [
-      "DEFAULT_VISIBILITY=",
-      "HAVE_GETTIMEOFDAY=1",
-      "HAVE_POLL_H=1",
-      "HAVE_SYS_TIME_H=1",
-      "LIBUSB_DESCRIBE=\"1.0.16\"",
-      "POLL_NFDS_TYPE=nfds_t",
-      "THREADS_POSIX=1",
-    ]
-  }
+          if (is_posix) {
+            defines = [
+              "DEFAULT_VISIBILITY=",

+            "THREADS_POSIX=1",
+            ]
+          }
 
-  if (is_mac) {
-    defines += [
-      "OS_DARWIN=1",
+    if (is_mac) {
+      defines += [
+        "OS_DARWIN=1",

       "src/libusb/os/poll_windows.h",
       "src/libusb/os/threads_windows.c",
       "src/libusb/os/threads_windows.h",
@@ -142,6 +160,7 @@ static_library("libusb") {
       "src/msvc/config.h",
       "src/msvc/inttypes.h",
       "src/msvc/stdint.h",

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_libxml_BUILD.gn (-2 / +2 lines)
1	--- third_party/libxml/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/libxml/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/libxml/BUILD.gn 2016-09-02 23:25:19.267995000 +0300	2	+++ third_party/libxml/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	# Define an "os_include" variable that points at the OS-specific generated	5	# Define an "os_include" variable that points at the OS-specific generated

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_libxslt_BUILD.gn (-3 / +3 lines)
1	--- third_party/libxslt/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/libxslt/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/libxslt/BUILD.gn 2016-09-03 01:40:07.403577000 +0300	2	+++ third_party/libxslt/BUILD.gn
3	@@ -82,7 +82,7 @@	3	@@ -82,7 +82,7 @@ static_library("libxslt") {
4	public_configs = [ ":libxslt_config" ]	4	public_configs = [ ":libxslt_config" ]
5		5
6	cflags = []	6	cflags = []




--- third_party/libyuv/include/libyuv/row.h.orig	2016-12-09 05:05:08 UTC
+++ third_party/libyuv/include/libyuv/row.h
@@ -161,10 +161,14 @@ extern "C" {
 #define HAS_ARGBSHADEROW_SSE2
 #define HAS_ARGBSUBTRACTROW_SSE2
 #define HAS_ARGBUNATTENUATEROW_SSE2

 #define HAS_RGBCOLORTABLEROW_X86
 #define HAS_SOBELROW_SSE2
 #define HAS_SOBELTOPLANEROW_SSE2
@@ -174,8 +178,7 @@ extern "C" {
 
 // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
 // caveat: clangcl uses row_win.cc which works.

 // TODO(fbarchard): fix build error on x86 debug
 // https://code.google.com/p/libyuv/issues/detail?id=524
 #define HAS_I411TOARGBROW_SSSE3
@@ -203,7 +206,7 @@ extern "C" {
 #define HAS_COPYROW_AVX
 #define HAS_H422TOARGBROW_AVX2
 #define HAS_I400TOARGBROW_AVX2

 // TODO(fbarchard): fix build error on android_full_debug=1
 // https://code.google.com/p/libyuv/issues/detail?id=517
 #define HAS_I422ALPHATOARGBROW_AVX2
@@ -216,7 +219,9 @@ extern "C" {
 #define HAS_I422TORGB565ROW_AVX2
 #define HAS_I422TORGBAROW_AVX2
 #define HAS_I444TOARGBROW_AVX2

 #define HAS_J422TOARGBROW_AVX2
 #define HAS_MERGEUVROW_AVX2
 #define HAS_MIRRORROW_AVX2
@@ -240,8 +245,10 @@ extern "C" {
 #define HAS_ARGBMULTIPLYROW_AVX2
 #define HAS_ARGBSUBTRACTROW_AVX2
 #define HAS_ARGBUNATTENUATEROW_AVX2

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_mesa_BUILD.gn (-4 / +4 lines)
1	--- third_party/mesa/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/mesa/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/mesa/BUILD.gn 2016-09-25 07:24:36.558482000 +0300	2	+++ third_party/mesa/BUILD.gn
3	@@ -88,6 +88,10 @@	3	@@ -90,6 +90,10 @@ config("mesa_internal_config") {
4	defines += [ "_GNU_SOURCE" ]	4	defines += [ "_GNU_SOURCE" ]
5	}	5	}
6		6
Lines 11-17 Link Here
11	if (is_win) {	11	if (is_win) {
12	defines += [	12	defines += [
13	# Generated files use const only if __cplusplus or __STDC__ is defined.	13	# Generated files use const only if __cplusplus or __STDC__ is defined.
14	@@ -755,7 +759,8 @@	14	@@ -757,7 +761,8 @@ loadable_module("osmesa") {
15	]	15	]
16		16
17	# Required for the allocator implementation, which is not used on Mac.	17	# Required for the allocator implementation, which is not used on Mac.

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_minigbm_BUILD.gn (-2 / +2 lines)
1	--- third_party/minigbm/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300	1	--- third_party/minigbm/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/minigbm/BUILD.gn 2016-09-03 01:40:26.605383000 +0300	2	+++ third_party/minigbm/BUILD.gn
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4		4
5	import("//build/config/linux/pkg_config.gni")	5	import("//build/config/linux/pkg_config.gni")

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_opus_BUILD.gn (-3 / +3 lines)
1	--- third_party/opus/BUILD.gn.orig 2016-10-06 04:02:42.000000000 +0300	1	--- third_party/opus/BUILD.gn.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/opus/BUILD.gn 2016-10-13 08:49:39.874353000 +0300	2	+++ third_party/opus/BUILD.gn
3	@@ -14,7 +14,7 @@	3	@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu
4	# If OPUS Run Time CPU Detections (RTCD) shall be used.	4	# If OPUS Run Time CPU Detections (RTCD) shall be used.
5	# Based on the conditions in celt/arm/armcpu.c:	5	# Based on the conditions in celt/arm/armcpu.c:
6	# defined(_MSC_VER) \|\| defined(__linux__).	6	# defined(_MSC_VER) \|\| defined(__linux__).

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h (-1 / +1 lines)
1	--- third_party/ots/include/opentype-sanitiser.h.orig 2016-03-25 13:05:02 UTC	1	--- third_party/ots/include/opentype-sanitiser.h.orig 2016-12-09 05:04:33 UTC
2	+++ third_party/ots/include/opentype-sanitiser.h	2	+++ third_party/ots/include/opentype-sanitiser.h
3	@@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t;	3	@@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t;
4	#else	4	#else

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_pdfium_BUILD.gn (-3 / +3 lines)
1	--- third_party/pdfium/BUILD.gn.orig 2016-10-06 04:05:20.000000000 +0300	1	--- third_party/pdfium/BUILD.gn.orig 2016-12-09 05:05:09 UTC
2	+++ third_party/pdfium/BUILD.gn 2016-10-13 08:51:40.306487000 +0300	2	+++ third_party/pdfium/BUILD.gn
3	@@ -40,7 +40,7 @@	3	@@ -40,7 +40,7 @@ config("pdfium_core_config") {
4	cflags = []	4	cflags = []
5	configs = [ ":pdfium_common_config" ]	5	configs = [ ":pdfium_common_config" ]
6	defines = [ "V8_DEPRECATION_WARNINGS" ]	6	defines = [ "V8_DEPRECATION_WARNINGS" ]

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h (-1 / +1 lines)
1	--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2016-12-13 00:26:52 UTC	1	--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2016-12-09 05:05:09 UTC
2	+++ third_party/pdfium/core/fxcrt/fx_system.h	2	+++ third_party/pdfium/core/fxcrt/fx_system.h
3	@@ -40,7 +40,7 @@	3	@@ -40,7 +40,7 @@
4	#elif defined(_WIN64)	4	#elif defined(_WIN64)

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp (-4 / +4 lines)
1	--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2016-05-27 13:33:48.718479000 -0400	1	--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2016-12-09 05:05:09 UTC
2	+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp 2016-05-27 13:43:12.171286000 -0400	2	+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp
3	@@ -590,11 +590,12 @@	3	@@ -458,11 +458,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C
4	}	4	}
5		5
6	double _getLocalTZA() {	6	double _getLocalTZA() {
Lines 14-20 Link Here
14	#if _MSC_VER >= 1900	14	#if _MSC_VER >= 1900
15	// In gcc and in Visual Studio prior to VS 2015 'timezone' is a global	15	// In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
16	// variable declared in time.h. That variable was deprecated and in VS 2015	16	// variable declared in time.h. That variable was deprecated and in VS 2015
17	@@ -602,7 +603,11 @@	17	@@ -470,7 +471,11 @@ double _getLocalTZA() {
18	long timezone = 0;	18	long timezone = 0;
19	_get_timezone(&timezone);	19	_get_timezone(&timezone);
20	#endif	20	#endif

Lines 1-9 Link Here

(-)www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp (-4 / +4 lines)
1	--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-20 22:04:51.000000000 +0300	1	--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-12-09 05:05:09 UTC
2	+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-01 18:53:01.768097000 +0300	2	+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp
3	@@ -62,6 +62,103 @@	3	@@ -65,6 +65,103 @@ const FX_WCHAR* const fullmonths[] = {L"
4	L"July", L"August", L"September",	4	L"July", L"August", L"September",
5	L"October", L"November", L"December"};	5	L"October", L"November", L"December"};
6		6
7	+#if defined(__FreeBSD__)	7	+#if defined(__FreeBSD__)
8	+/*	8	+/*
9	+ * cvt.c - IEEE floating point formatting routines for FreeBSD	9	+ * cvt.c - IEEE floating point formatting routines for FreeBSD




--- third_party/pdfium/skia/BUILD.gn.orig	2016-12-09 05:05:09 UTC
+++ third_party/pdfium/skia/BUILD.gn
@@ -101,7 +101,7 @@ config("skia_library_config") {
   }
 
   # Settings for text blitting, chosen to approximate the system browser.

     defines += [
       "SK_GAMMA_EXPONENT=1.2",
       "SK_GAMMA_CONTRAST=0.2",
@@ -278,7 +278,7 @@ component("skia") {
       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }

     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
@@ -307,7 +307,7 @@ component("skia") {
     "../third_party:fx_zlib",
   ]
 

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h (-2 / +2 lines)
1	--- third_party/pdfium/third_party/base/logging.h.orig 2016-05-25 15:02:25.000000000 -0400	1	--- third_party/pdfium/third_party/base/logging.h.orig 2016-12-09 05:05:09 UTC
2	+++ third_party/pdfium/third_party/base/logging.h 2016-05-27 11:35:39.166720000 -0400	2	+++ third_party/pdfium/third_party/base/logging.h
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4		4
5	#ifndef _WIN32	5	#ifndef _WIN32




--- third_party/sqlite/BUILD.gn.orig	2016-12-09 05:04:34 UTC
+++ third_party/sqlite/BUILD.gn
@@ -20,7 +20,7 @@ if (!use_system_sqlite) {
       # sqlite3Fts3InitTok).
       cflags += [ "-Wno-unused-function" ]
     }

       cflags += [
         # SQLite doesn"t believe in compiler warnings,
         # preferring testing.
@@ -177,7 +177,7 @@ if (!use_system_sqlite) {
     public_configs = [ ":sqlite_export" ]
   }
 

     executable("sqlite_shell") {
       # So shell.c can find the correct sqlite3.h.
       include_dirs = [ "amalgamation" ]
@@ -206,7 +206,7 @@ if (use_system_sqlite) {
 
   config("sqlite_config") {
     defines = [ "USE_SYSTEM_SQLITE" ]

       libs = [ "sqlite3" ]
     } else {
       assert(false, "extra flags to use system sqlite3 library missing")
@@ -225,7 +225,7 @@ if (use_system_sqlite) {
     }
   }
 

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_usrsctp_BUILD.gn (-3 / +3 lines)
1	--- third_party/usrsctp/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300	1	--- third_party/usrsctp/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ third_party/usrsctp/BUILD.gn 2016-09-20 02:42:29.328962000 +0300	2	+++ third_party/usrsctp/BUILD.gn
3	@@ -112,6 +112,12 @@	3	@@ -112,6 +112,12 @@ static_library("usrsctp") {
4	"__Userspace_os_Linux",	4	"__Userspace_os_Linux",
5	"_GNU_SOURCE",	5	"_GNU_SOURCE",
6	]	6	]

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_webrtc_BUILD.gn (-3 / +3 lines)
1	--- third_party/webrtc/BUILD.gn.orig 2016-10-06 04:05:35.000000000 +0300	1	--- third_party/webrtc/BUILD.gn.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/BUILD.gn 2016-10-14 17:24:44.301409000 +0300	2	+++ third_party/webrtc/BUILD.gn
3	@@ -60,6 +60,9 @@	3	@@ -60,6 +60,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-third__party_webrtc_base_BUILD.gn (-3 / +3 lines)
1	--- third_party/webrtc/base/BUILD.gn.orig 2016-08-03 22:04:03.000000000 +0300	1	--- third_party/webrtc/base/BUILD.gn.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/BUILD.gn 2016-09-25 15:11:54.051352000 +0300	2	+++ third_party/webrtc/base/BUILD.gn
3	@@ -525,7 +525,6 @@	3	@@ -580,7 +580,6 @@ rtc_static_library("rtc_base") {
4	"x11windowpicker.h",	4	"x11windowpicker.h",
5	]	5	]
6	libs += [	6	libs += [

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc (-1 / +1 lines)
1	--- third_party/webrtc/base/httpcommon.cc.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/httpcommon.cc.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/httpcommon.cc	2	+++ third_party/webrtc/base/httpcommon.cc
3	@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string	3	@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string
4	gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;	4	gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h (-1 / +1 lines)
1	--- third_party/webrtc/base/ifaddrs_converter.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/ifaddrs_converter.h.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/ifaddrs_converter.h	2	+++ third_party/webrtc/base/ifaddrs_converter.h
3	@@ -14,6 +14,8 @@	3	@@ -14,6 +14,8 @@
4	#if defined(WEBRTC_ANDROID)	4	#if defined(WEBRTC_ANDROID)

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_ipaddress.h (-1 / +1 lines)
1	--- third_party/webrtc/base/ipaddress.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/ipaddress.h.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/ipaddress.h	2	+++ third_party/webrtc/base/ipaddress.h
3	@@ -17,6 +17,10 @@	3	@@ -17,6 +17,10 @@
4	#include <arpa/inet.h>	4	#include <arpa/inet.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_linux.cc (-1 / +1 lines)
1	--- third_party/webrtc/base/linux.cc.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/linux.cc.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/linux.cc	2	+++ third_party/webrtc/base/linux.cc
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4	* be found in the AUTHORS file in the root of the source tree.	4	* be found in the AUTHORS file in the root of the source tree.

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_linux.h (-2 / +2 lines)
1	--- third_party/webrtc/base/linux.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/linux.h.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/linux.h	2	+++ third_party/webrtc/base/linux.h
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@
4	#ifndef WEBRTC_BASE_LINUX_H_	4	#ifndef WEBRTC_BASE_LINUX_H_
Lines 8-14 Link Here
8	+#if defined(WEBRTC_LINUX) \|\| defined(WEBRTC_BSD)	8	+#if defined(WEBRTC_LINUX) \|\| defined(WEBRTC_BSD)
9	#include <string>	9	#include <string>
10	#include <map>	10	#include <map>
11	#include <vector>	11	#include <memory>
12	@@ -114,5 +114,5 @@ int ReadCpuMaxFreq();	12	@@ -114,5 +114,5 @@ int ReadCpuMaxFreq();
13		13
14	} // namespace rtc	14	} // namespace rtc




--- third_party/webrtc/base/network.cc.orig	2016-12-09 05:05:12 UTC
+++ third_party/webrtc/base/network.cc
@@ -14,7 +14,7 @@
 // linux/if.h can't be included at the same time as the posix sys/if.h, and
 // it's transitively required by linux/route.h, so include that version on
 // linux instead of the standard posix one.

 #include <linux/if.h>
 #include <linux/route.h>
 #elif !defined(__native_client__)
@@ -656,7 +656,7 @@ bool BasicNetworkManager::CreateNetworks
 }
 #endif  // WEBRTC_WIN
 

 bool IsDefaultRoute(const std::string& network_name) {
   FileStream fs;
   if (!fs.Open("/proc/net/route", "r", NULL)) {
@@ -699,7 +699,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
       strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
     return true;
   }

Lines 1-7 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_network.h (-2 / +2 lines)
1	--- third_party/webrtc/base/network.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/network.h.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/network.h	2	+++ third_party/webrtc/base/network.h
3	@@ -23,6 +23,10 @@	3	@@ -23,6 +23,10 @@
4	#include "webrtc/base/scoped_ptr.h"	4	#include "webrtc/base/messagehandler.h"
5	#include "webrtc/base/sigslot.h"	5	#include "webrtc/base/sigslot.h"
6		6
7	+#if defined(WEBRTC_BSD)	7	+#if defined(WEBRTC_BSD)




--- third_party/webrtc/base/physicalsocketserver.cc.orig	2016-12-09 05:05:12 UTC
+++ third_party/webrtc/base/physicalsocketserver.cc
@@ -61,7 +61,11 @@ typedef void* SockOptArg;
 
 int64_t GetSocketRecvTimestamp(int socket) {
   struct timeval tv_ioctl;

   if (ret != 0)
     return -1;
   int64_t timestamp =
@@ -274,7 +278,7 @@ int PhysicalSocket::GetOption(Option opt
   socklen_t optlen = sizeof(*value);
   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
   if (ret != -1 && opt == OPT_DONTFRAGMENT) {

     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
 #endif
   }
@@ -287,7 +291,7 @@ int PhysicalSocket::SetOption(Option opt
   if (TranslateOption(opt, &slevel, &sopt) == -1)
     return -1;
   if (opt == OPT_DONTFRAGMENT) {

     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
 #endif
   }
@@ -569,10 +573,10 @@ int PhysicalSocket::TranslateOption(Opti
       *slevel = IPPROTO_IP;
       *sopt = IP_DONTFRAGMENT;
       break;

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc (-1 / +1 lines)
1	--- third_party/webrtc/base/platform_thread.cc.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/platform_thread.cc.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/platform_thread.cc	2	+++ third_party/webrtc/base/platform_thread.cc
3	@@ -12,11 +12,18 @@	3	@@ -12,11 +12,18 @@
4		4

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_stringutils.h (-1 / +1 lines)
1	--- third_party/webrtc/base/stringutils.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/stringutils.h.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/stringutils.h	2	+++ third_party/webrtc/base/stringutils.h
3	@@ -23,11 +23,11 @@	3	@@ -23,11 +23,11 @@
4	#endif // WEBRTC_WIN	4	#endif // WEBRTC_WIN

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc (-1 / +1 lines)
1	--- third_party/webrtc/base/systeminfo.cc.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/base/systeminfo.cc.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/base/systeminfo.cc	2	+++ third_party/webrtc/base/systeminfo.cc
3	@@ -20,8 +20,12 @@	3	@@ -20,8 +20,12 @@
4	#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)	4	#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn (-4 / +4 lines)
1	--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300	1	--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2016-12-09 05:05:12 UTC
2	+++ third_party/webrtc/modules/audio_device/BUILD.gn 2016-10-17 00:53:40.915668000 +0300	2	+++ third_party/webrtc/modules/audio_device/BUILD.gn
3	@@ -52,7 +52,7 @@	3	@@ -77,7 +77,7 @@ rtc_static_library("audio_device") {
4	]	4	]
5		5
6	include_dirs = []	6	include_dirs = []
Lines 9-15 Link Here
9	include_dirs += [ "linux" ]	9	include_dirs += [ "linux" ]
10	}	10	}
11	if (is_ios) {	11	if (is_ios) {
12	@@ -98,7 +98,7 @@	12	@@ -125,7 +125,7 @@ rtc_static_library("audio_device") {
13	if (rtc_use_dummy_audio_file_devices) {	13	if (rtc_use_dummy_audio_file_devices) {
14	defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]	14	defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
15	} else {	15	} else {

Lines 1-10 Link Here

(-)www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc (-3 / +3 lines)
1	--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2016-12-09 05:05:13 UTC
2	+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc	2	+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
3	@@ -14,6 +14,7 @@	3	@@ -13,6 +13,7 @@
4	#include <string.h>	4	#include <string.h>
5		5
6	#include <algorithm>	6	#include <algorithm>
7	+#include <cstdlib>	7	+#include <cstdlib>
8	#include <iterator>	8	#include <iterator>
		9	#include <utility>
9		10
10	#include "webrtc/base/checks.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn (-1 / +1 lines)
1	--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2016-12-13 00:29:05 UTC	1	--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2016-12-09 05:05:13 UTC
2	+++ third_party/webrtc/modules/video_coding/BUILD.gn	2	+++ third_party/webrtc/modules/video_coding/BUILD.gn
3	@@ -140,9 +140,7 @@ rtc_static_library("webrtc_h264") {	3	@@ -140,9 +140,7 @@ rtc_static_library("webrtc_h264") {
4	}	4	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn (-4 / +4 lines)
1	--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300	1	--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2016-12-09 05:05:13 UTC
2	+++ third_party/webrtc/system_wrappers/BUILD.gn 2016-10-14 17:26:56.594097000 +0300	2	+++ third_party/webrtc/system_wrappers/BUILD.gn
3	@@ -105,7 +105,7 @@	3	@@ -100,7 +100,7 @@ rtc_static_library("system_wrappers") {
4	libs += [ "log" ]	4	libs += [ "log" ]
5	}	5	}
6		6
Lines 9-15 Link Here
9	defines += [ "WEBRTC_THREAD_RR" ]	9	defines += [ "WEBRTC_THREAD_RR" ]
10		10
11	if (!build_with_chromium) {	11	if (!build_with_chromium) {
12	@@ -115,7 +115,7 @@	12	@@ -110,7 +110,7 @@ rtc_static_library("system_wrappers") {
13	libs += [ "rt" ]	13	libs += [ "rt" ]
14	}	14	}
15		15

Lines 1-5 Link Here

(-)www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc (-2 / +2 lines)
1	--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2016-10-06 04:05:36.000000000 +0300	1	--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2016-12-09 05:05:13 UTC
2	+++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc 2016-10-14 17:25:37.203869000 +0300	2	+++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4		4
5	#include <assert.h>	5	#include <assert.h>

Lines 1-4 Link Here

(-)www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h (-1 / +1 lines)
1	--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2016-05-11 19:04:03 UTC	1	--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2016-12-09 05:05:13 UTC
2	+++ third_party/webrtc/voice_engine/voice_engine_defines.h	2	+++ third_party/webrtc/voice_engine/voice_engine_defines.h
3	@@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) {	3	@@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) {
4	#include <pthread.h>	4	#include <pthread.h>




--- third_party/widevine/cdm/BUILD.gn.orig	2016-12-09 05:04:35 UTC
+++ third_party/widevine/cdm/BUILD.gn
@@ -25,7 +25,7 @@ if (is_android) {
     widevine_cdm_version_h_file =
         "chromeos/$widevine_arch/widevine_cdm_version.h"
     widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ]

     widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h"
     widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ]
   } else if (is_win) {
@@ -147,7 +147,7 @@ if ((is_chrome_branded || enable_widevin
       ":widevinecdm",
     ]
 
-    if (is_linux) {
+    if (is_linux || is_bsd) {
       ldflags =
           [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
                         root_build_dir) ]
@@ -170,7 +170,7 @@ if ((is_chrome_branded || enable_widevin
 # This target exists for tests to depend on that pulls in a runtime dependency
 # on the license server.
 source_set("widevine_test_license_server") {

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_yasm_BUILD.gn (-3 / +3 lines)
1	--- third_party/yasm/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300	1	--- third_party/yasm/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ third_party/yasm/BUILD.gn 2016-09-05 21:50:53.007490000 +0300	2	+++ third_party/yasm/BUILD.gn
3	@@ -32,7 +32,12 @@	3	@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler
4	if (current_toolchain == host_toolchain) {	4	if (current_toolchain == host_toolchain) {
5	# Various files referenced by multiple targets.	5	# Various files referenced by multiple targets.
6	yasm_gen_include_dir = "$target_gen_dir/include"	6	yasm_gen_include_dir = "$target_gen_dir/include"

Lines 1-6 Link Here

(-)www/chromium/files/patch-third__party_zlib_BUILD.gn (-3 / +3 lines)
1	--- third_party/zlib/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300	1	--- third_party/zlib/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ third_party/zlib/BUILD.gn 2016-09-29 17:46:32.878236000 +0300	2	+++ third_party/zlib/BUILD.gn
3	@@ -115,7 +115,7 @@	3	@@ -115,7 +115,7 @@ static_library("minizip") {
4	"contrib/minizip/iowin32.h",	4	"contrib/minizip/iowin32.h",
5	]	5	]
6	}	6	}

Lines 1-5 Link Here

(-)www/chromium/files/patch-tools_battor__agent_BUILD.gn (-2 / +2 lines)
1	--- tools/battor_agent/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300	1	--- tools/battor_agent/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ tools/battor_agent/BUILD.gn 2016-09-01 02:14:55.585315000 +0300	2	+++ tools/battor_agent/BUILD.gn
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	import("//testing/test.gni")	4	import("//testing/test.gni")
5		5

Lines 1-6 Link Here

(-)www/chromium/files/patch-tools_gn_args.cc (-4 / +4 lines)
1	--- tools/gn/args.cc.orig 2016-08-13 15:22:20.957491000 +0300	1	--- tools/gn/args.cc.orig 2016-12-09 05:04:35 UTC
2	+++ tools/gn/args.cc 2016-08-13 15:22:40.739449000 +0300	2	+++ tools/gn/args.cc
3	@@ -222,6 +222,8 @@	3	@@ -256,6 +256,8 @@ void Args::SetSystemVarsLocked(Scope* de
4	os = "mac";	4	os = "mac";
5	#elif defined(OS_LINUX)	5	#elif defined(OS_LINUX)
6	os = "linux";	6	os = "linux";
Lines 8-11 Link Here
8	+ os = "bsd";	8	+ os = "bsd";
9	#elif defined(OS_ANDROID)	9	#elif defined(OS_ANDROID)
10	os = "android";	10	os = "android";
11	#else	11	#elif defined(OS_NETBSD)




--- tools/gn/bootstrap/bootstrap.py.orig	2016-12-09 05:04:35 UTC
+++ tools/gn/bootstrap/bootstrap.py
@@ -23,6 +23,7 @@ import os
 import shutil
 import subprocess
 import sys
+import platform
 import tempfile
 
 BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -31,8 +32,9 @@ SRC_ROOT = os.path.dirname(os.path.dirna
 
 is_win = sys.platform.startswith('win')
 is_linux = sys.platform.startswith('linux')
+is_bsd = platform.system().lower().endswith('bsd')

 is_mac = sys.platform.startswith('darwin')
-is_posix = is_linux or is_mac
+is_posix = is_linux or is_mac or is_bsd
 
 def check_call(cmd, **kwargs):
   logging.debug('Running: %s', ' '.join(cmd))
@@ -595,6 +597,39 @@ def write_gn_ninja(path, root_gen_dir, o
         'base/third_party/libevent/epoll.c',
     ])
 
+  if is_bsd:
+    libs.extend(['-lexecinfo', '-lkvm'])
+    ldflags.extend(['-pthread'])

+    ])
+    # Suppressing warnings
+    cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality'])
 
   if is_mac:
     static_libraries['base']['sources'].extend([

Lines 1-4 Link Here

(-)www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (-1 / +1 lines)
1	--- tools/variations/fieldtrial_to_struct.py.orig 2016-12-13 00:00:14 UTC	1	--- tools/variations/fieldtrial_to_struct.py.orig 2016-12-09 05:04:35 UTC
2	+++ tools/variations/fieldtrial_to_struct.py	2	+++ tools/variations/fieldtrial_to_struct.py
3	@@ -113,7 +113,7 @@ def main(arguments):	3	@@ -113,7 +113,7 @@ def main(arguments):
4	if not opts.platform:	4	if not opts.platform:

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h (-1 / +1 lines)
1	--- ui/accessibility/platform/ax_platform_node.h.orig 2016-05-11 19:02:35 UTC	1	--- ui/accessibility/platform/ax_platform_node.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/accessibility/platform/ax_platform_node.h	2	+++ ui/accessibility/platform/ax_platform_node.h
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	#define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1	4	#define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_app__list_app__list__constants.cc (-2 / +2 lines)
1	--- ui/app_list/app_list_constants.cc.orig 2016-05-11 19:02:35 UTC	1	--- ui/app_list/app_list_constants.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/app_list/app_list_constants.cc	2	+++ ui/app_list/app_list_constants.cc
3	@@ -144,7 +144,7 @@ const char kSearchQueryLength[] = "Apps.	3	@@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps.
4	const char kSearchResultDistanceFromOrigin[] =	4	const char kSearchResultDistanceFromOrigin[] =
5	"Apps.AppListSearchResultDistanceFromOrigin";	5	"Apps.AppListSearchResultDistanceFromOrigin";
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_app__list_app__list__constants.h (-2 / +2 lines)
1	--- ui/app_list/app_list_constants.h.orig 2016-03-25 13:05:03 UTC	1	--- ui/app_list/app_list_constants.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/app_list/app_list_constants.h	2	+++ ui/app_list/app_list_constants.h
3	@@ -92,8 +92,8 @@ APP_LIST_EXPORT extern const char kSearc	3	@@ -89,8 +89,8 @@ APP_LIST_EXPORT extern const char kSearc
4	APP_LIST_EXPORT extern const char kSearchQueryLength[];	4	APP_LIST_EXPORT extern const char kSearchQueryLength[];
5	APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];	5	APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc (-3 / +3 lines)
1	--- ui/app_list/views/app_list_item_view.cc.orig 2016-08-03 22:02:40.000000000 +0300	1	--- ui/app_list/views/app_list_item_view.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/app_list/views/app_list_item_view.cc 2016-08-19 05:58:12.763965000 +0300	2	+++ ui/app_list/views/app_list_item_view.cc
3	@@ -62,7 +62,7 @@	3	@@ -55,7 +55,7 @@ gfx::FontList GetFontList() {
4	const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);	4	const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
5	// The font is different on each platform. The font size is adjusted on some	5	// The font is different on each platform. The font size is adjusted on some
6	// platforms to keep a consistent look.	6	// platforms to keep a consistent look.

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_app__list_views_app__list__view.cc (-4 / +4 lines)
1	--- ui/app_list/views/app_list_view.cc.orig 2016-10-06 04:02:44.000000000 +0300	1	--- ui/app_list/views/app_list_view.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/app_list/views/app_list_view.cc 2016-10-13 09:16:02.654490000 +0300	2	+++ ui/app_list/views/app_list_view.cc
3	@@ -70,7 +70,7 @@	3	@@ -70,7 +70,7 @@ const int kArrowOffset = 10;
4		4
5	// Determines whether the current environment supports shadows bubble borders.	5	// Determines whether the current environment supports shadows bubble borders.
6	bool SupportsShadow() {	6	bool SupportsShadow() {
Lines 9-15 Link Here
9	// Shadows are not supported on (non-ChromeOS) Linux.	9	// Shadows are not supported on (non-ChromeOS) Linux.
10	return false;	10	return false;
11	#endif	11	#endif
12	@@ -567,7 +567,7 @@	12	@@ -538,7 +538,7 @@ void AppListView::OnBeforeBubbleWidgetIn
13	if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop())	13	if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop())
14	params->native_widget = new views::DesktopNativeWidgetAura(widget);	14	params->native_widget = new views::DesktopNativeWidgetAura(widget);
15	#endif	15	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_aura_BUILD.gn (-3 / +3 lines)
1	--- ui/aura/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300	1	--- ui/aura/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ ui/aura/BUILD.gn 2016-09-03 00:18:30.181232000 +0300	2	+++ ui/aura/BUILD.gn
3	@@ -275,7 +275,7 @@	3	@@ -281,7 +281,7 @@ test("aura_unittests") {
4	"//ui/gl:test_support",	4	"//ui/gl:test_support",
5	]	5	]
6		6




--- ui/base/BUILD.gn.orig	2016-12-09 05:04:35 UTC
+++ ui/base/BUILD.gn
@@ -349,7 +349,7 @@ component("base") {
     sources += [ "touch/touch_device_android.cc" ]
   } else if (is_ios) {
     sources += [ "touch/touch_device_ios.cc" ]

     sources += [ "touch/touch_device_linux.cc" ]
   } else {
     # Empty implementation for all other cases.
@@ -451,11 +451,11 @@ component("base") {
     ]
   }
 

     sources -= [ "resource/resource_bundle_auralinux.cc" ]
   }
 
@@ -451,7 +451,7 @@
     sources -= [ "dragdrop/drag_utils_aura.cc" ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_bsd) {
     deps += [ "//build/linux:fontconfig" ]
   }
 
@@ -463,7 +463,7 @@ component("base") {
     configs += [ "//build/config/linux:glib" ]
   }
 

     if (!toolkit_views && !use_aura) {
       sources -= [
         "dragdrop/drag_utils.cc",
@@ -796,7 +796,7 @@ test("ui_base_unittests") {
       "ime/win/imm32_manager_unittest.cc",
       "ime/win/tsf_input_scope_unittest.cc",
     ]

+    if ((is_linux || is_bsd) && use_aura && !is_chromeos) {
       sources += [ "ime/input_method_auralinux_unittest.cc" ]
     }
     if (use_x11) {
@@ -919,7 +919,7 @@ test("ui_base_unittests") {
     ]
   }
 

     # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
     # instead of depending directly on the non-test .pak files, but depending
     # on ui_test_pak seems to have no effect.
@@ -932,7 +932,7 @@ test("ui_base_unittests") {
       "//third_party/mesa:osmesa",
     ]
   }

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_ime_BUILD.gn (-4 / +4 lines)
1	--- ui/base/ime/BUILD.gn.orig 2016-10-06 04:02:44.000000000 +0300	1	--- ui/base/ime/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/ime/BUILD.gn 2016-10-14 18:28:15.896660000 +0300	2	+++ ui/base/ime/BUILD.gn
3	@@ -123,7 +123,7 @@	3	@@ -123,7 +123,7 @@ component("ime") {
4	":text_input_types",	4	":text_input_types",
5	]	5	]
6		6
Lines 9-15 Link Here
9	sources -= [	9	sources -= [
10	"input_method_auralinux.cc",	10	"input_method_auralinux.cc",
11	"input_method_auralinux.h",	11	"input_method_auralinux.h",
12	@@ -137,7 +137,7 @@	12	@@ -137,7 +137,7 @@ component("ime") {
13	]	13	]
14	}	14	}
15		15

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h (-1 / +1 lines)
1	--- ui/base/ime/ime_engine_handler_interface.h.orig 2016-04-08 16:02:15 UTC	1	--- ui/base/ime/ime_engine_handler_interface.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/ime/ime_engine_handler_interface.h	2	+++ ui/base/ime/ime_engine_handler_interface.h
3	@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle	3	@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
4	// Hides the input view window (from API call).	4	// Hides the input view window (from API call).

Lines 1-5 Link Here

(-)www/chromium/files/patch-ui_base_ime_input__method__factory.cc (-3 / +3 lines)
1	--- ui/base/ime/input_method_factory.cc.orig 2016-10-06 04:02:44.000000000 +0300	1	--- ui/base/ime/input_method_factory.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/ime/input_method_factory.cc 2016-10-13 09:19:24.642495000 +0300	2	+++ ui/base/ime/input_method_factory.cc
3	@@ -14,8 +14,8 @@	3	@@ -14,8 +14,8 @@
4	#include "ui/base/ime/input_method_win.h"	4	#include "ui/base/ime/input_method_win.h"
5	#elif defined(OS_MACOSX)	5	#elif defined(OS_MACOSX)
Lines 11-17 Link Here
11	#include "ui/base/ime/input_method_auralinux.h"	11	#include "ui/base/ime/input_method_auralinux.h"
12	#elif defined(OS_ANDROID)	12	#elif defined(OS_ANDROID)
13	#include "ui/base/ime/input_method_android.h"	13	#include "ui/base/ime/input_method_android.h"
14	@@ -56,8 +56,8 @@	14	@@ -56,8 +56,8 @@ std::unique_ptr<InputMethod> CreateInput
15	return base::MakeUnique<InputMethodWin>(delegate, widget);	15	return base::MakeUnique<InputMethodWin>(delegate, widget);
16	#elif defined(OS_MACOSX)	16	#elif defined(OS_MACOSX)
17	return base::MakeUnique<InputMethodMac>(delegate);	17	return base::MakeUnique<InputMethodMac>(delegate);

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_base_ime_input__method__initializer.cc (-1 / +1 lines)
1	--- ui/base/ime/input_method_initializer.cc.orig 2016-03-25 13:05:03 UTC	1	--- ui/base/ime/input_method_initializer.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/ime/input_method_initializer.cc	2	+++ ui/base/ime/input_method_initializer.cc
3	@@ -8,14 +8,14 @@	3	@@ -8,14 +8,14 @@
4		4

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_base_resource_resource__bundle.cc (-4 / +4 lines)
1	--- ui/base/resource/resource_bundle.cc.orig 2016-07-20 22:03:45.000000000 +0300	1	--- ui/base/resource/resource_bundle.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/resource/resource_bundle.cc 2016-08-01 22:13:38.986790000 +0300	2	+++ ui/base/resource/resource_bundle.cc
3	@@ -626,7 +626,7 @@	3	@@ -651,7 +651,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	@@ -686,7 +686,7 @@	12	@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance(
13	supported_scale_factors.push_back(SCALE_FACTOR_100P);	13	supported_scale_factors.push_back(SCALE_FACTOR_100P);
14	}	14	}
15	#elif defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| \	15	#elif defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| \

Lines 1-5 Link Here

(-)www/chromium/files/patch-ui_base_ui__features.gni (-2 / +2 lines)
1	--- ui/base/ui_features.gni.orig 2016-08-03 22:02:41.000000000 +0300	1	--- ui/base/ui_features.gni.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/ui_features.gni 2016-09-01 03:07:44.861869000 +0300	2	+++ ui/base/ui_features.gni
3	@@ -2,4 +2,4 @@	3	@@ -2,4 +2,4 @@
4	# Use of this source code is governed by a BSD-style license that can be	4	# Use of this source code is governed by a BSD-style license that can be
5	# found in the LICENSE file.	5	# found in the LICENSE file.

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 2016-05-11 19:02:35 UTC	1	--- ui/base/webui/web_ui_util.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/base/webui/web_ui_util.cc	2	+++ ui/base/webui/web_ui_util.cc
3	@@ -164,7 +164,7 @@ std::string GetFontFamily() {	3	@@ -161,7 +161,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

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_compositor_BUILD.gn (-3 / +3 lines)
1	--- ui/compositor/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300	1	--- ui/compositor/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ ui/compositor/BUILD.gn 2016-09-03 00:17:02.164382000 +0300	2	+++ ui/compositor/BUILD.gn
3	@@ -199,7 +199,7 @@	3	@@ -200,7 +200,7 @@ test("compositor_unittests") {
4	"//ui/gl",	4	"//ui/gl",
5	"//ui/resources",	5	"//ui/resources",
6	]	6	]

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_events_event__switches.cc (-1 / +1 lines)
1	--- ui/events/event_switches.cc.orig 2016-03-25 13:05:03 UTC	1	--- ui/events/event_switches.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/events/event_switches.cc	2	+++ ui/events/event_switches.cc
3	@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis	3	@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis
4	const char kCompensateForUnstablePinchZoom[] =	4	const char kCompensateForUnstablePinchZoom[] =

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_events_event__switches.h (-1 / +1 lines)
1	--- ui/events/event_switches.h.orig 2016-03-25 13:05:03 UTC	1	--- ui/events/event_switches.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/events/event_switches.h	2	+++ ui/events/event_switches.h
3	@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo	3	@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo
4	EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];	4	EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc (-1 / +1 lines)
1	--- ui/events/keycodes/dom/keycode_converter.cc.orig 2016-05-11 19:02:35 UTC	1	--- ui/events/keycodes/dom/keycode_converter.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/events/keycodes/dom/keycode_converter.cc	2	+++ ui/events/keycodes/dom/keycode_converter.cc
3	@@ -19,7 +19,7 @@ namespace {	3	@@ -19,7 +19,7 @@ namespace {
4	// and DOM Level 3 \|code\| strings.	4	// and DOM Level 3 \|code\| strings.

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_BUILD.gn (-4 / +4 lines)
1	--- ui/gfx/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300	1	--- ui/gfx/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gfx/BUILD.gn 2016-09-03 00:17:18.862703000 +0300	2	+++ ui/gfx/BUILD.gn
3	@@ -360,7 +360,7 @@	3	@@ -368,7 +368,7 @@ component("gfx") {
4	}	4	}
5		5
6	# Linux.	6	# Linux.
Lines 9-15 Link Here
9	deps += [ "//build/linux:fontconfig" ]	9	deps += [ "//build/linux:fontconfig" ]
10	}	10	}
11		11
12	@@ -668,7 +668,7 @@	12	@@ -546,7 +546,7 @@ static_library("test_support") {
13	"test/ui_cocoa_test_helper.mm",	13	"test/ui_cocoa_test_helper.mm",
14	]	14	]
15	}	15	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_canvas__skia.cc (-2 / +2 lines)
1	--- ui/gfx/canvas_skia.cc.orig 2016-05-11 19:02:35 UTC	1	--- ui/gfx/canvas_skia.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gfx/canvas_skia.cc	2	+++ ui/gfx/canvas_skia.cc
3	@@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(c	3	@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c
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-5 Link Here

(-)www/chromium/files/patch-ui_gfx_font__fallback__linux.cc (-2 / +2 lines)
1	--- ui/gfx/font_fallback_linux.cc.orig 2016-05-27 10:26:15.843855000 -0400	1	--- ui/gfx/font_fallback_linux.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gfx/font_fallback_linux.cc 2016-05-27 10:26:38.723265000 -0400	2	+++ ui/gfx/font_fallback_linux.cc
3	@@ -15,6 +15,10 @@	3	@@ -15,6 +15,10 @@
4	#include "base/memory/ptr_util.h"	4	#include "base/memory/ptr_util.h"
5	#include "ui/gfx/font.h"	5	#include "ui/gfx/font.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_font__render__params.h (-3 / +3 lines)
1	--- ui/gfx/font_render_params.h.orig 2016-05-27 10:24:30.925944000 -0400	1	--- ui/gfx/font_render_params.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gfx/font_render_params.h 2016-05-27 10:24:56.069225000 -0400	2	+++ ui/gfx/font_render_params.h
3	@@ -102,13 +102,13 @@	3	@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende
4	const FontRenderParamsQuery& query,	4	const FontRenderParamsQuery& query,
5	std::string* family_out);	5	std::string* family_out);
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gfx_render__text.cc (-2 / +2 lines)
1	--- ui/gfx/render_text.cc.orig 2016-05-11 19:02:35 UTC	1	--- ui/gfx/render_text.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gfx/render_text.cc	2	+++ ui/gfx/render_text.cc
3	@@ -942,32 +942,33 @@ void RenderText::SetDisplayOffset(int ho	3	@@ -967,32 +967,33 @@ void RenderText::SetDisplayOffset(int ho
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-4 Link Here

(-)www/chromium/files/patch-ui_gl_BUILD.gn (-1 / +1 lines)
1	--- ui/gl/BUILD.gn.orig 2016-12-12 22:13:27 UTC	1	--- ui/gl/BUILD.gn.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gl/BUILD.gn	2	+++ ui/gl/BUILD.gn
3	@@ -13,7 +13,7 @@ declare_args() {	3	@@ -13,7 +13,7 @@ declare_args() {
4	enable_swiftshader = is_chrome_branded && is_win	4	enable_swiftshader = is_chrome_branded && is_win

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h (-3 / +3 lines)
1	--- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 17:39:12.324777000 +0300	1	--- ui/gl/sync_control_vsync_provider.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/gl/sync_control_vsync_provider.h 2016-08-04 17:39:19.973676000 +0300	2	+++ ui/gl/sync_control_vsync_provider.h
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public
4	virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;	4	virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;
5		5
6	private:	6	private:

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_message__center_message__center__style.h (-2 / +2 lines)
1	--- ui/message_center/message_center_style.h.orig 2016-05-11 19:02:35 UTC	1	--- ui/message_center/message_center_style.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/message_center/message_center_style.h	2	+++ ui/message_center/message_center_style.h
3	@@ -111,7 +111,7 @@ const int kButtonHorizontalPadding = 16;	3	@@ -115,7 +115,7 @@ const int kButtonHorizontalPadding = 16;
4	const int kButtonIconTopPadding = 11; // In DIPs.	4	const int kButtonIconTopPadding = 11; // In DIPs.
5	const int kButtonIconToTitlePadding = 16; // In DIPs.	5	const int kButtonIconToTitlePadding = 16; // In DIPs.
6		6




--- ui/message_center/views/message_center_button_bar.cc.orig	2016-12-09 05:04:35 UTC
+++ ui/message_center/views/message_center_button_bar.cc
@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut
     const base::string16& title)
     : message_center_view_(message_center_view),
       message_center_(message_center),

       close_bubble_button_(NULL),
 #endif
       title_arrow_(NULL),
@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterBut
                                    IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
   button_container_->AddChildView(settings_button_);
 

   close_bubble_button_ = new views::ImageButton(this);
   close_bubble_button_->SetImage(
       views::Button::STATE_NORMAL,
@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibil
                     0,
                     0);
 

   // The close-bubble button.
   column->AddColumn(views::GridLayout::LEADING,
                     views::GridLayout::LEADING,
@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibil
     layout->AddView(title_arrow_);
   layout->AddView(notification_label_);
   layout->AddView(button_container_);

   layout->AddView(close_bubble_button_);
 #endif
 }
@@ -297,7 +297,7 @@ void MessageCenterButtonBar::ButtonPress
     else
       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
     quiet_mode_button_->SetToggled(message_center()->IsQuietMode());

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h (-2 / +2 lines)
1	--- ui/message_center/views/message_center_button_bar.h.orig 2016-04-08 16:02:15 UTC	1	--- ui/message_center/views/message_center_button_bar.h.orig 2016-12-09 05:04:35 UTC
2	+++ ui/message_center/views/message_center_button_bar.h	2	+++ ui/message_center/views/message_center_button_bar.h
3	@@ -73,7 +73,7 @@ class MessageCenterButtonBar : public vi	3	@@ -76,7 +76,7 @@ class MessageCenterButtonBar : public vi
4	// close-on-deactivation is off. This is a tentative solution. Once pkotwicz	4	// close-on-deactivation is off. This is a tentative solution. Once pkotwicz
5	// Fixes the problem of focus-follow-mouse, close-on-deactivation will be	5	// Fixes the problem of focus-follow-mouse, close-on-deactivation will be
6	// back and this field will be removed. See crbug.com/319516.	6	// back and this field will be removed. See crbug.com/319516.

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_message__center_views_message__view__factory.cc (-3 / +3 lines)
1	--- ui/message_center/views/message_view_factory.cc.orig 2016-08-03 16:51:43.884486000 -0400	1	--- ui/message_center/views/message_view_factory.cc.orig 2016-12-09 05:04:35 UTC
2	+++ ui/message_center/views/message_view_factory.cc 2016-08-03 16:51:59.171721000 -0400	2	+++ ui/message_center/views/message_view_factory.cc
3	@@ -43,7 +43,7 @@	3	@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(
4	notification_view = new NotificationView(controller, notification);	4	notification_view = new NotificationView(controller, notification);
5	}	5	}
6		6

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_resources_ui__resources.grd (-1 / +1 lines)
1	--- ui/resources/ui_resources.grd.orig 2016-05-11 19:02:35 UTC	1	--- ui/resources/ui_resources.grd.orig 2016-12-09 05:04:36 UTC
2	+++ ui/resources/ui_resources.grd	2	+++ ui/resources/ui_resources.grd
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST	4	<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_BUILD.gn (-1 / +1 lines)
1	--- ui/views/BUILD.gn.orig 2016-12-12 22:16:29 UTC	1	--- ui/views/BUILD.gn.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/BUILD.gn	2	+++ ui/views/BUILD.gn
3	@@ -424,7 +424,7 @@ component("views") {	3	@@ -424,7 +424,7 @@ component("views") {
4	if (use_x11 && !is_chromeos) {	4	if (use_x11 && !is_chromeos) {

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h (-1 / +1 lines)
1	--- ui/views/accessibility/native_view_accessibility.h.orig 2016-03-25 13:05:04 UTC	1	--- ui/views/accessibility/native_view_accessibility.h.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/accessibility/native_view_accessibility.h	2	+++ ui/views/accessibility/native_view_accessibility.h
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	#define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1	4	#define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc (-3 / +3 lines)
1	--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2016-08-03 16:59:43.426393000 -0400	1	--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/bubble/bubble_dialog_delegate.cc 2016-08-03 17:00:10.585958000 -0400	2	+++ ui/views/bubble/bubble_dialog_delegate.cc
3	@@ -72,7 +72,7 @@	3	@@ -73,7 +73,7 @@ Widget* BubbleDialogDelegateView::Create
4	// the parent frame and let DWM handle compositing. If not, then we don't	4	// the parent frame and let DWM handle compositing. If not, then we don't
5	// want to allow the bubble to extend the frame because it will be clipped.	5	// want to allow the bubble to extend the frame because it will be clipped.
6	bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());	6	bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (-1 / +1 lines)
1	--- ui/views/controls/textfield/textfield.cc.orig 2016-12-12 22:18:59 UTC	1	--- ui/views/controls/textfield/textfield.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/controls/textfield/textfield.cc	2	+++ ui/views/controls/textfield/textfield.cc
3	@@ -52,7 +52,7 @@	3	@@ -52,7 +52,7 @@
4	#include "ui/base/win/osk_display_manager.h"	4	#include "ui/base/win/osk_display_manager.h"

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_controls_webview_BUILD.gn (-3 / +3 lines)
1	--- ui/views/controls/webview/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300	1	--- ui/views/controls/webview/BUILD.gn.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/controls/webview/BUILD.gn 2016-09-03 00:18:20.159623000 +0300	2	+++ ui/views/controls/webview/BUILD.gn
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@ component("webview") {
4	"//ui/views",	4	"//ui/views",
5	]	5	]
6		6

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc (-3 / +3 lines)
1	--- ui/views/corewm/tooltip_aura.cc.orig 2016-12-16 15:15:24.020369000 +0000	1	--- ui/views/corewm/tooltip_aura.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/corewm/tooltip_aura.cc 2016-12-16 15:16:03.296431000 +0000	2	+++ ui/views/corewm/tooltip_aura.cc
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;
4		4
5	// TODO(varkha): Update if native widget can be transparent on Linux.	5	// TODO(varkha): Update if native widget can be transparent on Linux.
6	bool CanUseTranslucentTooltipWidget() {	6	bool CanUseTranslucentTooltipWidget() {

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 2016-05-11 19:02:36 UTC	1	--- ui/views/examples/widget_example.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/examples/widget_example.cc	2	+++ ui/views/examples/widget_example.cc
3	@@ -84,7 +84,7 @@ void WidgetExample::CreateExampleView(Vi	3	@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi
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);

Lines 1-5 Link Here

(-)www/chromium/files/patch-ui_views_style_platform__style.cc (-2 / +2 lines)
1	--- ui/views/style/platform_style.cc.orig 2016-08-03 22:02:41.000000000 +0300	1	--- ui/views/style/platform_style.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/style/platform_style.cc 2016-09-26 05:44:41.103708000 +0300	2	+++ ui/views/style/platform_style.cc
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@
4	#include "ui/views/controls/focusable_border.h"	4	#include "ui/views/controls/focusable_border.h"
5	#include "ui/views/controls/scrollbar/native_scroll_bar.h"	5	#include "ui/views/controls/scrollbar/native_scroll_bar.h"

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_views__delegate.cc (-1 / +1 lines)
1	--- ui/views/views_delegate.cc.orig 2016-03-25 13:05:04 UTC	1	--- ui/views/views_delegate.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/views_delegate.cc	2	+++ ui/views/views_delegate.cc
3	@@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco	3	@@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco
4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {	4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_views__delegate.h (-1 / +1 lines)
1	--- ui/views/views_delegate.h.orig 2016-05-11 19:02:36 UTC	1	--- ui/views/views_delegate.h.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/views_delegate.h	2	+++ ui/views/views_delegate.h
3	@@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate {	3	@@ -141,7 +141,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

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_views_views__switches.cc (-1 / +1 lines)
1	--- ui/views/views_switches.cc.orig 2016-03-25 13:05:04 UTC	1	--- ui/views/views_switches.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/views_switches.cc	2	+++ ui/views/views_switches.cc
3	@@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti	3	@@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti
4	"disable-views-rect-based-targeting";	4	"disable-views-rect-based-targeting";

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_window_custom__frame__view.cc (-2 / +2 lines)
1	--- ui/views/window/custom_frame_view.cc.orig 2016-05-11 19:02:36 UTC	1	--- ui/views/window/custom_frame_view.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/window/custom_frame_view.cc	2	+++ ui/views/window/custom_frame_view.cc
3	@@ -288,7 +288,7 @@ int CustomFrameView::NonClientTopBorderH	3	@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderH
4	int CustomFrameView::CaptionButtonY() const {	4	int CustomFrameView::CaptionButtonY() const {
5	// Maximized buttons start at window top so that even if their images aren't	5	// Maximized buttons start at window top so that even if their images aren't
6	// drawn flush with the screen edge, they still obey Fitts' Law.	6	// drawn flush with the screen edge, they still obey Fitts' Law.

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_views_window_dialog__delegate.cc (-3 / +3 lines)
1	--- ui/views/window/dialog_delegate.cc.orig 2016-05-11 19:02:36 UTC	1	--- ui/views/window/dialog_delegate.cc.orig 2016-12-09 05:04:36 UTC
2	+++ ui/views/window/dialog_delegate.cc	2	+++ ui/views/window/dialog_delegate.cc
3	@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidg	3	@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDi
4	params.bounds = bounds;	4	params.bounds = bounds;
5	DialogDelegate* dialog = delegate->AsDialogDelegate();	5	DialogDelegate* dialog = delegate->AsDialogDelegate();
6		6
Lines 8-11 Link Here
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)	8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
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	if (dialog)	10	if (dialog)
11	dialog->supports_new_style_ &= parent != NULL;	11	dialog->supports_custom_frame_ &= parent != NULL;

Lines 1-6 Link Here

(-)www/chromium/files/patch-ui_webui_resources_js_cr.js (-2 / +2 lines)
1	--- ui/webui/resources/js/cr.js.orig 2016-05-11 19:02:36 UTC	1	--- ui/webui/resources/js/cr.js.orig 2016-12-09 05:04:36 UTC
2	+++ ui/webui/resources/js/cr.js	2	+++ ui/webui/resources/js/cr.js
3	@@ -444,6 +444,11 @@ var cr = function() {	3	@@ -451,6 +451,11 @@ var cr = cr \|\| function() {
4	get doc() {	4	get doc() {
5	return document;	5	return document;
6	},	6	},

Lines 1-4 Link Here

(-)www/chromium/files/patch-ui_webui_resources_js_icon.js (-1 / +1 lines)
1	--- ui/webui/resources/js/icon.js.orig 2016-12-12 22:24:45 UTC	1	--- ui/webui/resources/js/icon.js.orig 2016-12-09 05:04:36 UTC
2	+++ ui/webui/resources/js/icon.js	2	+++ ui/webui/resources/js/icon.js
3	@@ -14,7 +14,7 @@ cr.define('cr.icon', function() {	3	@@ -14,7 +14,7 @@ cr.define('cr.icon', function() {
4	// supports SCALE_FACTOR_100P on all non-iOS platforms.	4	// supports SCALE_FACTOR_100P on all non-iOS platforms.




--- v8/BUILD.gn.orig	2016-12-09 05:05:14 UTC
+++ v8/BUILD.gn
@@ -2226,7 +2226,7 @@ v8_source_set("v8_libbase") {
     sources += [ "src/base/platform/platform-posix.cc" ]
   }
 

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

   } else if (is_android) {
     if (current_toolchain == host_toolchain) {
       libs = [
@@ -2388,6 +2394,7 @@ if (current_toolchain == v8_snapshot_too
     sources = [
       "src/snapshot/mksnapshot.cc",
     ]

Lines 1-5 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 2016-10-06 04:05:41.000000000 +0300	1	--- v8/src/base/platform/platform-posix.cc.orig 2016-12-09 05:05:14 UTC
2	+++ v8/src/base/platform/platform-posix.cc 2016-10-13 09:39:34.732843000 +0300	2	+++ v8/src/base/platform/platform-posix.cc
3	@@ -27,6 +27,10 @@	3	@@ -27,6 +27,10 @@
4	#include <sys/sysctl.h> // NOLINT, for sysctl	4	#include <sys/sysctl.h> // NOLINT, for sysctl
5	#endif	5	#endif
Lines 11-17 Link Here
11	#undef MAP_TYPE	11	#undef MAP_TYPE
12		12
13	#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)	13	#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
14	@@ -329,6 +333,12 @@	14	@@ -329,6 +333,12 @@ int OS::GetCurrentThreadId() {
15	return static_cast<int>(syscall(__NR_gettid));	15	return static_cast<int>(syscall(__NR_gettid));
16	#elif V8_OS_ANDROID	16	#elif V8_OS_ANDROID
17	return static_cast<int>(gettid());	17	return static_cast<int>(gettid());

Return to bug 215271

Lines 3-8 Link Here

(-)www/chromium/Makefile (-26 / +30 lines)
3		3
4	PORTNAME= chromium	4	PORTNAME= chromium
5	PORTVERSION= 55.0.2883.87	5	PORTVERSION= 55.0.2883.87
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/	8	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
Lines 13-24 Link Here
13	LICENSE= BSD3CLAUSE LGPL21 MPL	14	LICENSE= BSD3CLAUSE LGPL21 MPL
14	LICENSE_COMB= multi	15	LICENSE_COMB= multi
15		16
16	BUILD_DEPENDS= bash:shells/bash \	17	BUILD_DEPENDS= gperf:devel/gperf \
17	clang39:devel/llvm39 \	18	clang39:devel/llvm39 \
		19	yasm:devel/yasm \
18	python:lang/python \	20	python:lang/python \
		21	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
		22	bash:shells/bash \
19	flock:sysutils/flock \	23	flock:sysutils/flock \
20	gperf:devel/gperf \
21	yasm:devel/yasm \
22	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \	24	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
23	${LOCALBASE}/share/usbids/usb.ids:misc/usbids \	25	${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
24	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \	26	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
Lines 25-58 Link Here
25	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \	27	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
26	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib	28	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
27		29
28	LIB_DEPENDS= libcairo.so:graphics/cairo \	30	LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \
29	libcups.so:print/cups \	31	libsnappy.so:archivers/snappy \
		32	libFLAC.so:audio/flac \
		33	libspeex.so:audio/speex \
30	libdbus-1.so:devel/dbus \	34	libdbus-1.so:devel/dbus \
31	libdbus-glib-1.so:devel/dbus-glib \	35	libdbus-glib-1.so:devel/dbus-glib \
		36	libicuuc.so:devel/icu \
		37	libjsoncpp.so:devel/jsoncpp \
		38	libpci.so:devel/libpci \
		39	libnspr4.so:devel/nspr \
		40	libre2.so:devel/re2 \
		41	libcairo.so:graphics/cairo \
32	libdrm.so:graphics/libdrm \	42	libdrm.so:graphics/libdrm \
33	libexpat.so:textproc/expat2 \	43	libexif.so:graphics/libexif \
34	libFLAC.so:audio/flac \	44	libpng.so:graphics/png \
		45	libwebp.so:graphics/webp \
		46	libavcodec.so:multimedia/ffmpeg \
		47	libcups.so:print/cups \
35	libfreetype.so:print/freetype2 \	48	libfreetype.so:print/freetype2 \
36	libgnome-keyring.so:security/libgnome-keyring \
37	libharfbuzz.so:print/harfbuzz \	49	libharfbuzz.so:print/harfbuzz \
38	libexif.so:graphics/libexif \
39	libfontconfig.so:x11-fonts/fontconfig \
40	libgcrypt.so:security/libgcrypt \	50	libgcrypt.so:security/libgcrypt \
41	libicuuc.so:devel/icu \	51	libgnome-keyring.so:security/libgnome-keyring \
42	libjsoncpp.so:devel/jsoncpp \
43	libnspr4.so:devel/nspr \
44	libnss3.so:security/nss \	52	libnss3.so:security/nss \
45	libpci.so:devel/libpci \	53	libexpat.so:textproc/expat2 \
46	libpng.so:graphics/png \	54	libxml2.so:textproc/libxml2 \
47	libre2.so:devel/re2 \	55	libfontconfig.so:x11-fonts/fontconfig
48	libsnappy.so:archivers/snappy \
49	libspeechd.so:accessibility/speech-dispatcher \
50	libspeex.so:audio/speex \
51	libwebp.so:graphics/webp \
52	libxml2.so:textproc/libxml2
53		56
54	RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \	57	RUN_DEPENDS= xdg-open:devel/xdg-utils \
55	xdg-open:devel/xdg-utils	58	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
56		59
57	ONLY_FOR_ARCHS= i386 amd64	60	ONLY_FOR_ARCHS= i386 amd64
58	USES= compiler bison cpe desktop-file-utils execinfo jpeg \	61	USES= compiler bison cpe desktop-file-utils execinfo jpeg \
Lines 110-116 Link Here
110	OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO	113	OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO
111	OPTIONS_GROUP_TESTS= DEBUG TEST	114	OPTIONS_GROUP_TESTS= DEBUG TEST
112		115
113	OPTIONS_DEFAULT= CODECS GCONF KERBEROS ALSA PULSEAUDIO	116	OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF KERBEROS
114	OPTIONS_SUB= yes	117	OPTIONS_SUB= yes
115		118
116	GCONF_USE= GNOME=gconf2	119	GCONF_USE= GNOME=gconf2
Lines 117-123 Link Here
117	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	120	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
118	ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \	121	ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
119	alsa-lib>=1.1.1_1:audio/alsa-lib	122	alsa-lib>=1.1.1_1:audio/alsa-lib
120	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	123	ALSA_RUN_DEPENDS_OFF= ${BUILD_DEPENDS:Mpulseaudio}
		124	PULSEAUDIO_BUILD_DEPENDS= pulseaudio>0:audio/pulseaudio
121	DRIVER_MAKE_ARGS=chromedriver	125	DRIVER_MAKE_ARGS=chromedriver
122	TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}	126	TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
123		127
Lines 224-230 Link Here
224	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	228	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
225	cd ${WRKSRC} && ${PYTHON_CMD} \	229	cd ${WRKSRC} && ${PYTHON_CMD} \
226	./build/linux/unbundle/replace_gn_files.py --system-libraries \	230	./build/linux/unbundle/replace_gn_files.py --system-libraries \
227	flac harfbuzz-ng libwebp libxml libxslt snappy yasm \|\| ${FALSE}	231	ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm \|\| ${FALSE}
228		232
229	do-configure:	233	do-configure:
230	# GN generator bootstrapping and generating ninja files	234	# GN generator bootstrapping and generating ninja files

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_BUILD.gn (-7 / +7 lines)
1	--- base/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/BUILD.gn.orig 2016-12-09 05:04:13 UTC
2	+++ base/BUILD.gn 2016-10-25 21:49:35.259700000 +0300	2	+++ base/BUILD.gn
3	@@ -1051,6 +1051,35 @@	3	@@ -1064,6 +1064,35 @@ component("base") {
4	public_deps += [ "//base/allocator:unified_allocator_shim" ]	4	public_deps += [ "//base/allocator:unified_allocator_shim" ]
5	}	5	}
6		6
Lines 36-42 Link Here
36	# Allow more direct string conversions on platforms with native utf8	36	# Allow more direct string conversions on platforms with native utf8
37	# strings	37	# strings
38	if (is_mac \|\| is_ios \|\| is_chromeos \|\| is_chromecast) {	38	if (is_mac \|\| is_ios \|\| is_chromeos \|\| is_chromecast) {
39	@@ -1322,7 +1351,7 @@	39	@@ -1337,7 +1366,7 @@ component("base") {
40	}	40	}
41		41
42	# Linux.	42	# Linux.
Lines 45-51 Link Here
45	if (is_asan \|\| is_lsan \|\| is_msan \|\| is_tsan) {	45	if (is_asan \|\| is_lsan \|\| is_msan \|\| is_tsan) {
46	# For llvm-sanitizer.	46	# For llvm-sanitizer.
47	data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]	47	data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
48	@@ -1347,7 +1376,7 @@	48	@@ -1362,7 +1391,7 @@ component("base") {
49	"//base/third_party/xdg_user_dirs",	49	"//base/third_party/xdg_user_dirs",
50	]	50	]
51	} else {	51	} else {
Lines 54-60 Link Here
54	sources -= [	54	sources -= [
55	"nix/mime_util_xdg.cc",	55	"nix/mime_util_xdg.cc",
56	"nix/mime_util_xdg.h",	56	"nix/mime_util_xdg.h",
57	@@ -1363,6 +1392,13 @@	57	@@ -1378,6 +1407,13 @@ component("base") {
58	}	58	}
59	}	59	}
60		60
Lines 68-74 Link Here
68	# iOS	68	# iOS
69	if (is_ios) {	69	if (is_ios) {
70	set_sources_assignment_filter([])	70	set_sources_assignment_filter([])
71	@@ -2117,6 +2153,12 @@	71	@@ -2137,6 +2173,12 @@ test("base_unittests") {
72	set_sources_assignment_filter(sources_assignment_filter)	72	set_sources_assignment_filter(sources_assignment_filter)
73	}	73	}
74		74

Lines 1-5 Link Here

(-)www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc (-6 / +6 lines)
1	--- base/allocator/allocator_shim_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300	1	--- base/allocator/allocator_shim_unittest.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/allocator/allocator_shim_unittest.cc 2016-10-25 21:48:23.218013000 +0300	2	+++ base/allocator/allocator_shim_unittest.cc
3	@@ -4,7 +4,6 @@	3	@@ -4,7 +4,6 @@
4		4
5	#include "base/allocator/allocator_shim.h"	5	#include "base/allocator/allocator_shim.h"
Lines 8-14 Link Here
8	#include <stdlib.h>	8	#include <stdlib.h>
9	#include <string.h>	9	#include <string.h>
10		10
11	@@ -193,11 +192,13 @@	11	@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
12	ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);	12	ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);
13		13
14	#if !defined(OS_WIN)	14	#if !defined(OS_WIN)
Lines 22-28 Link Here
22		22
23	void* posix_memalign_ptr = nullptr;	23	void* posix_memalign_ptr = nullptr;
24	int res = posix_memalign(&posix_memalign_ptr, 256, 59);	24	int res = posix_memalign(&posix_memalign_ptr, 256, 59);
25	@@ -214,12 +215,14 @@	25	@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
26	ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);	26	ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
27	ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);	27	ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
28		28
Lines 37-43 Link Here
37	#endif // OS_WIN	37	#endif // OS_WIN
38		38
39	char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));	39	char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));
40	@@ -240,8 +243,10 @@	40	@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
41	ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);	41	ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
42		42
43	#if !defined(OS_WIN)	43	#if !defined(OS_WIN)
Lines 48-54 Link Here
48		48
49	free(posix_memalign_ptr);	49	free(posix_memalign_ptr);
50	ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);	50	ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);
51	@@ -249,8 +254,10 @@	51	@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
52	free(valloc_ptr);	52	free(valloc_ptr);
53	ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);	53	ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);
54		54

Lines 1-6 Link Here

(-)www/chromium/files/patch-base_process_process__posix.cc (-6 / +6 lines)
1	--- base/process/process_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300	1	--- base/process/process_posix.cc.orig 2016-12-09 05:04:13 UTC
2	+++ base/process/process_posix.cc 2016-09-11 02:18:36.481940000 +0300	2	+++ base/process/process_posix.cc
3	@@ -20,8 +20,18 @@	3	@@ -21,8 +21,18 @@
4	#include <sys/event.h>	4	#include <sys/event.h>
5	#endif	5	#endif
6		6
Lines 19-25 Link Here
19	#if !defined(OS_NACL_NONSFI)	19	#if !defined(OS_NACL_NONSFI)
20		20
21	bool WaitpidWithTimeout(base::ProcessHandle handle,	21	bool WaitpidWithTimeout(base::ProcessHandle handle,
22	@@ -183,13 +193,13 @@	22	@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
23	base::ProcessHandle parent_pid = base::GetParentProcessId(handle);	23	base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
24	base::ProcessHandle our_pid = base::GetCurrentProcessHandle();	24	base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
25	if (parent_pid != our_pid) {	25	if (parent_pid != our_pid) {
Lines 36-42 Link Here
36	}	36	}
37		37
38	int status;	38	int status;
39	@@ -256,12 +266,16 @@	39	@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro
40	return Process(handle);	40	return Process(handle);
41	}	41	}
42		42
Lines 55-61 Link Here
55		55
56	bool Process::IsValid() const {	56	bool Process::IsValid() const {
57	return process_ != kNullProcessHandle;	57	return process_ != kNullProcessHandle;
58	@@ -361,15 +375,32 @@	58	@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim
59	bool Process::IsProcessBackgrounded() const {	59	bool Process::IsProcessBackgrounded() const {
60	// See SetProcessBackgrounded().	60	// See SetProcessBackgrounded().
61	DCHECK(IsValid());	61	DCHECK(IsValid());

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_BUILDCONFIG.gn (-7 / +7 lines)
1	--- build/config/BUILDCONFIG.gn.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/config/BUILDCONFIG.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/BUILDCONFIG.gn 2016-10-13 04:48:31.029743000 +0300	2	+++ build/config/BUILDCONFIG.gn
3	@@ -134,12 +134,13 @@	3	@@ -134,12 +134,13 @@ declare_args() {
4	is_debug = !is_official_build	4	is_debug = !is_official_build
5		5
6	# Whether we're a traditional desktop unix.	6	# Whether we're a traditional desktop unix.
Lines 16-22 Link Here
16		16
17	# Allows the path to a custom target toolchain to be injected as a single	17	# Allows the path to a custom target toolchain to be injected as a single
18	# argument, and set as the default toolchain.	18	# argument, and set as the default toolchain.
19	@@ -183,8 +184,8 @@	19	@@ -183,8 +184,8 @@ if (host_toolchain == "") {
20	# TODO(dpranke): Add some sort of assert here that verifies that	20	# TODO(dpranke): Add some sort of assert here that verifies that
21	# no toolchain omitted host_toolchain from its toolchain_args().	21	# no toolchain omitted host_toolchain from its toolchain_args().
22		22
Lines 27-33 Link Here
27	# TODO(dpranke) - is_clang normally applies only to the target	27	# TODO(dpranke) - is_clang normally applies only to the target
28	# build, and there is no way to indicate that you want to override	28	# build, and there is no way to indicate that you want to override
29	# it for both the target build and the host build. Do we need to	29	# it for both the target build and the host build. Do we need to
30	@@ -220,7 +221,7 @@	30	@@ -220,7 +221,7 @@ if (target_os == "android") {
31	} else {	31	} else {
32	_default_toolchain = "//build/toolchain/android:$target_cpu"	32	_default_toolchain = "//build/toolchain/android:$target_cpu"
33	}	33	}
Lines 36-42 Link Here
36	# See comments in build/toolchain/cros/BUILD.gn about board compiles.	36	# See comments in build/toolchain/cros/BUILD.gn about board compiles.
37	if (is_clang) {	37	if (is_clang) {
38	_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"	38	_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
39	@@ -340,8 +341,17 @@	39	@@ -340,8 +341,17 @@ if (current_os == "win" \|\| current_os ==
40	is_nacl = false	40	is_nacl = false
41	is_posix = true	41	is_posix = true
42	is_win = false	42	is_win = false
Lines 55-61 Link Here
55	# =============================================================================	55	# =============================================================================
56	# SOURCES FILTERS	56	# SOURCES FILTERS
57	# =============================================================================	57	# =============================================================================
58	@@ -410,7 +420,7 @@	58	@@ -410,7 +420,7 @@ if (!is_ios) {
59	if (!is_mac && !is_ios) {	59	if (!is_mac && !is_ios) {
60	sources_assignment_filter += [ "*.mm" ]	60	sources_assignment_filter += [ "*.mm" ]
61	}	61	}

Lines 1-8 Link Here

(-)www/chromium/files/patch-build_config_clang_BUILD.gn (-7 / +7 lines)
1	--- build/config/clang/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/clang/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/clang/BUILD.gn 2016-09-03 01:38:15.236274000 +0300	2	+++ build/config/clang/BUILD.gn
3	@@ -21,7 +21,7 @@	3	@@ -20,7 +20,7 @@ config("find_bad_constructs") {
4	"//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",	4	rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
5	root_build_dir),	5	root_build_dir),
6	]	6	]
7	- } else if (is_linux \|\| is_android) {	7	- } else if (is_linux \|\| is_android) {
8	+ } else if (is_linux \|\| is_bsd \|\| is_android) {	8	+ } else if (is_linux \|\| is_bsd \|\| is_android) {
Lines 9-16 Link Here
9	cflags += [	9	cflags += [
10	"-Xclang",	10	"-Xclang",
11	"-load",	11	"-load",
12	@@ -51,7 +51,7 @@	12	@@ -37,7 +37,7 @@ config("find_bad_constructs") {
13	"check-implicit-copy-ctors",	13	"find-bad-constructs",
14	]	14	]
15		15
16	- if ((is_linux \|\| is_android) && !is_chromecast) {	16	- if ((is_linux \|\| is_android) && !is_chromecast) {

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_features.gni (-6 / +6 lines)
1	--- build/config/features.gni.orig 2016-08-03 22:02:10.000000000 +0300	1	--- build/config/features.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/features.gni 2016-09-01 02:42:02.955488000 +0300	2	+++ build/config/features.gni
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@ if (is_android) {
4		4
5	declare_args() {	5	declare_args() {
6	# Multicast DNS.	6	# Multicast DNS.
Lines 9-15 Link Here
9		9
10	enable_extensions = !is_android && !is_ios	10	enable_extensions = !is_android && !is_ios
11	enable_plugins = (!is_android && !is_ios) \|\| is_chromecast	11	enable_plugins = (!is_android && !is_ios) \|\| is_chromecast
12	@@ -100,13 +100,13 @@	12	@@ -97,13 +97,13 @@ declare_args() {
13	# libudev usage. This currently only affects the content layer.	13	# libudev usage. This currently only affects the content layer.
14	use_udev = is_linux && !is_chromecast	14	use_udev = is_linux && !is_chromecast
15		15
Lines 25-32 Link Here
25	+ use_gio = (is_linux \|\| is_bsd) && !is_chromeos && !is_chromecast	25	+ use_gio = (is_linux \|\| is_bsd) && !is_chromeos && !is_chromecast
26		26
27	# Enable basic printing support and UI.	27	# Enable basic printing support and UI.
28	enable_basic_printing = !is_chromeos && !is_chromecast && !is_ios	28	enable_basic_printing = !is_chromecast && !is_ios
29	@@ -126,7 +126,7 @@	29	@@ -135,7 +135,7 @@ use_minikin_hyphenation = is_android
30		30
31	# Enables the use of CDMs in pepper plugins.	31	# Enables the use of CDMs in pepper plugins.
32	enable_pepper_cdms =	32	enable_pepper_cdms =

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_config_ui.gni (-5 / +5 lines)
1	--- build/config/ui.gni.orig 2016-10-06 04:02:08.000000000 +0300	1	--- build/config/ui.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/config/ui.gni 2016-10-13 05:04:25.545377000 +0300	2	+++ build/config/ui.gni
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@ declare_args() {
4		4
5	# Indicates if Aura is enabled. Aura is a low-level windowing library, sort	5	# Indicates if Aura is enabled. Aura is a low-level windowing library, sort
6	# of a replacement for GDI or GTK.	6	# of a replacement for GDI or GTK.
Lines 9-15 Link Here
9		9
10	# True means the UI is built using the "views" framework.	10	# True means the UI is built using the "views" framework.
11	toolkit_views =	11	toolkit_views =
12	@@ -47,7 +47,7 @@	12	@@ -47,7 +47,7 @@ declare_args() {
13	use_xkbcommon = false	13	use_xkbcommon = false
14		14
15	# Whether we should use glib, a low level C utility library.	15	# Whether we should use glib, a low level C utility library.
Lines 18-24 Link Here
18		18
19	# Indicates if Wayland display server support is enabled.	19	# Indicates if Wayland display server support is enabled.
20	enable_wayland_server = is_chromeos	20	enable_wayland_server = is_chromeos
21	@@ -65,19 +65,19 @@	21	@@ -65,19 +65,19 @@ declare_args() {
22		22
23	# Use GPU accelerated cross process image transport by default on linux builds	23	# Use GPU accelerated cross process image transport by default on linux builds
24	# with the Aura window manager.	24	# with the Aura window manager.

Lines 1-6 Link Here

(-)www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (-9 / +8 lines)
1	--- build/toolchain/gcc_toolchain.gni.orig 2016-12-09 05:04:14.000000000 +0000	1	--- build/toolchain/gcc_toolchain.gni.orig 2016-12-09 05:04:14 UTC
2	+++ build/toolchain/gcc_toolchain.gni 2016-12-21 23:03:46.063519000 +0000	2	+++ build/toolchain/gcc_toolchain.gni
3	@@ -11,6 +11,11 @@	3	@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni
4	import("//build/toolchain/goma.gni")	4	import("//build/toolchain/goma.gni")
5	import("//build/toolchain/toolchain.gni")	5	import("//build/toolchain/toolchain.gni")
6		6
Lines 12-18 Link Here
12	# This template defines a toolchain for something that works like gcc	12	# This template defines a toolchain for something that works like gcc
13	# (including clang).	13	# (including clang).
14	#	14	#
15	@@ -482,14 +487,23 @@	15	@@ -482,14 +487,23 @@ template("clang_toolchain") {
16	}	16	}
17		17
18	gcc_toolchain(target_name) {	18	gcc_toolchain(target_name) {
Lines 20-29 Link Here
20	- cc = "$prefix/clang"	20	- cc = "$prefix/clang"
21	- cxx = "$prefix/clang++"	21	- cxx = "$prefix/clang++"
22	- ld = cxx	22	- ld = cxx
23	-
24	- readelf = "${toolprefix}readelf"
25	- ar = "${toolprefix}ar"
26	- nm = "${toolprefix}nm"
27	+ if (is_bsd) {	23	+ if (is_bsd) {
28	+ cc = "${toolprefix}clang39"	24	+ cc = "${toolprefix}clang39"
29	+ cxx = "${toolprefix}clang++39"	25	+ cxx = "${toolprefix}clang++39"
Lines 36-42 Link Here
36	+ cc = "$prefix/clang"	32	+ cc = "$prefix/clang"
37	+ cxx = "$prefix/clang++"	33	+ cxx = "$prefix/clang++"
38	+ ld = cxx	34	+ ld = cxx
39	+	35
		36	- readelf = "${toolprefix}readelf"
		37	- ar = "${toolprefix}ar"
		38	- nm = "${toolprefix}nm"
40	+ readelf = "${toolprefix}readelf"	39	+ readelf = "${toolprefix}readelf"
41	+ ar = "${toolprefix}ar"	40	+ ar = "${toolprefix}ar"
42	+ nm = "${toolprefix}nm"	41	+ nm = "${toolprefix}nm"

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_BUILD.gn (-5 / +5 lines)
1	--- chrome/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300	1	--- chrome/BUILD.gn.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/BUILD.gn 2016-09-03 00:02:50.206193000 +0300	2	+++ chrome/BUILD.gn
3	@@ -86,7 +86,7 @@	3	@@ -128,7 +128,7 @@ if (!is_android && !is_mac) {
4	data = [	4	data = [
5	"$root_out_dir/resources.pak",	5	"$root_out_dir/resources.pak",
6	]	6	]
Lines 9-15 Link Here
9	data += [	9	data += [
10	"$root_out_dir/chrome_100_percent.pak",	10	"$root_out_dir/chrome_100_percent.pak",
11	"$root_out_dir/locales/en-US.pak",	11	"$root_out_dir/locales/en-US.pak",
12	@@ -160,7 +160,7 @@	12	@@ -204,7 +204,7 @@ if (!is_android && !is_mac) {
13	sources += [ "app/chrome_exe_main_aura.cc" ]	13	sources += [ "app/chrome_exe_main_aura.cc" ]
14	}	14	}
15		15
Lines 18-24 Link Here
18	sources += [	18	sources += [
19	"app/chrome_dll_resource.h",	19	"app/chrome_dll_resource.h",
20	"app/chrome_main.cc",	20	"app/chrome_main.cc",
21	@@ -1461,7 +1461,7 @@	21	@@ -1492,7 +1492,7 @@ if (enable_resource_whitelist_generation
22	}	22	}
23	}	23	}
24		24

Lines 1-7 Link Here

(-)www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (-9 / +9 lines)
1	--- chrome/app/chrome_main_delegate.cc.orig 2016-05-11 19:02:13 UTC	1	--- chrome/app/chrome_main_delegate.cc.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/app/chrome_main_delegate.cc	2	+++ chrome/app/chrome_main_delegate.cc
3	@@ -112,7 +112,7 @@	3	@@ -116,7 +116,7 @@
4	#include "ui/base/x/x11_util.h"	4	#include "ui/base/x/x11_util.h" // nogncheck
5	#endif	5	#endif
6		6
7	-#if defined(OS_POSIX) && !defined(OS_MACOSX)	7	-#if defined(OS_POSIX) && !defined(OS_MACOSX)
Lines 9-15 Link Here
9	#include "components/crash/content/app/breakpad_linux.h"	9	#include "components/crash/content/app/breakpad_linux.h"
10	#endif	10	#endif
11		11
12	@@ -552,7 +552,7 @@ bool ChromeMainDelegate::BasicStartupCom	12	@@ -559,7 +559,7 @@ bool ChromeMainDelegate::BasicStartupCom
13	std::string format_str =	13	std::string format_str =
14	command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);	14	command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
15	if (format_str == "machine") {	15	if (format_str == "machine") {
Lines 18-24 Link Here
18	} else if (format_str == "log") {	18	} else if (format_str == "log") {
19	format = diagnostics::DiagnosticsWriter::LOG;	19	format = diagnostics::DiagnosticsWriter::LOG;
20	} else {	20	} else {
21	@@ -602,7 +602,7 @@ bool ChromeMainDelegate::BasicStartupCom	21	@@ -609,7 +609,7 @@ bool ChromeMainDelegate::BasicStartupCom
22	std::string format_str =	22	std::string format_str =
23	command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);	23	command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
24	if (format_str == "machine") {	24	if (format_str == "machine") {
Lines 27-33 Link Here
27	} else if (format_str == "human") {	27	} else if (format_str == "human") {
28	format = diagnostics::DiagnosticsWriter::HUMAN;	28	format = diagnostics::DiagnosticsWriter::HUMAN;
29	} else {	29	} else {
30	@@ -693,7 +693,7 @@ void ChromeMainDelegate::PreSandboxStart	30	@@ -721,7 +721,7 @@ void ChromeMainDelegate::PreSandboxStart
31	std::string process_type =	31	std::string process_type =
32	command_line.GetSwitchValueASCII(switches::kProcessType);	32	command_line.GetSwitchValueASCII(switches::kProcessType);
33		33
Lines 36-42 Link Here
36	crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());	36	crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
37	#endif	37	#endif
38		38
39	@@ -814,7 +814,7 @@ void ChromeMainDelegate::PreSandboxStart	39	@@ -851,7 +851,7 @@ void ChromeMainDelegate::PreSandboxStart
40	chrome::InitializePDF();	40	chrome::InitializePDF();
41	#endif	41	#endif
42		42
Lines 45-51 Link Here
45	// Zygote needs to call InitCrashReporter() in RunZygote().	45	// Zygote needs to call InitCrashReporter() in RunZygote().
46	if (process_type != switches::kZygoteProcess) {	46	if (process_type != switches::kZygoteProcess) {
47	#if defined(OS_ANDROID)	47	#if defined(OS_ANDROID)
48	@@ -832,7 +832,7 @@ void ChromeMainDelegate::PreSandboxStart	48	@@ -869,7 +869,7 @@ void ChromeMainDelegate::PreSandboxStart
49	breakpad::InitCrashReporter(process_type);	49	breakpad::InitCrashReporter(process_type);
50	#endif // defined(OS_ANDROID)	50	#endif // defined(OS_ANDROID)
51	}	51	}
Lines 54-60 Link Here
54		54
55	// After all the platform Breakpads have been initialized, store the command	55	// After all the platform Breakpads have been initialized, store the command
56	// line for crash reporting.	56	// line for crash reporting.
57	@@ -942,7 +942,7 @@ bool ChromeMainDelegate::DelaySandboxIni	57	@@ -979,7 +979,7 @@ bool ChromeMainDelegate::DelaySandboxIni
58	#endif	58	#endif
59	return process_type == switches::kRelauncherProcess;	59	return process_type == switches::kRelauncherProcess;
60	}	60	}

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_app_generated__resources.grd (-6 / +6 lines)
1	--- chrome/app/generated_resources.grd.orig 2016-10-06 04:02:10.000000000 +0300	1	--- chrome/app/generated_resources.grd.orig 2016-12-09 05:04:14 UTC
2	+++ chrome/app/generated_resources.grd 2016-10-14 07:09:15.305398000 +0300	2	+++ chrome/app/generated_resources.grd
3	@@ -6841,7 +6841,7 @@	3	@@ -6843,7 +6843,7 @@ Keep your key file in a safe place. You
4	<message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">	4	<message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
5	Right-to-left	5	Right-to-left
6	</message>	6	</message>
Lines 9-15 Link Here
9	<message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">	9	<message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
10	Enable Input IME API	10	Enable Input IME API
11	</message>	11	</message>
12	@@ -10134,7 +10134,7 @@	12	@@ -10212,7 +10212,7 @@ I don't think this site should be blocke
13	<message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">	13	<message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
14	Appearance	14	Appearance
15	</message>	15	</message>
Lines 18-24 Link Here
18	<message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">	18	<message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
19	Themes	19	Themes
20	</message>	20	</message>
21	@@ -10142,7 +10142,7 @@	21	@@ -10220,7 +10220,7 @@ I don't think this site should be blocke
22	<message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">	22	<message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
23	Reset to default theme	23	Reset to default theme
24	</message>	24	</message>
Lines 27-33 Link Here
27	<message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">	27	<message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
28	Use GTK+ theme	28	Use GTK+ theme
29	</message>	29	</message>
30	@@ -11429,7 +11429,7 @@	30	@@ -11516,7 +11516,7 @@ Tell us what happened exactly before you
31	Set as default	31	Set as default
32	</message>	32	</message>
33		33

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc (-3 / +3 lines)
1	--- chrome/browser/chrome_browser_main_posix.cc.orig 2016-03-25 13:04:45 UTC	1	--- chrome/browser/chrome_browser_main_posix.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/chrome_browser_main_posix.cc	2	+++ chrome/browser/chrome_browser_main_posix.cc
3	@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMa	3	@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMa
4	g_pipe_pid = getpid();	4	g_pipe_pid = getpid();
5	g_shutdown_pipe_read_fd = pipefd[0];	5	g_shutdown_pipe_read_fd = pipefd[0];
6	g_shutdown_pipe_write_fd = pipefd[1];	6	g_shutdown_pipe_write_fd = pipefd[1];
Lines 12-18 Link Here
12	#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)	12	#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
13	const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;	13	const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
14	#else	14	#else
15	@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMa	15	@@ -283,6 +288,7 @@ void ChromeBrowserMainPartsPosix::PostMa
16	// size to avoid hitting the guard page.	16	// size to avoid hitting the guard page.
17	const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;	17	const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
18	#endif	18	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (-7 / +7 lines)
1	--- chrome/browser/renderer_preferences_util.cc.orig 2016-05-11 19:02:14 UTC	1	--- chrome/browser/renderer_preferences_util.cc.orig 2016-12-09 05:04:15 UTC
2	+++ chrome/browser/renderer_preferences_util.cc	2	+++ chrome/browser/renderer_preferences_util.cc
3	@@ -15,7 +15,7 @@	3	@@ -18,7 +18,7 @@
4	#include "content/public/common/webrtc_ip_handling_policy.h"	4	#include "content/public/common/webrtc_ip_handling_policy.h"
5	#include "third_party/skia/include/core/SkColor.h"	5	#include "third_party/skia/include/core/SkColor.h"
6		6
Lines 9-16 Link Here
9	#include "ui/gfx/font_render_params.h"	9	#include "ui/gfx/font_render_params.h"
10	#endif	10	#endif
11		11
12	@@ -27,7 +27,7 @@	12	@@ -30,7 +30,7 @@
13	#include "ui/views/controls/textfield/textfield.h"	13	#include "ui/base/cocoa/defaults_utils.h"
14	#endif	14	#endif
15		15
16	-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)	16	-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
Lines 18-25 Link Here
18	#include "chrome/browser/themes/theme_service.h"	18	#include "chrome/browser/themes/theme_service.h"
19	#include "chrome/browser/themes/theme_service_factory.h"	19	#include "chrome/browser/themes/theme_service_factory.h"
20	#include "ui/views/linux_ui/linux_ui.h"	20	#include "ui/views/linux_ui/linux_ui.h"
21	@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::R	21	@@ -132,7 +132,7 @@ void UpdateFromSystemSettings(content::R
22	prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;	22	prefs->caret_blink_interval = interval.InSecondsF();
23	#endif	23	#endif
24		24
25	-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)	25	-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
Lines 27-33 Link Here
27	views::LinuxUI* linux_ui = views::LinuxUI::instance();	27	views::LinuxUI* linux_ui = views::LinuxUI::instance();
28	if (linux_ui) {	28	if (linux_ui) {
29	if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {	29	if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
30	@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::R	30	@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(content::R
31	}	31	}
32	#endif	32	#endif
33		33

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (-6 / +6 lines)
1	--- chrome/browser/ui/browser_command_controller.cc.orig 2016-10-06 04:02:13.000000000 +0300	1	--- chrome/browser/ui/browser_command_controller.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/browser_command_controller.cc 2016-10-13 05:57:01.306342000 +0300	2	+++ chrome/browser/ui/browser_command_controller.cc
3	@@ -76,7 +76,7 @@	3	@@ -80,7 +80,7 @@
4	#include "chrome/browser/ui/browser_commands_chromeos.h"	4	#include "chrome/browser/ui/browser_commands_chromeos.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"	9	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
10	#endif	10	#endif
11		11
12	@@ -216,7 +216,7 @@	12	@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve
13	if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)	13	if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
14	return true;	14	return true;
15		15
Lines 18-24 Link Here
18	// If this key was registered by the user as a content editing hotkey, then	18	// If this key was registered by the user as a content editing hotkey, then
19	// it is not reserved.	19	// it is not reserved.
20	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =	20	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
21	@@ -419,7 +419,7 @@	21	@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo
22	break;	22	break;
23	#endif	23	#endif
24		24
Lines 27-33 Link Here
27	case IDC_USE_SYSTEM_TITLE_BAR: {	27	case IDC_USE_SYSTEM_TITLE_BAR: {
28	PrefService* prefs = browser_->profile()->GetPrefs();	28	PrefService* prefs = browser_->profile()->GetPrefs();
29	prefs->SetBoolean(prefs::kUseCustomChromeFrame,	29	prefs->SetBoolean(prefs::kUseCustomChromeFrame,
30	@@ -812,7 +812,7 @@	30	@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma
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_views_tabs_tab__drag__controller.cc (-4 / +4 lines)
1	--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2016-05-11 19:02:16 UTC	1	--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc	2	+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
3	@@ -268,7 +268,7 @@ void TabDragController::Init(	3	@@ -281,7 +281,7 @@ void TabDragController::Init(
4	// synchronous on desktop Linux, so use that.	4	// synchronous on desktop Linux, so use that.
5	// - Ash	5	// - Ash
6	// Releasing capture on Ash cancels gestures so avoid it.	6	// Releasing capture on Ash cancels gestures so avoid it.
Lines 9-15 Link Here
9	can_release_capture_ = false;	9	can_release_capture_ = false;
10	#endif	10	#endif
11	start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());	11	start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
12	@@ -618,7 +618,7 @@ TabDragController::DragBrowserToNewTabSt	12	@@ -631,7 +631,7 @@ TabDragController::DragBrowserToNewTabSt
13	// that to effect the position of any windows.	13	// that to effect the position of any windows.
14	SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);	14	SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
15		15
Lines 18-24 Link Here
18	// EndMoveLoop is going to snap the window back to its original location.	18	// EndMoveLoop is going to snap the window back to its original location.
19	// Hide it so users don't see this. Hiding a window in Linux aura causes	19	// Hide it so users don't see this. Hiding a window in Linux aura causes
20	// it to lose capture so skip it.	20	// it to lose capture so skip it.
21	@@ -1791,7 +1791,7 @@ gfx::NativeWindow TabDragController::Get	21	@@ -1830,7 +1830,7 @@ TabDragController::Liveness TabDragContr
22	if (dragged_window)	22	if (dragged_window)
23	exclude.insert(dragged_window);	23	exclude.insert(dragged_window);
24	}	24	}

Lines 1-56 Link Here

(-)www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (-16 / +16 lines)
1	--- chrome/browser/ui/webui/about_ui.cc.orig 2016-07-20 22:03:21.000000000 +0300	1	--- chrome/browser/ui/webui/about_ui.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/browser/ui/webui/about_ui.cc 2016-08-10 15:53:44.885419000 +0300	2	+++ chrome/browser/ui/webui/about_ui.cc
3	@@ -73,7 +73,7 @@	3	@@ -75,7 +75,7 @@
4	#include "chrome/browser/ui/webui/theme_source.h"	4	#include "chrome/browser/ui/webui/theme_source.h"
5	#endif	5	#endif
6		6
7	-#if defined(OS_LINUX) \|\| defined(OS_OPENBSD)	7	-#if defined(OS_LINUX) \|\| defined(OS_OPENBSD)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include "content/public/browser/zygote_host_linux.h"	9	#include "content/public/browser/zygote_host_linux.h"
10	#include "content/public/common/sandbox_linux.h"	10	#include "content/public/common/sandbox_linux.h"
11	#endif	11	#endif
12	@@ -642,7 +642,7 @@	12	@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref
13	DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);	13	DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);
14	};	14	};
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)
18	std::string AboutLinuxProxyConfig() {	18	std::string AboutLinuxProxyConfig() {
19	std::string data;	19	std::string data;
20	AppendHeader(&data, 0,	20	AppendHeader(&data, 0,
21	@@ -658,6 +658,7 @@	21	@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() {
22	return data;	22	return data;
23	}	23	}
24		24
25	+#if !defined(OS_BSD)	25	+#if !defined(OS_BSD)
26	void AboutSandboxRow(std::string* data, int name_id, bool good) {	26	void AboutSandboxRow(std::string* data, int name_id, bool good) {
27	data->append("<tr><td>");	27	data->append("<tr><td>");
28	data->append(l10n_util::GetStringUTF8(name_id));	28	data->append(l10n_util::GetStringUTF8(name_id));
29	@@ -672,6 +673,7 @@	29	@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data,
30	}	30	}
31	data->append("</td></tr>");	31	data->append("</td></tr>");
32	}	32	}
33	+#endif	33	+#endif
34		34
35	std::string AboutSandbox() {	35	std::string AboutSandbox() {
36	std::string data;	36	std::string data;
37	@@ -681,6 +683,7 @@	37	@@ -683,6 +685,7 @@ std::string AboutSandbox() {
38	data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));	38	data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
39	data.append("</h1>");	39	data.append("</h1>");
40		40
41	+#if !defined(OS_BSD)	41	+#if !defined(OS_BSD)
42	// Get expected sandboxing status of renderers.	42	// Get expected sandboxing status of renderers.
43	const int status =	43	const int status =
44	content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();	44	content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
45	@@ -721,6 +724,7 @@	45	@@ -723,6 +726,7 @@ std::string AboutSandbox() {
46	data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));	46	data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
47	}	47	}
48	data.append("</p>");	48	data.append("</p>");
49	+#endif	49	+#endif
50		50
51	AppendFooter(&data);	51	AppendFooter(&data);
52	return data;	52	return data;
53	@@ -769,7 +773,7 @@	53	@@ -787,7 +791,7 @@ void AboutUIHTMLSource::StartDataRequest
54	} else if (source_name_ == chrome::kChromeUIDNSHost) {	54	} else if (source_name_ == chrome::kChromeUIDNSHost) {
55	AboutDnsHandler::Start(profile(), callback);	55	AboutDnsHandler::Start(profile(), callback);
56	return;	56	return;
Lines 59-65 Link Here
59	} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {	59	} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
60	response = AboutLinuxProxyConfig();	60	response = AboutLinuxProxyConfig();
61	#endif	61	#endif
62	@@ -778,7 +782,7 @@	62	@@ -796,7 +800,7 @@ void AboutUIHTMLSource::StartDataRequest
63	ChromeOSCreditsHandler::Start(path, callback);	63	ChromeOSCreditsHandler::Start(path, callback);
64	return;	64	return;
65	#endif	65	#endif

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__paths.cc (-6 / +6 lines)
1	--- chrome/common/chrome_paths.cc.orig 2016-05-11 19:02:17 UTC	1	--- chrome/common/chrome_paths.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/chrome_paths.cc	2	+++ chrome/common/chrome_paths.cc
3	@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePat	3	@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
4	return false;	4	return false;
5	break;	5	break;
6	case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:	6	case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
Lines 9-15 Link Here
9	if (!GetUserDownloadsDirectorySafe(&cur))	9	if (!GetUserDownloadsDirectorySafe(&cur))
10	return false;	10	return false;
11	break;	11	break;
12	@@ -470,10 +470,12 @@ bool PathProvider(int key, base::FilePat	12	@@ -472,10 +472,12 @@ bool PathProvider(int key, base::FilePat
13	if (!base::PathExists(cur)) // We don't want to create this	13	if (!base::PathExists(cur)) // We don't want to create this
14	return false;	14	return false;
15	break;	15	break;
Lines 23-29 Link Here
23	#else	23	#else
24	cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));	24	cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
25	#endif	25	#endif
26	@@ -540,7 +542,7 @@ bool PathProvider(int key, base::FilePat	26	@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePat
27	#endif	27	#endif
28	break;	28	break;
29		29
Lines 32-38 Link Here
32	case chrome::DIR_NATIVE_MESSAGING:	32	case chrome::DIR_NATIVE_MESSAGING:
33	#if defined(OS_MACOSX)	33	#if defined(OS_MACOSX)
34	#if defined(GOOGLE_CHROME_BUILD)	34	#if defined(GOOGLE_CHROME_BUILD)
35	@@ -554,6 +556,9 @@ bool PathProvider(int key, base::FilePat	35	@@ -540,6 +542,9 @@ bool PathProvider(int key, base::FilePat
36	#if defined(GOOGLE_CHROME_BUILD)	36	#if defined(GOOGLE_CHROME_BUILD)
37	cur = base::FilePath(FILE_PATH_LITERAL(	37	cur = base::FilePath(FILE_PATH_LITERAL(
38	"/etc/opt/chrome/native-messaging-hosts"));	38	"/etc/opt/chrome/native-messaging-hosts"));
Lines 42-48 Link Here
42	#else	42	#else
43	cur = base::FilePath(FILE_PATH_LITERAL(	43	cur = base::FilePath(FILE_PATH_LITERAL(
44	"/etc/chromium/native-messaging-hosts"));	44	"/etc/chromium/native-messaging-hosts"));
45	@@ -566,7 +571,7 @@ bool PathProvider(int key, base::FilePat	45	@@ -552,7 +557,7 @@ bool PathProvider(int key, base::FilePat
46	return false;	46	return false;
47	cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));	47	cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
48	break;	48	break;

Lines 1-8 Link Here

(-)www/chromium/files/patch-chrome_common_chrome__paths.h (-6 / +6 lines)
1	--- chrome/common/chrome_paths.h.orig 2016-05-11 19:02:17 UTC	1	--- chrome/common/chrome_paths.h.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/chrome_paths.h	2	+++ chrome/common/chrome_paths.h
3	@@ -50,7 +50,7 @@ enum {	3	@@ -48,7 +48,7 @@ enum {
4	DIR_USER_APPLICATIONS, // ~/Applications	4	// to set policies for chrome. This directory
5	DIR_USER_LIBRARY, // ~/Library	5	// contains subdirectories.
6	#endif	6	#endif
7	-#if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) \|\| \	7	-#if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) \|\| \
8	+#if defined(OS_CHROMEOS) \|\| ((defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(CHROMIUM_BUILD)) \|\| \	8	+#if defined(OS_CHROMEOS) \|\| ((defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(CHROMIUM_BUILD)) \|\| \
Lines 9-15 Link Here
9	defined(OS_MACOSX)	9	defined(OS_MACOSX)
10	DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions	10	DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
11	// on Chrome Mac and Chromium Linux.	11	// on Chrome Mac and Chromium Linux.
12	@@ -59,7 +59,7 @@ enum {	12	@@ -57,7 +57,7 @@ enum {
13	// create it.	13	// create it.
14	#endif	14	#endif
15		15
Lines 18-24 Link Here
18	DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'	18	DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
19	// definition manifest files that	19	// definition manifest files that
20	// describe extensions which are to be	20	// describe extensions which are to be
21	@@ -117,7 +117,7 @@ enum {	21	@@ -111,7 +111,7 @@ enum {
22	DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized	22	DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
23	// supervised user whitelists are	23	// supervised user whitelists are
24	// installed.	24	// installed.

Lines 1-6 Link Here

(-)www/chromium/files/patch-chrome_common_pref__names.cc (-5 / +5 lines)
1	--- chrome/common/pref_names.cc.orig 2016-10-06 04:02:14.000000000 +0300	1	--- chrome/common/pref_names.cc.orig 2016-12-09 05:04:16 UTC
2	+++ chrome/common/pref_names.cc 2016-10-14 06:57:51.856679000 +0300	2	+++ chrome/common/pref_names.cc
3	@@ -952,7 +952,7 @@	3	@@ -940,7 +940,7 @@ const char kForceSessionSync[] = "settin
4	// only using an account that belongs to one of the domains from this pref.	4	// only using an account that belongs to one of the domains from this pref.
5	const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";	5	const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
6		6
Lines 9-15 Link Here
9	// Linux specific preference on whether we should match the system theme.	9	// Linux specific preference on whether we should match the system theme.
10	const char kUsesSystemTheme[] = "extensions.theme.use_system";	10	const char kUsesSystemTheme[] = "extensions.theme.use_system";
11	#endif	11	#endif
12	@@ -1035,7 +1035,7 @@	12	@@ -1027,7 +1027,7 @@ const char kShowUpdatePromotionInfoBar[]
13	"browser.show_update_promotion_info_bar";	13	"browser.show_update_promotion_info_bar";
14	#endif	14	#endif
15		15
Lines 18-24 Link Here
18	// Boolean that is false if we should show window manager decorations. If	18	// Boolean that is false if we should show window manager decorations. If
19	// true, we draw a custom chrome frame (thicker title bar and blue border).	19	// true, we draw a custom chrome frame (thicker title bar and blue border).
20	const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";	20	const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
21	@@ -1408,7 +1408,7 @@	21	@@ -1400,7 +1400,7 @@ const char kDownloadDefaultDirectory[] =
22	// upgrade a unsafe location to a safe location.	22	// upgrade a unsafe location to a safe location.
23	const char kDownloadDirUpgraded[] = "download.directory_upgrade";	23	const char kDownloadDirUpgraded[] = "download.directory_upgrade";
24		24

Lines 1-6 Link Here

(-)www/chromium/files/patch-components_policy_resources_policy__templates.json (-7 / +7 lines)
1	--- components/policy/resources/policy_templates.json.orig 2016-10-06 04:02:17.000000000 +0300	1	--- components/policy/resources/policy_templates.json.orig 2016-12-09 05:04:18 UTC
2	+++ components/policy/resources/policy_templates.json 2016-10-17 00:01:03.979810000 +0300	2	+++ components/policy/resources/policy_templates.json
3	@@ -909,7 +909,7 @@	3	@@ -932,7 +932,7 @@
4	'name': 'RemoteAccessHostMatchUsername',	4	'name': 'RemoteAccessHostMatchUsername',
5	'type': 'main',	5	'type': 'main',
6	'schema': { 'type': 'boolean' },	6	'schema': { 'type': 'boolean' },
Lines 9-15 Link Here
9	'features': {	9	'features': {
10	'dynamic_refresh': True,	10	'dynamic_refresh': True,
11	'per_profile': False,	11	'per_profile': False,
12	@@ -1930,7 +1930,7 @@	12	@@ -2056,7 +2056,7 @@
13	'name': 'GSSAPILibraryName',	13	'name': 'GSSAPILibraryName',
14	'type': 'string',	14	'type': 'string',
15	'schema': { 'type': 'string' },	15	'schema': { 'type': 'string' },
Lines 18-24 Link Here
18	'features': {	18	'features': {
19	'dynamic_refresh': False,	19	'dynamic_refresh': False,
20	'per_profile': False,	20	'per_profile': False,
21	@@ -4601,7 +4601,7 @@	21	@@ -4733,7 +4733,7 @@
22	'name': 'RequireOnlineRevocationChecksForLocalAnchors',	22	'name': 'RequireOnlineRevocationChecksForLocalAnchors',
23	'type': 'main',	23	'type': 'main',
24	'schema': { 'type': 'boolean' },	24	'schema': { 'type': 'boolean' },
Lines 27-33 Link Here
27	'features': {	27	'features': {
28	'dynamic_refresh': True,	28	'dynamic_refresh': True,
29	'per_profile': False,	29	'per_profile': False,
30	@@ -5449,7 +5449,7 @@	30	@@ -5618,7 +5618,7 @@
31	'name': 'BackgroundModeEnabled',	31	'name': 'BackgroundModeEnabled',
32	'type': 'main',	32	'type': 'main',
33	'schema': { 'type': 'boolean' },	33	'schema': { 'type': 'boolean' },
Lines 36-42 Link Here
36	'features': {	36	'features': {
37	'can_be_recommended': True,	37	'can_be_recommended': True,
38	'dynamic_refresh': True,	38	'dynamic_refresh': True,
39	@@ -5974,7 +5974,7 @@	39	@@ -6141,7 +6141,7 @@
40	'name': 'FullscreenAllowed',	40	'name': 'FullscreenAllowed',
41	'type': 'main',	41	'type': 'main',
42	'schema': { 'type': 'boolean' },	42	'schema': { 'type': 'boolean' },

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_app_content__main__runner.cc (-6 / +6 lines)
1	--- content/app/content_main_runner.cc.orig 2016-05-11 19:02:20 UTC	1	--- content/app/content_main_runner.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/app/content_main_runner.cc	2	+++ content/app/content_main_runner.cc
3	@@ -98,10 +98,10 @@	3	@@ -96,10 +96,10 @@
4	#include "base/posix/global_descriptors.h"	4	#include "base/posix/global_descriptors.h"
5	#include "content/public/common/content_descriptors.h"	5	#include "content/public/common/content_descriptors.h"
6		6
Lines 13-19 Link Here
13	#include "content/zygote/zygote_main.h"	13	#include "content/zygote/zygote_main.h"
14	#endif	14	#endif
15		15
16	@@ -273,7 +273,7 @@ struct MainFunction {	16	@@ -293,7 +293,7 @@ struct MainFunction {
17	int (*function)(const MainFunctionParams&);	17	int (*function)(const MainFunctionParams&);
18	};	18	};
19		19
Lines 22-28 Link Here
22	// On platforms that use the zygote, we have a special subset of	22	// On platforms that use the zygote, we have a special subset of
23	// subprocesses that are launched via the zygote. This function	23	// subprocesses that are launched via the zygote. This function
24	// fills in some process-launching bits around ZygoteMain().	24	// fills in some process-launching bits around ZygoteMain().
25	@@ -322,7 +322,7 @@ int RunZygote(const MainFunctionParams&	25	@@ -345,7 +345,7 @@ int RunZygote(const MainFunctionParams&
26	NOTREACHED() << "Unknown zygote process type: " << process_type;	26	NOTREACHED() << "Unknown zygote process type: " << process_type;
27	return 1;	27	return 1;
28	}	28	}
Lines 29-37 Link Here
29	-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)	29	-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
30	+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)	30	+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
31		31
32	#if !defined(OS_IOS)
33	static void RegisterMainThreadFactories() {	32	static void RegisterMainThreadFactories() {
34	@@ -396,7 +396,7 @@ int RunNamedProcessTypeMain(	33	#if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
		34	@@ -412,7 +412,7 @@ int RunNamedProcessTypeMain(
35	}	35	}
36	}	36	}
37		37

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_BUILD.gn (-7 / +7 lines)
1	--- content/browser/BUILD.gn.orig 2016-12-01 23:02:12.000000000 +0000	1	--- content/browser/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/BUILD.gn 2016-12-14 14:34:21.739126000 +0000	2	+++ content/browser/BUILD.gn
3	@@ -1399,6 +1399,12 @@	3	@@ -1399,6 +1399,12 @@ source_set("browser") {
4	]	4	]
5	}	5	}
6		6
Lines 13-19 Link Here
13	if (!is_win) {	13	if (!is_win) {
14	sources += [	14	sources += [
15	"file_descriptor_info_impl.cc",	15	"file_descriptor_info_impl.cc",
16	@@ -1462,7 +1468,7 @@	16	@@ -1462,7 +1468,7 @@ source_set("browser") {
17	if (!is_ios) {	17	if (!is_ios) {
18	defines += [ "ENABLE_SCREEN_CAPTURE=1" ]	18	defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
19	}	19	}
Lines 22-28 Link Here
22	sources += [	22	sources += [
23	"media/capture/desktop_capture_device.cc",	23	"media/capture/desktop_capture_device.cc",
24	"media/capture/desktop_capture_device.h",	24	"media/capture/desktop_capture_device.h",
25	@@ -1629,7 +1635,7 @@	25	@@ -1629,7 +1635,7 @@ source_set("browser") {
26	}	26	}
27	}	27	}
28		28
Lines 31-37 Link Here
31	deps += [ "//build/linux:fontconfig" ]	31	deps += [ "//build/linux:fontconfig" ]
32	}	32	}
33		33
34	@@ -1782,6 +1788,17 @@	34	@@ -1782,6 +1788,17 @@ source_set("browser") {
35	"//chromeos",	35	"//chromeos",
36	"//chromeos:power_manager_proto",	36	"//chromeos:power_manager_proto",
37	]	37	]
Lines 49-55 Link Here
49	}	49	}
50		50
51	if (use_aura) {	51	if (use_aura) {
52	@@ -1899,11 +1916,11 @@	52	@@ -1899,11 +1916,11 @@ source_set("browser") {
53	deps += [ "//third_party/flac" ]	53	deps += [ "//third_party/flac" ]
54	}	54	}
55		55

Lines 1-7 Link Here

(-)www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc (-6 / +6 lines)
1	--- content/browser/gpu/gpu_internals_ui.cc.orig 2016-07-22 00:06:54.000000000 -0400	1	--- content/browser/gpu/gpu_internals_ui.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/gpu/gpu_internals_ui.cc 2016-08-03 12:29:59.399353000 -0400	2	+++ content/browser/gpu/gpu_internals_ui.cc
3	@@ -39,7 +39,7 @@	3	@@ -42,7 +42,7 @@
4	#include "third_party/angle/src/common/version.h"	4	#include "third_party/skia/include/core/SkMilestone.h"
5	#include "ui/gl/gpu_switching_manager.h"	5	#include "ui/gl/gpu_switching_manager.h"
6		6
7	-#if defined(OS_LINUX) && defined(USE_X11)	7	-#if defined(OS_LINUX) && defined(USE_X11)
Lines 9-15 Link Here
9	#include <X11/Xlib.h>	9	#include <X11/Xlib.h>
10	#endif	10	#endif
11	#if defined(OS_WIN)	11	#if defined(OS_WIN)
12	@@ -47,7 +47,7 @@	12	@@ -50,7 +50,7 @@
13	#include "ui/gfx/win/physical_size.h"	13	#include "ui/gfx/win/physical_size.h"
14	#endif	14	#endif
15		15
Lines 18-24 Link Here
18	#include "ui/base/x/x11_util.h" // nogncheck	18	#include "ui/base/x/x11_util.h" // nogncheck
19	#include "ui/gfx/x/x11_atom_cache.h" // nogncheck	19	#include "ui/gfx/x/x11_atom_cache.h" // nogncheck
20	#endif	20	#endif
21	@@ -200,7 +200,7 @@	21	@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona
22	gpu_info.gl_ws_version));	22	gpu_info.gl_ws_version));
23	basic_info->Append(NewDescriptionValuePair("Window system binding extensions",	23	basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
24	gpu_info.gl_ws_extensions));	24	gpu_info.gl_ws_extensions));

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (-6 / +6 lines)
1	--- content/browser/ppapi_plugin_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/ppapi_plugin_process_host.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/ppapi_plugin_process_host.cc 2016-08-18 02:36:09.470007000 +0300	2	+++ content/browser/ppapi_plugin_process_host.cc
3	@@ -49,7 +49,7 @@	3	@@ -52,7 +52,7 @@
4		4
5	namespace content {	5	namespace content {
6		6
Lines 9-15 Link Here
9	ZygoteHandle g_ppapi_zygote;	9	ZygoteHandle g_ppapi_zygote;
10	#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)	10	#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
11		11
12	@@ -114,7 +114,7 @@	12	@@ -119,7 +119,7 @@ class PpapiPluginSandboxedProcessLaunche
13	}	13	}
14		14
15	#elif defined(OS_POSIX)	15	#elif defined(OS_POSIX)
Lines 18-24 Link Here
18	ZygoteHandle* GetZygote() override {	18	ZygoteHandle* GetZygote() override {
19	const base::CommandLine& browser_command_line =	19	const base::CommandLine& browser_command_line =
20	*base::CommandLine::ForCurrentProcess();	20	*base::CommandLine::ForCurrentProcess();
21	@@ -214,7 +214,7 @@	21	@@ -222,7 +222,7 @@ PpapiPluginProcessHost* PpapiPluginProce
22	return NULL;	22	return NULL;
23	}	23	}
24		24
Lines 27-33 Link Here
27	// static	27	// static
28	void PpapiPluginProcessHost::EarlyZygoteLaunch() {	28	void PpapiPluginProcessHost::EarlyZygoteLaunch() {
29	DCHECK(!g_ppapi_zygote);	29	DCHECK(!g_ppapi_zygote);
30	@@ -377,7 +377,7 @@	30	@@ -380,7 +380,7 @@ bool PpapiPluginProcessHost::Init(const
31	base::CommandLine::StringType plugin_launcher =	31	base::CommandLine::StringType plugin_launcher =
32	browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);	32	browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
33		33

Lines 1-7 Link Here

(-)www/chromium/files/patch-content_browser_utility__process__host__impl.cc (-10 / +10 lines)
1	--- content/browser/utility_process_host_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300	1	--- content/browser/utility_process_host_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/browser/utility_process_host_impl.cc 2016-08-18 02:26:27.996136000 +0300	2	+++ content/browser/utility_process_host_impl.cc
3	@@ -38,7 +38,7 @@	3	@@ -43,7 +43,7 @@
4	#include "ipc/ipc_switches.h"	4	#include "services/shell/public/cpp/interface_provider.h"
5	#include "ui/base/ui_base_switches.h"	5	#include "ui/base/ui_base_switches.h"
6		6
7	-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)	7	-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
Lines 9-15 Link Here
9	#include "content/public/browser/zygote_handle_linux.h"	9	#include "content/public/browser/zygote_handle_linux.h"
10	#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)	10	#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
11		11
12	@@ -49,7 +49,7 @@	12	@@ -54,7 +54,7 @@
13		13
14	namespace content {	14	namespace content {
15		15
Lines 18-24 Link Here
18	namespace {	18	namespace {
19	ZygoteHandle g_utility_zygote;	19	ZygoteHandle g_utility_zygote;
20	} // namespace	20	} // namespace
21	@@ -69,7 +69,7 @@	21	@@ -74,7 +74,7 @@ class UtilitySandboxedProcessLauncherDel
22	launch_elevated_(launch_elevated)	22	launch_elevated_(launch_elevated)
23	#elif defined(OS_POSIX)	23	#elif defined(OS_POSIX)
24	env_(env),	24	env_(env),
Lines 27-33 Link Here
27	no_sandbox_(no_sandbox),	27	no_sandbox_(no_sandbox),
28	#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)	28	#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)
29	ipc_fd_(host->TakeClientFileDescriptor())	29	ipc_fd_(host->TakeClientFileDescriptor())
30	@@ -101,7 +101,7 @@	30	@@ -106,7 +106,7 @@ class UtilitySandboxedProcessLauncherDel
31		31
32	#elif defined(OS_POSIX)	32	#elif defined(OS_POSIX)
33		33
Lines 36-42 Link Here
36	ZygoteHandle* GetZygote() override {	36	ZygoteHandle* GetZygote() override {
37	if (no_sandbox_ \|\| !exposed_dir_.empty())	37	if (no_sandbox_ \|\| !exposed_dir_.empty())
38	return nullptr;	38	return nullptr;
39	@@ -123,7 +123,7 @@	39	@@ -128,7 +128,7 @@ class UtilitySandboxedProcessLauncherDel
40	bool launch_elevated_;	40	bool launch_elevated_;
41	#elif defined(OS_POSIX)	41	#elif defined(OS_POSIX)
42	base::EnvironmentMap env_;	42	base::EnvironmentMap env_;
Lines 45-51 Link Here
45	bool no_sandbox_;	45	bool no_sandbox_;
46	#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)	46	#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)
47	base::ScopedFD ipc_fd_;	47	base::ScopedFD ipc_fd_;
48	@@ -151,7 +151,7 @@	48	@@ -156,7 +156,7 @@ UtilityProcessHostImpl::UtilityProcessHo
49	is_batch_mode_(false),	49	is_batch_mode_(false),
50	no_sandbox_(false),	50	no_sandbox_(false),
51	run_elevated_(false),	51	run_elevated_(false),
Lines 54-60 Link Here
54	child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),	54	child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
55	#else	55	#else
56	child_flags_(ChildProcessHost::CHILD_NORMAL),	56	child_flags_(ChildProcessHost::CHILD_NORMAL),
57	@@ -232,7 +232,7 @@	57	@@ -237,7 +237,7 @@ void UtilityProcessHostImpl::SetName(con
58	name_ = name;	58	name_ = name;
59	}	59	}
60		60

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_gpu_gpu__main.cc (-5 / +5 lines)
1	--- content/gpu/gpu_main.cc.orig 2016-12-01 23:02:13.000000000 +0000	1	--- content/gpu/gpu_main.cc.orig 2016-12-09 05:04:19 UTC
2	+++ content/gpu/gpu_main.cc 2016-12-13 17:52:18.210016000 +0000	2	+++ content/gpu/gpu_main.cc
3	@@ -92,7 +92,7 @@	3	@@ -92,7 +92,7 @@ namespace content {
4		4
5	namespace {	5	namespace {
6		6
Lines 9-15 Link Here
9	bool StartSandboxLinux(gpu::GpuWatchdogThread*);	9	bool StartSandboxLinux(gpu::GpuWatchdogThread*);
10	#elif defined(OS_WIN)	10	#elif defined(OS_WIN)
11	bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);	11	bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
12	@@ -145,7 +145,7 @@	12	@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu:
13		13
14	bool EnsureSandboxInitialized(	14	bool EnsureSandboxInitialized(
15	gpu::GpuWatchdogThread* watchdog_thread) override {	15	gpu::GpuWatchdogThread* watchdog_thread) override {
Lines 18-24 Link Here
18	return StartSandboxLinux(watchdog_thread);	18	return StartSandboxLinux(watchdog_thread);
19	#elif defined(OS_WIN)	19	#elif defined(OS_WIN)
20	return StartSandboxWindows(sandbox_info_);	20	return StartSandboxWindows(sandbox_info_);
21	@@ -292,7 +292,7 @@	21	@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa
22		22
23	namespace {	23	namespace {
24		24

Lines 1-6 Link Here

(-)www/chromium/files/patch-content_shell_BUILD.gn (-6 / +6 lines)
1	--- content/shell/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300	1	--- content/shell/BUILD.gn.orig 2016-12-09 05:04:19 UTC
2	+++ content/shell/BUILD.gn 2016-09-18 01:45:17.587900000 +0300	2	+++ content/shell/BUILD.gn
3	@@ -275,7 +275,7 @@	3	@@ -287,7 +287,7 @@ static_library("content_shell_lib") {
4	]	4	]
5	}	5	}
6		6
Lines 9-15 Link Here
9	deps += [	9	deps += [
10	"//build/linux:fontconfig",	10	"//build/linux:fontconfig",
11	"//ui/gfx:test_support",	11	"//ui/gfx:test_support",
12	@@ -296,7 +296,7 @@	12	@@ -308,7 +308,7 @@ static_library("content_shell_lib") {
13	deps += [ "//content/shell/android:content_shell_jni_headers" ]	13	deps += [ "//content/shell/android:content_shell_jni_headers" ]
14	}	14	}
15		15
Lines 18-24 Link Here
18	deps += [	18	deps += [
19	"//components/crash/content/app",	19	"//components/crash/content/app",
20	"//components/crash/content/browser",	20	"//components/crash/content/browser",
21	@@ -338,7 +338,7 @@	21	@@ -356,7 +356,7 @@ static_library("content_shell_lib") {
22	]	22	]
23	}	23	}
24		24
Lines 27-33 Link Here
27	deps += [ "//third_party/freetype2" ]	27	deps += [ "//third_party/freetype2" ]
28	}	28	}
29		29
30	@@ -496,7 +496,7 @@	30	@@ -520,7 +520,7 @@ if (is_android) {
31	}	31	}
32	}	32	}
33		33

Lines 1-5 Link Here

(-)www/chromium/files/patch-device_usb_usb__service__impl.cc (-7 / +7 lines)
1	--- device/usb/usb_service_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300	1	--- device/usb/usb_service_impl.cc.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_service_impl.cc 2016-10-13 07:29:44.662206000 +0300	2	+++ device/usb/usb_service_impl.cc
3	@@ -26,7 +26,11 @@	3	@@ -26,7 +26,11 @@
4	#include "device/usb/usb_error.h"	4	#include "device/usb/usb_error.h"
5	#include "device/usb/webusb_descriptors.h"	5	#include "device/usb/webusb_descriptors.h"
Lines 13-19 Link Here
13		13
14	#if defined(OS_WIN)	14	#if defined(OS_WIN)
15	#include <setupapi.h>	15	#include <setupapi.h>
16	@@ -213,6 +217,7 @@	16	@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl(
17	}	17	}
18	context_ = new UsbContext(platform_context);	18	context_ = new UsbContext(platform_context);
19		19
Lines 21-27 Link Here
21	rv = libusb_hotplug_register_callback(	21	rv = libusb_hotplug_register_callback(
22	context_->context(),	22	context_->context(),
23	static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED \|	23	static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED \|
24	@@ -225,6 +230,8 @@	24	@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl(
25	}	25	}
26		26
27	RefreshDevices();	27	RefreshDevices();
Lines 30-36 Link Here
30	#if defined(OS_WIN)	30	#if defined(OS_WIN)
31	DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();	31	DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
32	if (device_monitor) {	32	if (device_monitor) {
33	@@ -234,8 +241,10 @@	33	@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl(
34	}	34	}
35		35
36	UsbServiceImpl::~UsbServiceImpl() {	36	UsbServiceImpl::~UsbServiceImpl() {
Lines 41-47 Link Here
41	for (auto* platform_device : ignored_devices_)	41	for (auto* platform_device : ignored_devices_)
42	libusb_unref_device(platform_device);	42	libusb_unref_device(platform_device);
43	}	43	}
44	@@ -477,6 +486,7 @@	44	@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped
45	device->OnDisconnect();	45	device->OnDisconnect();
46	}	46	}
47		47
Lines 49-55 Link Here
49	// static	49	// static
50	int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,	50	int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
51	PlatformUsbDevice device,	51	PlatformUsbDevice device,
52	@@ -514,6 +524,7 @@	52	@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
53		53
54	return 0;	54	return 0;
55	}	55	}

Lines 1-4 Link Here

(-)www/chromium/files/patch-device_usb_usb__service__impl.h (-3 / +3 lines)
1	--- device/usb/usb_service_impl.h.orig 2016-05-11 19:02:22 UTC	1	--- device/usb/usb_service_impl.h.orig 2016-12-09 05:04:19 UTC
2	+++ device/usb/usb_service_impl.h	2	+++ device/usb/usb_service_impl.h
3	@@ -15,7 +15,13 @@	3	@@ -15,7 +15,13 @@
4	#include "build/build_config.h"	4	#include "build/build_config.h"
Lines 14-20 Link Here
14		14
15	#if defined(OS_WIN)	15	#if defined(OS_WIN)
16	#include "base/scoped_observer.h"	16	#include "base/scoped_observer.h"
17	@@ -71,11 +77,13 @@ class UsbServiceImpl :	17	@@ -70,11 +76,13 @@ class UsbServiceImpl :
18	scoped_refptr<UsbDeviceImpl> device);	18	scoped_refptr<UsbDeviceImpl> device);
19	void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);	19	void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
20		20
Lines 28-34 Link Here
28	// These functions release a reference to the provided platform device.	28	// These functions release a reference to the provided platform device.
29	void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);	29	void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
30	void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);	30	void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
31	@@ -88,7 +96,9 @@ class UsbServiceImpl :	31	@@ -90,7 +98,9 @@ class UsbServiceImpl :
32	// connected instead of only when a full enumeration is requested.	32	// connected instead of only when a full enumeration is requested.
33	// TODO(reillyg): Support this on all platforms. crbug.com/411715	33	// TODO(reillyg): Support this on all platforms. crbug.com/411715
34	bool hotplug_enabled_ = false;	34	bool hotplug_enabled_ = false;