svn commit: r412135 - in head/www/chromium: . files
Christoph Moench-Tegeder
cmt at FreeBSD.org
Tue Mar 29 20:36:30 UTC 2016
Author: cmt
Date: Tue Mar 29 20:36:24 2016
New Revision: 412135
URL: https://svnweb.freebsd.org/changeset/ports/412135
Log:
Update chromium to 49.0.2623.110
Approved by: miwi (mentor), rene (mentor)
MFH: 2016Q1
Security: 5c288f68-c7ca-4c0d-b7dc-1ec6295200b3
Security: f85fa236-e2a6-412e-b5c7-c42120892de5
Security: 8be8ca39-ae70-4422-bf1a-d8fae6911c5e
Added:
head/www/chromium/files/patch-base__move.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__download__download_query.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc (contents, props changed)
head/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc (contents, props changed)
head/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc (contents, props changed)
head/www/chromium/files/patch-components__dom_distiller__core__page_features.cc (contents, props changed)
head/www/chromium/files/patch-components__drive__drive_api_util.cc (contents, props changed)
head/www/chromium/files/patch-components__feedback__anonymizer_tool.cc (contents, props changed)
head/www/chromium/files/patch-components__flags_ui__flags_state.cc (contents, props changed)
head/www/chromium/files/patch-components__json_schema__json_schema_validator.cc (contents, props changed)
head/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc (contents, props changed)
head/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc (contents, props changed)
head/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc (contents, props changed)
head/www/chromium/files/patch-components__policy__core__common__schema.cc (contents, props changed)
head/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc (contents, props changed)
head/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc (contents, props changed)
head/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc (contents, props changed)
head/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc (contents, props changed)
head/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc (contents, props changed)
head/www/chromium/files/patch-extensions__common__image_util.cc (contents, props changed)
head/www/chromium/files/patch-extensions__common__stack_frame.cc (contents, props changed)
head/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc (contents, props changed)
head/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc (contents, props changed)
head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__receiver.cc (contents, props changed)
head/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.h (contents, props changed)
head/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.h (contents, props changed)
Deleted:
head/www/chromium/files/patch-base__allocator__allocator_extension.cc
head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd
head/www/chromium/files/patch-chrome__browser__about_flags.cc
head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc
head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc
head/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc
head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h
head/www/chromium/files/patch-net__base__net_util.h
head/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c
head/www/chromium/files/patch-third_party__skia__src__core__SkVarAlloc.cpp
head/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp
head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
head/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.cc
head/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.cc
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
head/www/chromium/files/patch-base__strings__safe_sprintf.cc
head/www/chromium/files/patch-base__sys_info_freebsd.cc
head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
head/www/chromium/files/patch-build__common.gypi
head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc (contents, props changed)
head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc (contents, props changed)
head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
head/www/chromium/files/patch-content__browser__browser_main_loop.cc
head/www/chromium/files/patch-content__browser__child_process_launcher.cc
head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc (contents, props changed)
head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc (contents, props changed)
head/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc (contents, props changed)
head/www/chromium/files/patch-gpu__config__gpu_control_list.cc
head/www/chromium/files/patch-gpu__config__gpu_info_collector.cc (contents, props changed)
head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
head/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
head/www/chromium/files/patch-media__formats__common__offset_byte_queue.h (contents, props changed)
head/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
head/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc (contents, props changed)
head/www/chromium/files/patch-net__base__address_tracker_linux.h
head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
head/www/chromium/files/patch-net__socket__socks5_client_socket.cc
head/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
head/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp
head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni
head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi (contents, props changed)
head/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
head/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc (contents, props changed)
head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/Makefile Tue Mar 29 20:36:24 2016 (r412135)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 48.0.2564.116
-PORTREVISION= 1
+PORTVERSION= 49.0.2623.110
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
@@ -57,7 +56,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l
xdg-open:${PORTSDIR}/devel/xdg-utils
ONLY_FOR_ARCHS= i386 amd64
-USES= bison compiler:c++11-lib cpe desktop-file-utils execinfo jpeg \
+USES= bison compiler:c++14-lang cpe desktop-file-utils execinfo jpeg \
ninja perl5 pkgconfig python:2,build shebangfix tar:xz
CPE_VENDOR= google
CPE_PRODUCT= chrome
@@ -206,7 +205,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-
CFLAGS+= -fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
.else
GYP_DEFINES+= clang=1
-CFLAGS+= -Wno-unknown-warning-option
+CFLAGS+= -Wno-unknown-warning-option \
+ -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 # work around base r261801
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
CONFIGURE_ENV+= AR=/usr/bin/ar
.endif
@@ -339,6 +339,7 @@ pre-configure:
'third_party/webdriver' \
'third_party/webrtc' \
'third_party/widevine' \
+ 'third_party/woff2' \
'third_party/x86inc' \
'third_party/yasm' \
'third_party/zlib' \
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/distinfo Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,4 +1,4 @@
-SHA256 (chromium-48.0.2564.116.tar.xz) = 6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f
-SIZE (chromium-48.0.2564.116.tar.xz) = 432321192
-SHA256 (chromium-48.0.2564.116-testdata.tar.xz) = 3cc8a9cf3f01321b22d31d37b99372aca027a1bcbe160b5d5dc7197159ebd35d
-SIZE (chromium-48.0.2564.116-testdata.tar.xz) = 117230276
+SHA256 (chromium-49.0.2623.110.tar.xz) = 41840925d3769555ce4ebd780ee0dc6789ffae27b1684006c9b543bcaa35bbd2
+SIZE (chromium-49.0.2623.110.tar.xz) = 520407796
+SHA256 (chromium-49.0.2623.110-testdata.tar.xz) = 5a3d3a920a780caa685e6667a41489a756f3847095bcaf202b9d0b1bec566328
+SIZE (chromium-49.0.2623.110-testdata.tar.xz) = 117576612
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/extra-patch-clang Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,29 +1,3 @@
---- base/allocator/allocator_extension.cc 2015-04-15 00:18:47.000000000 +0200
-+++ base/allocator/allocator_extension.cc 2015-04-18 21:44:25.000000000 +0200
-@@ -35,20 +35,20 @@
- void SetGetAllocatorWasteSizeFunction(
- thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) {
- DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(),
-- reinterpret_cast<thunks::GetAllocatorWasteSizeFunction>(NULL));
-+ static_cast<thunks::GetAllocatorWasteSizeFunction>(NULL));
- thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function);
- }
-
- void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) {
- DCHECK_EQ(thunks::GetGetStatsFunction(),
-- reinterpret_cast<thunks::GetStatsFunction>(NULL));
-+ static_cast<thunks::GetStatsFunction>(NULL));
- thunks::SetGetStatsFunction(get_stats_function);
- }
-
- void SetReleaseFreeMemoryFunction(
- thunks::ReleaseFreeMemoryFunction release_free_memory_function) {
- DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(),
-- reinterpret_cast<thunks::ReleaseFreeMemoryFunction>(NULL));
-+ static_cast<thunks::ReleaseFreeMemoryFunction>(NULL));
- thunks::SetReleaseFreeMemoryFunction(release_free_memory_function);
- }
-
--- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200
+++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200
@@ -729,12 +729,14 @@
@@ -77,24 +51,6 @@
}
// Helper function to verify the most common test expectations.
-@@ -240,7 +240,7 @@
- ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
-
- scoped_ptr<DeathData> data(new DeathData());
-- ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
-+ ASSERT_NE(data, static_cast<DeathData*>(NULL));
- EXPECT_EQ(data->run_duration_sum(), 0);
- EXPECT_EQ(data->run_duration_max(), 0);
- EXPECT_EQ(data->run_duration_sample(), 0);
-@@ -279,7 +279,7 @@
- ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
-
- scoped_ptr<DeathData> data(new DeathData());
-- ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
-+ ASSERT_NE(data, static_cast<DeathData*>(NULL));
-
- int32 run_ms = 42;
- int32 queue_ms = 8;
--- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100
+++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100
@@ -286,7 +286,7 @@
Added: head/www/chromium/files/patch-base__move.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__move.h Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,11 @@
+--- base/move.h.orig 2016-03-05 17:46:48.797428036 +0100
++++ base/move.h 2016-03-05 17:47:02.108427026 +0100
+@@ -31,7 +31,7 @@
+ // for more details.
+ // TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN
+ // everywhere instead.
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)) && !defined(OS_BSD)
+ #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \
+ private: \
+ type(const type&) = delete; \
Modified: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,11 +1,13 @@
---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/posix/unix_domain_socket_linux_unittest.cc
-@@ -2,8 +2,13 @@
+--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2016-03-02 22:40:17.347033545 +0100
++++ base/posix/unix_domain_socket_linux_unittest.cc 2016-03-02 22:40:44.347072090 +0100
+@@ -2,10 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "build/build_config.h"
+
+ #include <stddef.h>
+ #include <stdint.h>
#include <sys/socket.h>
#include <sys/types.h>
+#if defined(OS_BSD)
Modified: head/www/chromium/files/patch-base__strings__safe_sprintf.cc
==============================================================================
--- head/www/chromium/files/patch-base__strings__safe_sprintf.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-base__strings__safe_sprintf.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,26 +1,16 @@
---- base/strings/safe_sprintf.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/strings/safe_sprintf.cc
-@@ -107,15 +107,16 @@
- : buffer_(buffer),
- size_(size - 1), // Account for trailing NUL byte
+--- base/strings/safe_sprintf.cc.orig 2016-03-02 22:57:14.510959331 +0100
++++ base/strings/safe_sprintf.cc 2016-03-02 23:00:42.911944805 +0100
+@@ -115,8 +115,11 @@
count_(0) {
--// The following assertion does not build on Mac and Android. This is because
--// static_assert only works with compile-time constants, but mac uses
--// libstdc++4.2 and android uses stlport, which both don't mark
--// numeric_limits::max() as constexp. Likewise, MSVS2013's standard library
--// also doesn't mark max() as constexpr yet. cl.exe supports static_cast but
--// doesn't really implement constexpr yet so it doesn't complain, but clang
-+// The following assertion does not build on Mac and Android and older FreeBSD.
-+// This is because static_assert only works with compile-time constants, but
-+// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both
-+// don't mark numeric_limits::max() as constexp. Likewise, MSVS2013's standard
-+// library also doesn't mark max() as constexpr yet. cl.exe supports static_cast
-+// but doesn't really implement constexpr yet so it doesn't complain, but clang
- // does.
- #if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \
-- !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN))
-+ !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) \
-+ && !(defined(__clang__) && defined(OS_WIN))
- COMPILE_ASSERT(kSSizeMaxConst == \
- static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
- kSSizeMax_is_the_max_value_of_an_ssize_t);
+ // MSVS2013's standard library doesn't mark max() as constexpr yet. cl.exe
+ // supports static_cast but doesn't really implement constexpr yet so it doesn't
+-// complain, but clang does.
+-#if __cplusplus >= 201103 && !(defined(__clang__) && defined(OS_WIN))
++// complain, but clang does. Older FreeBSD (<10) use libstdc++4.2, which
++// doesn't mark numeric_limits::max() as constexp.
++#if __cplusplus >= 201103 && \
++ !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) && \
++ !(defined(__clang__) && defined(OS_WIN))
+ static_assert(kSSizeMaxConst ==
+ static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
+ "kSSizeMaxConst should be the max value of an ssize_t");
Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base__sys_info_freebsd.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,35 +1,46 @@
---- base/sys_info_freebsd.cc.orig 2015-07-15 16:29:55.000000000 -0400
-+++ base/sys_info_freebsd.cc 2015-07-21 20:50:15.595303000 -0400
-@@ -4,6 +4,7 @@
+--- base/sys_info_freebsd.cc.orig_orig 2016-03-20 18:19:10.466074029 +0100
++++ base/sys_info_freebsd.cc 2016-03-20 18:22:51.449059006 +0100
+@@ -12,12 +12,34 @@
- #include "base/sys_info.h"
+ namespace base {
-+#include <sys/types.h>
- #include <sys/sysctl.h>
-
- #include "base/logging.h"
-@@ -23,6 +24,19 @@
- }
-
- // static
-+int64 SysInfo::AmountOfAvailablePhysicalMemory() {
-+ int available_pages, page_size;
-+ size_t size = sizeof(available_pages);
-+ sysctlbyname("vm.stats.vm.v_free_count", &available_pages, &size, NULL, 0);
-+ sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+ if (available_pages == -1 || page_size == -1) {
++int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
++ int page_size, r = 0;
++ unsigned pgfree, pginact, pgcache;
++ size_t size = sizeof(page_size);
++ size_t szpg = sizeof(pgfree);
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
++ if (r == -1) {
+ NOTREACHED();
+ return 0;
+ }
-+ return static_cast<int64>(available_pages) * page_size;
++ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
+}
+
-+// static
- uint64 SysInfo::MaxSharedMemorySize() {
- size_t limit;
- size_t size = sizeof(limit);
-@@ -33,4 +47,25 @@
- return static_cast<uint64>(limit);
+ int64_t SysInfo::AmountOfPhysicalMemory() {
+- int pages, page_size;
++ int pages, page_size, r = 0;
+ size_t size = sizeof(pages);
+- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
+- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+- if (pages == -1 || page_size == -1) {
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
++ if(r == 0)
++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++ if (r == -1) {
+ NOTREACHED();
+ return 0;
+ }
+@@ -35,4 +57,25 @@
+ return static_cast<uint64_t>(limit);
}
+// static
Modified: head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
==============================================================================
--- head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,11 +1,11 @@
---- base/trace_event/process_memory_dump.cc.orig 2016-01-21 17:38:36.214712498 +0100
-+++ base/trace_event/process_memory_dump.cc 2016-01-21 17:38:51.814711855 +0100
+--- base/trace_event/process_memory_dump.cc.orig 2016-03-05 15:21:43.755196423 +0100
++++ base/trace_event/process_memory_dump.cc 2016-03-05 15:22:37.112362644 +0100
@@ -66,7 +66,7 @@
int error_counter = 0;
// HANDLE_EINTR tries for 100 times. So following the same pattern.
do {
-- result = mincore(chunk_start, chunk_size, vector_as_array(&vec));
-+ result = mincore(chunk_start, chunk_size, (char *) vector_as_array(&vec));
+- result = mincore(chunk_start, chunk_size, vec.data());
++ result = mincore(chunk_start, chunk_size, (char *) vec.data());
} while (result == -1 && errno == EAGAIN && error_counter++ < 100);
if (result)
break;
Modified: head/www/chromium/files/patch-build__common.gypi
==============================================================================
--- head/www/chromium/files/patch-build__common.gypi Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-build__common.gypi Tue Mar 29 20:36:24 2016 (r412135)
@@ -31,13 +31,13 @@
'use_dbus%': 1,
}, {
'use_dbus%': 0,
-@@ -997,7 +1003,7 @@
+@@ -1011,7 +1011,7 @@
}, {
'use_openmax_dl_fft%': 0,
}],
- ['OS=="win" or OS=="linux"', {
+ ['OS=="win" or OS=="linux" or OS=="freebsd"', {
- 'enable_mdns%' : 1,
+ 'enable_mdns%' : 1,
}],
@@ -1263,6 +1269,10 @@
Added: head/www/chromium/files/patch-chrome__browser__download__download_query.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_query.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- chrome/browser/download/download_query.cc.orig 2016-03-05 21:04:25.551612729 +0100
++++ chrome/browser/download/download_query.cc 2016-03-05 21:05:14.895785377 +0100
+@@ -31,7 +31,11 @@
+ #include "components/url_formatter/url_formatter.h"
+ #include "content/public/browser/content_browser_client.h"
+ #include "content/public/browser/download_item.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+
+ using content::DownloadDangerType;
Added: head/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-03-05 21:02:01.319620815 +0100
++++ chrome/browser/extensions/activity_log/activity_log.cc 2016-03-05 21:02:58.927616965 +0100
+@@ -39,7 +39,11 @@
+ #include "extensions/browser/extensions_browser_client.h"
+ #include "extensions/common/extension.h"
+ #include "extensions/common/one_shot_event.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+
+ namespace constants = activity_log_constants;
Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,5 +1,5 @@
---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-10 08:54:10 UTC
-+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
+--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-03-04 21:17:01.250966286 +0100
++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2016-03-04 21:17:09.082965156 +0100
@@ -4,6 +4,10 @@
#include "chrome/browser/extensions/api/music_manager_private/device_id.h"
@@ -8,9 +8,9 @@
+#include <sys/types.h>
+#include <net/if_dl.h>
+#endif
- #include <sys/socket.h> // Must be included before ifaddrs.h.
#include <ifaddrs.h>
#include <net/if.h>
+ #include <stddef.h>
@@ -102,11 +106,33 @@
const char* prefixes[],
size_t prefixes_count) {
Added: head/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2016-03-05 21:11:05.017583997 +0100
++++ chrome/browser/password_manager/chrome_password_manager_client.cc 2016-03-05 21:11:24.785751124 +0100
+@@ -55,7 +55,11 @@
+ #include "content/public/browser/web_contents.h"
+ #include "google_apis/gaia/gaia_urls.h"
+ #include "net/base/url_util.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
+ #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
Added: head/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,16 @@
+--- chrome/browser/search/local_files_ntp_source.cc.orig 2016-03-05 21:06:47.216601080 +0100
++++ chrome/browser/search/local_files_ntp_source.cc 2016-03-05 21:07:16.040598823 +0100
+@@ -19,8 +19,13 @@
+ #include "chrome/common/url_constants.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/url_data_source.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#include <re2/stringpiece.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
+ #include "third_party/re2/src/re2/stringpiece.h"
++#endif
+
+ namespace {
+
Added: head/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,11 @@
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2016-03-04 21:50:06.513829549 +0100
++++ chrome/browser/sync/chrome_sync_client.cc 2016-03-04 21:50:19.352828601 +0100
+@@ -572,7 +572,7 @@
+ }
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Dictionary sync is enabled by default.
+ if (!disabled_types.Has(syncer::DICTIONARY)) {
+ sync_service->RegisterDataTypeController(new UIDataTypeController(
Modified: head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -18,10 +18,10 @@
// 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.
-@@ -1799,7 +1799,7 @@
- attached_tabstrip_->GetWidget()->GetNativeWindow();
- if (exclude_dragged_view && dragged_window)
- exclude.insert(dragged_window);
+@@ -1806,7 +1806,7 @@
+ if (dragged_window)
+ exclude.insert(dragged_window);
+ }
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// Exclude windows which are pending deletion via Browser::TabStripEmpty().
Added: head/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-03-05 21:09:24.961590217 +0100
++++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc 2016-03-05 21:09:41.001588829 +0100
+@@ -25,7 +25,11 @@
+ #include "extensions/common/constants.h"
+ #include "extensions/common/extension.h"
+ #include "extensions/common/manifest_constants.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "ui/base/l10n/l10n_util.h"
+
+ namespace extensions {
Added: head/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2016-03-05 21:26:25.526530088 +0100
++++ components/autofill/content/renderer/password_form_conversion_utils.cc 2016-03-05 21:26:38.502521878 +0100
+@@ -26,7 +26,11 @@
+ #include "third_party/WebKit/public/web/WebFormControlElement.h"
+ #include "third_party/WebKit/public/web/WebFrame.h"
+ #include "third_party/WebKit/public/web/WebInputElement.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ using blink::WebDocument;
+ using blink::WebFormControlElement;
Added: head/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/autofill/core/browser/form_structure.cc.orig 2016-03-05 21:25:19.742524141 +0100
++++ components/autofill/core/browser/form_structure.cc 2016-03-05 21:25:31.566523885 +0100
+@@ -35,7 +35,11 @@
+ #include "components/rappor/rappor_service.h"
+ #include "components/rappor/rappor_utils.h"
+ #include "third_party/libxml/chromium/libxml_utils.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace autofill {
+ namespace {
Added: head/www/chromium/files/patch-components__dom_distiller__core__page_features.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__dom_distiller__core__page_features.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/dom_distiller/core/page_features.cc.orig 2016-03-05 21:23:13.237533214 +0100
++++ components/dom_distiller/core/page_features.cc 2016-03-05 21:23:28.813592348 +0100
+@@ -9,7 +9,11 @@
+ #include <string>
+
+ #include "base/json/json_reader.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+
+ namespace dom_distiller {
Added: head/www/chromium/files/patch-components__drive__drive_api_util.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__drive__drive_api_util.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/drive/drive_api_util.cc.orig 2016-03-05 21:22:18.245536848 +0100
++++ components/drive/drive_api_util.cc 2016-03-05 21:22:28.781536000 +0100
+@@ -22,7 +22,11 @@
+ #include "google_apis/drive/drive_api_parser.h"
+ #include "net/base/escape.h"
+ #include "net/base/net_errors.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+
+ namespace drive {
Added: head/www/chromium/files/patch-components__feedback__anonymizer_tool.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__feedback__anonymizer_tool.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/feedback/anonymizer_tool.cc.orig 2016-03-05 21:12:40.810576880 +0100
++++ components/feedback/anonymizer_tool.cc 2016-03-05 21:12:56.522575394 +0100
+@@ -9,7 +9,11 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/strings/stringprintf.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ using re2::RE2;
+
Added: head/www/chromium/files/patch-components__flags_ui__flags_state.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__flags_ui__flags_state.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,11 @@
+--- components/flags_ui/flags_state.cc.orig 2016-03-04 21:01:15.539156962 +0100
++++ components/flags_ui/flags_state.cc 2016-03-04 21:00:48.239033063 +0100
+@@ -450,7 +450,7 @@
+ return kOsWin;
+ #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
+ return kOsCrOS;
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
+ return kOsLinux;
+ #elif defined(OS_ANDROID)
+ return kOsAndroid;
Added: head/www/chromium/files/patch-components__json_schema__json_schema_validator.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__json_schema__json_schema_validator.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/json_schema/json_schema_validator.cc.orig 2016-03-05 17:55:58.871393896 +0100
++++ components/json_schema/json_schema_validator.cc 2016-03-05 17:56:49.927387504 +0100
+@@ -20,7 +20,11 @@
+ #include "base/strings/stringprintf.h"
+ #include "base/values.h"
+ #include "components/json_schema/json_schema_constants.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace schema = json_schema_constants;
+
Added: head/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-03-05 21:17:52.372555224 +0100
++++ components/keyed_service/core/dependency_graph_unittest.cc 2016-03-05 21:18:04.371555206 +0100
+@@ -9,7 +9,11 @@
+ #include "components/keyed_service/core/dependency_graph.h"
+ #include "components/keyed_service/core/dependency_node.h"
+ #include "testing/gtest/include/gtest/gtest.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace {
+
Added: head/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-03-05 21:24:14.054528874 +0100
++++ components/password_manager/core/browser/import/csv_reader.cc 2016-03-05 21:24:28.997912844 +0100
+@@ -9,7 +9,11 @@
+ #include "base/logging.h"
+ #include "base/macros.h"
+ #include "base/strings/string_util.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace {
+
Added: head/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/plugins/renderer/plugin_placeholder.cc.orig 2016-03-05 21:19:00.436550513 +0100
++++ components/plugins/renderer/plugin_placeholder.cc 2016-03-05 21:20:14.436562091 +0100
+@@ -11,7 +11,11 @@
+ #include "gin/object_template_builder.h"
+ #include "third_party/WebKit/public/web/WebElement.h"
+ #include "third_party/WebKit/public/web/WebPluginContainer.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace plugins {
+
Added: head/www/chromium/files/patch-components__policy__core__common__schema.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__policy__core__common__schema.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/policy/core/common/schema.cc.orig 2016-03-05 19:30:39.179235992 +0100
++++ components/policy/core/common/schema.cc 2016-03-05 19:31:28.596994984 +0100
+@@ -21,7 +21,11 @@
+ #include "components/json_schema/json_schema_constants.h"
+ #include "components/json_schema/json_schema_validator.h"
+ #include "components/policy/core/common/schema_internal.h"
++#if defined(OS_FREEBSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace schema = json_schema_constants;
+
Modified: head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,6 +1,6 @@
--- components/storage_monitor/storage_monitor_freebsd.cc.orig 1970-01-01 01:00:00.000000000 +0100
+++ components/storage_monitor/storage_monitor_freebsd.cc 2015-04-19 19:38:05.000000000 +0200
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,101 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -13,7 +13,6 @@
+
+#include <list>
+
-+#include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/metrics/histogram.h"
+#include "base/process/kill.h"
@@ -64,7 +63,7 @@
+ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
+ &exit_code)) {
+ process.Terminate(-1, false);
-+ base::EnsureProcessTerminated(process.Pass());
++ base::EnsureProcessTerminated(std::move(process));
+ return StorageMonitor::EJECT_FAILURE;
+ }
+
Modified: head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
==============================================================================
--- head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,6 +1,6 @@
--- components/storage_monitor/storage_monitor_freebsd.h.orig 2015-01-24 17:14:44 UTC
+++ components/storage_monitor/storage_monitor_freebsd.h
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,46 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -17,7 +17,6 @@
+#include <map>
+#include <string>
+
-+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
+#include "base/files/file_path_watcher.h"
Added: head/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,16 @@
+--- components/url_matcher/regex_set_matcher.cc.orig 2016-03-05 21:14:47.451567783 +0100
++++ components/url_matcher/regex_set_matcher.cc 2016-03-05 21:15:45.419563760 +0100
+@@ -10,8 +10,13 @@
+ #include "base/stl_util.h"
+ #include "base/strings/string_util.h"
+ #include "components/url_matcher/substring_set_matcher.h"
++#if defined(OS_BSD)
++#include <re2/filtered_re2.h>
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/filtered_re2.h"
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace url_matcher {
+
Added: head/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/url_matcher/url_matcher_factory.cc.orig 2016-03-05 21:16:31.699560757 +0100
++++ components/url_matcher/url_matcher_factory.cc 2016-03-05 21:16:54.155559498 +0100
+@@ -15,7 +15,11 @@
+ #include "base/values.h"
+ #include "components/url_matcher/url_matcher_constants.h"
+ #include "components/url_matcher/url_matcher_helpers.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace url_matcher {
+
Added: head/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- components/webcrypto/algorithms/test_helpers.cc.orig 2016-03-05 21:20:58.677542744 +0100
++++ components/webcrypto/algorithms/test_helpers.cc 2016-03-05 21:21:13.733542071 +0100
+@@ -26,7 +26,11 @@
+ #include "components/webcrypto/status.h"
+ #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
+ #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace webcrypto {
+
Modified: head/www/chromium/files/patch-content__browser__browser_main_loop.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__browser_main_loop.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-content__browser__browser_main_loop.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -18,15 +18,3 @@
// No thread should be created before this call, as SetupSandbox()
// will end-up using fork().
SetupSandbox(parsed_command_line_);
-@@ -808,9 +808,9 @@
- }
- #endif
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- ZygoteHostImpl::GetInstance()->TearDownAfterLastChild();
--#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-
- // The device monitors are using |system_monitor_| as dependency, so delete
- // them before |system_monitor_| goes away.
Modified: head/www/chromium/files/patch-content__browser__child_process_launcher.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__child_process_launcher.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher.cc.orig 2015-09-01 16:10:42.000000000 -0400
-+++ content/browser/child_process_launcher.cc 2015-09-03 10:33:53.388547000 -0400
-@@ -114,7 +114,11 @@
+--- content/browser/child_process_launcher.cc.orig 2016-03-04 22:27:56.807672733 +0100
++++ content/browser/child_process_launcher.cc 2016-03-04 22:34:35.624645928 +0100
+@@ -116,7 +116,11 @@
base::EnvironmentMap env = delegate->GetEnvironment();
base::ScopedFD ipcfd = delegate->TakeIpcFd();
#elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ -12,7 +12,7 @@
base::EnvironmentMap env = delegate->GetEnvironment();
base::ScopedFD ipcfd = delegate->TakeIpcFd();
#endif
-@@ -143,7 +147,7 @@
+@@ -145,7 +149,7 @@
#endif
#endif
@@ -21,7 +21,7 @@
std::map<int, base::MemoryMappedFile::Region> regions;
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get()
-@@ -176,7 +180,7 @@
+@@ -178,7 +182,7 @@
}
}
#endif // defined(V8_USE_EXTERNAL_STARTUP_DATA)
@@ -30,7 +30,7 @@
#if defined(OS_ANDROID)
files_to_register->Share(
-@@ -196,21 +200,21 @@
+@@ -198,21 +202,21 @@
// We need to close the client end of the IPC channel to reliably detect
// child termination.
@@ -38,7 +38,7 @@
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
if (use_zygote) {
base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
- cmd_line->argv(), files_to_register.Pass(), process_type);
+ cmd_line->argv(), std::move(files_to_register), process_type);
process = base::Process(handle);
} else
// Fall through to the normal posix case below when we're not zygoting.
@@ -55,7 +55,7 @@
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -218,7 +222,7 @@
+@@ -220,7 +224,7 @@
sandbox_fd,
GetSandboxFD()));
}
@@ -64,7 +64,7 @@
// Actually launch the app.
base::LaunchOptions options;
-@@ -294,13 +298,13 @@
+@@ -296,13 +300,13 @@
process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
@@ -76,11 +76,11 @@
ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle());
} else
-#endif // !OS_MACOSX
-+#endif // !OS_MACOSX && !OS_BSD
- base::EnsureProcessTerminated(process.Pass());
++#endif // !OS_MACOSX && !defined(OS_BSD)
+ base::EnsureProcessTerminated(std::move(process));
#endif // OS_POSIX
#endif // defined(OS_ANDROID)
-@@ -399,7 +403,7 @@
+@@ -398,7 +402,7 @@
void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
DCHECK(CalledOnValidThread());
@@ -89,7 +89,7 @@
if (zygote_) {
termination_status_ = ZygoteHostImpl::GetInstance()->
GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -407,7 +411,7 @@
+@@ -406,7 +410,7 @@
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
} else {
@@ -98,9 +98,9 @@
if (known_dead) {
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
-@@ -481,7 +485,7 @@
+@@ -469,7 +473,7 @@
starting_ = false;
- process_ = process.Pass();
+ process_ = std::move(process);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
Modified: head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,10 +1,11 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2015-05-13 18:35:46.000000000 -0400
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc 2015-05-20 11:59:04.537631000 -0400
-@@ -471,7 +471,9 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-03-04 22:36:56.082636647 +0100
++++ content/browser/gpu/gpu_data_manager_impl_private.cc 2016-03-04 22:37:11.778635557 +0100
+@@ -483,8 +483,10 @@
gpu_info.gl_renderer = gl_renderer;
gpu_info.gl_version = gl_version;
+#if !defined(OS_FREEBSD)
+ gpu::IdentifyActiveGPU(&gpu_info);
gpu::CollectDriverInfoGL(&gpu_info);
+#endif
Modified: head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,9 +1,9 @@
---- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-10-10 09:15:31 UTC
-+++ content/browser/indexed_db/indexed_db_backing_store.cc
-@@ -2377,7 +2377,7 @@
+--- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2016-03-04 22:40:11.786622515 +0100
++++ content/browser/indexed_db/indexed_db_backing_store.cc 2016-03-04 22:40:23.035622110 +0100
+@@ -2455,7 +2455,7 @@
// The round-trip can be lossy; round to nearest millisecond.
- int64 delta = (descriptor.last_modified() -
- info.last_modified).InMilliseconds();
+ int64_t delta =
+ (descriptor.last_modified() - info.last_modified).InMilliseconds();
- if (std::abs(delta) > 1)
+ if (std::labs(delta) > 1)
return false;
Modified: head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc
==============================================================================
--- head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,16 +1,16 @@
---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2015-04-19 22:52:03.000000000 +0200
-+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc 2015-04-19 23:27:21.000000000 +0200
-@@ -6,7 +6,9 @@
-
+--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2016-03-04 22:42:42.203612627 +0100
++++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc 2016-03-04 22:43:36.442729525 +0100
+@@ -7,7 +7,9 @@
#include <errno.h>
#include <signal.h>
+ #include <stddef.h>
+#if 0 // no OS_FREEBSD here?
#include <sys/prctl.h>
+#endif
#include <unistd.h>
#include "base/command_line.h"
-@@ -68,12 +70,16 @@
+@@ -69,12 +71,16 @@
return true;
}
Added: head/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2016-03-05 21:30:23.744503770 +0100
++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2016-03-05 21:30:38.440502352 +0100
+@@ -28,7 +28,11 @@
+ #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+ #include "net/http/http_util.h"
+ #include "net/url_request/url_request.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ using content::ResourceRequestInfo;
+
Modified: head/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
==============================================================================
--- head/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc Tue Mar 29 20:12:49 2016 (r412134)
+++ head/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -1,16 +1,12 @@
---- extensions/browser/api/serial/serial_api.cc.orig 2014-10-10 08:54:15 UTC
-+++ extensions/browser/api/serial/serial_api.cc
-@@ -85,11 +85,13 @@
- void SerialGetDevicesFunction::Work() {
+--- extensions/browser/api/serial/serial_api.cc.orig 2016-03-04 22:52:57.757575528 +0100
++++ extensions/browser/api/serial/serial_api.cc 2016-03-04 22:52:30.452574585 +0100
+@@ -87,7 +87,8 @@
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-+#if !defined(OS_FREEBSD) //XXX(rene) quick hack
+ // TODO(moshayedi): crbug.com/549257. Add USB support for Aura on Android.
+-#if !defined(OS_ANDROID)
++// XXX also, rene's quick hack on FreeBSD
++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
scoped_ptr<device::SerialDeviceEnumerator> enumerator =
device::SerialDeviceEnumerator::Create();
mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
- results_ = serial::GetDevices::Results::Create(
- devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
-+#endif
- }
-
- SerialConnectFunction::SerialConnectFunction() {
Added: head/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-03-05 21:31:37.080498500 +0100
++++ extensions/browser/api/web_request/form_data_parser.cc 2016-03-05 21:31:50.448497605 +0100
+@@ -15,7 +15,11 @@
+ #include "base/values.h"
+ #include "net/base/escape.h"
+ #include "net/url_request/url_request.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ using base::DictionaryValue;
+ using base::ListValue;
Added: head/www/chromium/files/patch-extensions__common__image_util.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-extensions__common__image_util.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- extensions/common/image_util.cc.orig 2016-03-05 21:28:20.783511398 +0100
++++ extensions/common/image_util.cc 2016-03-05 21:28:33.615510847 +0100
+@@ -11,7 +11,11 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/strings/stringprintf.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/gfx/color_utils.h"
+
Added: head/www/chromium/files/patch-extensions__common__stack_frame.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-extensions__common__stack_frame.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- extensions/common/stack_frame.cc.orig 2016-03-05 21:29:12.679508172 +0100
++++ extensions/common/stack_frame.cc 2016-03-05 21:29:26.039507364 +0100
+@@ -7,7 +7,11 @@
+ #include <string>
+
+ #include "base/strings/utf_string_conversions.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+
+ namespace extensions {
+
Added: head/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc Tue Mar 29 20:36:24 2016 (r412135)
@@ -0,0 +1,14 @@
+--- gpu/command_buffer/service/program_manager.cc.orig 2016-03-05 21:34:10.137487636 +0100
++++ gpu/command_buffer/service/program_manager.cc 2016-03-05 21:35:00.089484564 +0100
+@@ -29,7 +29,11 @@
+ #include "gpu/command_buffer/service/gpu_switches.h"
+ #include "gpu/command_buffer/service/program_cache.h"
+ #include "gpu/command_buffer/service/shader_manager.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list