svn commit: r493750 - in head/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Sun Feb 24 10:52:57 UTC 2019
Author: rene
Date: Sun Feb 24 10:52:51 2019
New Revision: 493750
URL: https://svnweb.freebsd.org/changeset/ports/493750
Log:
www/chromium: update to 72.0.3626.119 [1]
PR: 234773
Submitted by: cpm [1], Matthias Wolf [1]
Obtained from: https://github.com/cpu82/freebsd-chromium.git
MFH: 2019Q1
Added:
head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc (contents, props changed)
head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h (contents, props changed)
head/www/chromium/files/patch-base_process_process__linux.cc (contents, props changed)
head/www/chromium/files/patch-base_system_sys__info__freebsd.cc (contents, props changed)
head/www/chromium/files/patch-base_system_sys__info__posix.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_browser__process__impl.h (contents, props changed)
head/www/chromium/files/patch-chrome_browser_download_download__item__model.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_signin_signin__util.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h (contents, props changed)
head/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc (contents, props changed)
head/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (contents, props changed)
head/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc (contents, props changed)
head/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc (contents, props changed)
head/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h (contents, props changed)
head/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc (contents, props changed)
head/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc (contents, props changed)
head/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h (contents, props changed)
head/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc (contents, props changed)
head/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h (contents, props changed)
head/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (contents, props changed)
head/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc (contents, props changed)
head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc (contents, props changed)
head/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc (contents, props changed)
head/www/chromium/files/patch-v8_src_api.cc (contents, props changed)
head/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc (contents, props changed)
head/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h (contents, props changed)
head/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h (contents, props changed)
Deleted:
head/www/chromium/files/patch-base_process_process__info__linux.cc
head/www/chromium/files/patch-base_sys__info__freebsd.cc
head/www/chromium/files/patch-base_sys__info__posix.cc
head/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc
head/www/chromium/files/patch-content_browser_service_worker_service_worker_fetch_dispatcher.cc
head/www/chromium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc
head/www/chromium/files/patch-net_base_network__interfaces__freebsd.cc
head/www/chromium/files/patch-net_base_network__interfaces__freebsd.h
head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc
head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.cpp
head/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h
head/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc
head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
head/www/chromium/files/patch-tools_gn_tools_gn_args.cc
head/www/chromium/files/patch-tools_gn_util_exe__path.cc
head/www/chromium/files/patch-tools_gn_util_semaphore.cc
head/www/chromium/files/patch-tools_gn_util_semaphore.h
head/www/chromium/files/patch-tools_gn_util_ticks.cc
head/www/chromium/files/patch-v8_src_builtins_builtins-iterator-gen.cc
head/www/chromium/files/patch-v8_src_builtins_builtins-string-gen.cc
head/www/chromium/files/patch-v8_src_builtins_builtins-string-gen.h
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/patch-base_BUILD.gn
head/www/chromium/files/patch-base_process_launch__posix.cc
head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
head/www/chromium/files/patch-base_threading_platform__thread__linux.cc
head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
head/www/chromium/files/patch-build_config_BUILD.gn
head/www/chromium/files/patch-build_config_BUILDCONFIG.gn
head/www/chromium/files/patch-build_config_compiler_BUILD.gn
head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
head/www/chromium/files/patch-chrome_app_chromium__strings.grd
head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
head/www/chromium/files/patch-chrome_browser_about__flags.cc
head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
head/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
head/www/chromium/files/patch-chrome_common_chrome__switches.cc
head/www/chromium/files/patch-chrome_common_features.gni
head/www/chromium/files/patch-components_crash_content_app_crashpad.cc
head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc
head/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc
head/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
head/www/chromium/files/patch-components_policy_resources_policy__templates.json
head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
head/www/chromium/files/patch-content_app_content_main_runner_impl.cc
head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
head/www/chromium/files/patch-content_gpu_BUILD.gn
head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
head/www/chromium/files/patch-extensions_common_api__permission_features.json
head/www/chromium/files/patch-extensions_common_image__util.cc
head/www/chromium/files/patch-gpu_config_gpu__control__list.cc
head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h
head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
head/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
head/www/chromium/files/patch-media_audio_audio__manager.cc
head/www/chromium/files/patch-net_BUILD.gn
head/www/chromium/files/patch-net_features.gni
head/www/chromium/files/patch-net_socket_udp__socket__posix.cc
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
head/www/chromium/files/patch-services_network_network__service.h
head/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h
head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp
head/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
head/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
head/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
head/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h
head/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h
head/www/chromium/files/patch-third__party_webrtc_webrtc.gni
head/www/chromium/files/patch-third__party_zlib_arm__features.c
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc
head/www/chromium/files/patch-tools_gn_base_files_file__posix.cc
head/www/chromium/files/patch-tools_gn_build_gen.py
head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
head/www/chromium/files/patch-ui_gfx_font__render__params.h
head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
head/www/chromium/files/patch-v8_BUILD.gn
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/Makefile Sun Feb 24 10:52:51 2019 (r493750)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 71.0.3578.98
-PORTREVISION= 2
+PORTVERSION= 72.0.3626.119
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/cpm/chromium/:fonts
@@ -182,7 +181,6 @@ DEBUG_VARS_OFF= BUILDTYPE=Release \
GN_ARGS+=remove_webcore_debug_symbols=true \
WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
-DRIVER_BUILD_DEPENDS= git:devel/git
DRIVER_MAKE_ARGS= chromedriver
KERBEROS_VARS= GN_ARGS+=use_kerberos=true
@@ -216,6 +214,13 @@ PLIST_SUB+= NOT_AARCH64="@comment "
PLIST_SUB+= NOT_AARCH64=""
.endif
+# Make better javascript with java
+.if ${ARCH} == amd64 && !defined(GN_ONLY)
+JAVA_BUILD= yes
+JAVA_VERSION= 1.8
+USE_JAVA= yes
+.endif
+
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@@ -268,6 +273,12 @@ do-configure:
# Setup nodejs dependency
@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
+
+ # Setup java dependency on amd64
+.if ${ARCH} == amd64
+ @${MKDIR} ${WRKDIR}/bin
+ ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java
+.endif
.endif
do-test-TEST-on:
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/distinfo Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1544905827
-SHA256 (chromium-71.0.3578.98.tar.xz) = 1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45
-SIZE (chromium-71.0.3578.98.tar.xz) = 633860888
-SHA256 (chromium-71.0.3578.98-testdata.tar.xz) = 5559bc92d6fbf17e88828dbeb94015d2f7998a12e2d0fe27a33096f7c16b434f
-SIZE (chromium-71.0.3578.98-testdata.tar.xz) = 350636612
+TIMESTAMP = 1550860551
+SHA256 (chromium-72.0.3626.119.tar.xz) = b3953ce18044117d98f0b1b9922aeb93030a7b49b85b140060c6fe3e467a917a
+SIZE (chromium-72.0.3626.119.tar.xz) = 686429876
+SHA256 (chromium-72.0.3626.119-testdata.tar.xz) = 03e7d1beb09dd2c4f544e2df04b20e9b6262b8f8e43d16c1bd032b36cd67403a
+SIZE (chromium-72.0.3626.119-testdata.tar.xz) = 351950800
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
Modified: head/www/chromium/files/patch-base_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-base_BUILD.gn Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-base_BUILD.gn Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2018-12-03 21:16:32.000000000 +0100
-+++ base/BUILD.gn 2018-12-05 13:50:51.133919000 +0100
-@@ -1182,7 +1182,7 @@
+--- base/BUILD.gn.orig 2019-02-06 23:06:36.000000000 +0100
++++ base/BUILD.gn 2019-02-08 20:14:26.420625000 +0100
+@@ -1176,7 +1176,7 @@
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -9,7 +9,7 @@
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
-@@ -1208,7 +1208,7 @@
+@@ -1202,7 +1202,7 @@
"allocator/allocator_shim_override_glibc_weak_symbols.h",
]
deps += [ "//base/allocator:tcmalloc" ]
@@ -18,7 +18,7 @@
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
} else if (is_android && use_allocator == "none") {
sources += [
-@@ -1740,6 +1740,33 @@
+@@ -1739,6 +1739,33 @@
}
}
@@ -27,11 +27,10 @@
+ "files/file_path_watcher_linux.cc",
+ "files/file_util_linux.cc",
+ "process/memory_linux.cc",
-+ "process/process_linux.cc",
+ "process/process_handle_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
-+ "sys_info_linux.cc"
++ "system/sys_info_linux.cc"
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
@@ -41,18 +40,19 @@
+ "process/process_handle_freebsd.cc",
+ "process/process_iterator_freebsd.cc",
+ "process/process_metrics_freebsd.cc",
-+ "sys_info_freebsd.cc",
++ "system/sys_info_freebsd.cc",
+ ]
+ libs = [
+ "execinfo", # logging.cc
-+ "kvm" # process_metrics_freebsd
++ "kvm", # process_metrics_freebsd
++ "util" # process_metrics_freebsd
+ ]
+ }
+
# iOS
if (is_ios) {
set_sources_assignment_filter([])
-@@ -2753,6 +2780,12 @@
+@@ -2761,6 +2788,12 @@
]
set_sources_assignment_filter(sources_assignment_filter)
}
Added: head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/page_allocator.cc.orig 2019-02-06 21:56:56.953755000 +0100
++++ base/allocator/partition_allocator/page_allocator.cc 2019-02-06 21:57:23.721544000 +0100
+@@ -114,7 +114,7 @@
+ uintptr_t align_base_mask = ~align_offset_mask;
+ DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+ // On 64 bit Linux, we may need to adjust the address space limit for
+ // guarded allocations.
+ if (length >= kMinimumGuardedMemorySize) {
Added: head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h Sun Feb 24 10:52:51 2019 (r493750)
@@ -0,0 +1,38 @@
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-02-06 21:59:00.906521000 +0100
++++ base/allocator/partition_allocator/page_allocator_internals_posix.h 2019-02-06 22:00:07.553831000 +0100
+@@ -14,7 +14,7 @@
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_BSD) || defined(OS_LINUX)
+ #include <sys/resource.h>
+
+ #include <algorithm>
+@@ -48,7 +48,7 @@
+ }
+ }
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+
+ // Multiple guarded memory regions may exceed the process address space limit.
+ // This function will raise or lower the limit by |amount|.
+@@ -68,7 +68,7 @@
+ // schemes that reduce that to 4 GiB.
+ constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB
+
+-#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+
+ void* SystemAllocPagesInternal(void* hint,
+ size_t length,
+@@ -134,7 +134,7 @@
+ void FreePagesInternal(void* address, size_t length) {
+ CHECK(!munmap(address, length));
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+ // Restore the address space limit.
+ if (length >= kMinimumGuardedMemorySize) {
+ CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));
Modified: head/www/chromium/files/patch-base_process_launch__posix.cc
==============================================================================
--- head/www/chromium/files/patch-base_process_launch__posix.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-base_process_launch__posix.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,10 +1,10 @@
---- base/process/launch_posix.cc.orig 2017-04-19 19:06:28 UTC
-+++ base/process/launch_posix.cc
-@@ -64,6 +64,7 @@
- #include "base/feature_list.h"
- #else
- extern char** environ;
-+#pragma weak environ
+--- base/process/launch_posix.cc.orig 2019-01-30 02:17:39.000000000 +0100
++++ base/process/launch_posix.cc 2019-01-31 20:45:00.397199000 +0100
+@@ -63,6 +63,7 @@
+ #error "macOS should use launch_mac.cc"
#endif
+
++#pragma weak environ
+ extern char** environ;
namespace base {
Added: head/www/chromium/files/patch-base_process_process__linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_process_process__linux.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -0,0 +1,18 @@
+--- base/process/process_linux.cc.orig 2019-02-01 23:15:53.491332000 +0100
++++ base/process/process_linux.cc 2019-02-01 23:16:56.937810000 +0100
+@@ -88,6 +88,7 @@
+ return Time(boot_time + start_offset);
+ }
+
++#if !defined(OS_BSD)
+ // static
+ bool Process::CanBackgroundProcesses() {
+ #if defined(OS_CHROMEOS)
+@@ -139,6 +140,7 @@
+ DPCHECK(result == 0);
+ return result == 0;
+ }
++#endif // !defined(OS_BSD)
+
+ #if defined(OS_CHROMEOS)
+ bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) {
Modified: head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,12 +1,21 @@
---- base/process/process_metrics_freebsd.cc.orig 2018-08-01 00:08:25.000000000 +0200
-+++ base/process/process_metrics_freebsd.cc 2018-08-04 21:48:06.554728000 +0200
-@@ -14,11 +14,14 @@
+--- base/process/process_metrics_freebsd.cc.orig 2019-02-06 23:06:36.000000000 +0100
++++ base/process/process_metrics_freebsd.cc 2019-02-08 19:11:07.753223000 +0100
+@@ -5,6 +5,7 @@
+ #include "base/process/process_metrics.h"
+
+ #include <stddef.h>
++#include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <sys/user.h>
+ #include <unistd.h>
+@@ -14,11 +15,15 @@
#include "base/process/process_metrics_iocounters.h"
#include "base/stl_util.h"
+#include <unistd.h> /* getpagesize() */
+#include <fcntl.h> /* O_RDONLY */
+#include <kvm.h>
++#include <libutil.h>
+
namespace base {
@@ -17,7 +26,7 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -67,6 +70,65 @@
+@@ -67,6 +72,95 @@
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
@@ -75,6 +84,36 @@
+ meminfo->swap_free = (swap_total - swap_used) * pagesizeKB;
+
+ return true;
++}
++
++int ProcessMetrics::GetOpenFdCount() const {
++ struct kinfo_file * kif;
++ int cnt;
++
++ if ((kif = kinfo_getfile(process_, &cnt)) == NULL)
++ return -1;
++
++ free(kif);
++
++ return cnt;
++}
++
++int ProcessMetrics::GetOpenFdSoftLimit() const {
++ struct kinfo_proc *info;
++ size_t length;
++ int total_count = 0;
++ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC };
++
++ length = sizeof(total_count);
++
++ if (sysctl(mib, arraysize(mib), &total_count, &length, NULL, 0) < 0) {
++ total_count = -1;
++ goto out;
++ }
++
++out:
++ free(info);
++ return total_count;
+}
+
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
Added: head/www/chromium/files/patch-base_system_sys__info__freebsd.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_system_sys__info__freebsd.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -0,0 +1,71 @@
+--- base/system/sys_info_freebsd.cc.orig 2017-12-15 02:04:05.000000000 +0100
++++ base/system/sys_info_freebsd.cc 2017-12-23 21:51:22.626194000 +0100
+@@ -13,26 +13,58 @@
+ namespace base {
+
+ int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+- 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;
+ }
+ return static_cast<int64_t>(pages) * page_size;
+ }
+
+-// static
+-uint64_t SysInfo::MaxSharedMemorySize() {
+- size_t limit;
+- size_t size = sizeof(limit);
+- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
++int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
++ 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<uint64_t>(limit);
++ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
++}
++
++// static
++std::string SysInfo::CPUModelName() {
++ int mib[] = { CTL_HW, HW_MODEL };
++ char name[256];
++ size_t size = arraysize(name);
++ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
++ return name;
++ return std::string();
++}
++
++int SysInfo::NumberOfProcessors() {
++ int mib[] = { CTL_HW, HW_NCPU };
++ int ncpu;
++ size_t size = sizeof(ncpu);
++ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
++ NOTREACHED();
++ return 1;
++ }
++ return ncpu;
+ }
+
+ } // namespace base
Added: head/www/chromium/files/patch-base_system_sys__info__posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_system_sys__info__posix.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -0,0 +1,38 @@
+--- base/system/sys_info_posix.cc.orig 2019-01-31 21:22:45.968524000 +0100
++++ base/system/sys_info_posix.cc 2019-01-31 21:25:09.041659000 +0100
+@@ -38,7 +38,7 @@
+
+ namespace {
+
+-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
++#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
+ int NumberOfProcessors() {
+ // sysconf returns the number of "logical" (not "physical") processors on both
+ // Mac and Linux. So we get the number of max available "logical" processors.
+@@ -64,7 +64,7 @@
+
+ base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
+ Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
+-#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
++#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA)
+
+ #if !defined(OS_FUCHSIA)
+ int64_t AmountOfVirtualMemory() {
+@@ -132,7 +132,7 @@
+
+ namespace base {
+
+-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
++#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
+ int SysInfo::NumberOfProcessors() {
+ return g_lazy_number_of_processors.Get().value();
+ }
+@@ -225,6 +225,8 @@
+ arch = "x86";
+ } else if (arch == "amd64") {
+ arch = "x86_64";
++ } else if (arch == "arm64") {
++ arch = "aarch64";
+ } else if (std::string(info.sysname) == "AIX") {
+ arch = "ppc64";
+ }
Modified: head/www/chromium/files/patch-base_threading_platform__thread__linux.cc
==============================================================================
--- head/www/chromium/files/patch-base_threading_platform__thread__linux.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-base_threading_platform__thread__linux.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_linux.cc.orig 2017-07-25 21:04:48.000000000 +0200
-+++ base/threading/platform_thread_linux.cc 2017-08-01 22:36:09.953380000 +0200
-@@ -19,7 +19,9 @@
+--- base/threading/platform_thread_linux.cc.orig 2019-01-30 02:17:39.000000000 +0100
++++ base/threading/platform_thread_linux.cc 2019-02-01 16:31:27.360883000 +0100
+@@ -18,7 +18,9 @@
#if !defined(OS_NACL) && !defined(OS_AIX)
#include <pthread.h>
@@ -10,9 +10,18 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -130,7 +132,7 @@
- ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
- tracked_objects::ThreadData::InitializeThreadContext(name);
+@@ -99,7 +101,7 @@
+
+ Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform(
+ ThreadPriority priority) {
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
+ // pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
+ struct rlimit rlim;
+@@ -141,7 +143,7 @@
+ void PlatformThread::SetName(const std::string& name) {
+ ThreadIdNameManager::GetInstance()->SetName(name);
-#if !defined(OS_NACL) && !defined(OS_AIX)
+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
Modified: head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
==============================================================================
--- head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2017-08-02 18:33:27.773657000 +0200
-+++ base/trace_event/malloc_dump_provider.cc 2017-08-02 18:34:48.019053000 +0200
-@@ -21,6 +21,8 @@
+--- base/trace_event/malloc_dump_provider.cc.orig 2019-01-30 02:17:39.000000000 +0100
++++ base/trace_event/malloc_dump_provider.cc 2019-01-31 22:27:52.377125000 +0100
+@@ -17,6 +17,8 @@
#if defined(OS_MACOSX)
#include <malloc/malloc.h>
@@ -9,8 +9,8 @@
#else
#include <malloc.h>
#endif
-@@ -243,6 +245,9 @@
- allocated_objects_count = main_heap_info.block_count;
+@@ -132,6 +134,9 @@
+ }
#elif defined(OS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
+#elif defined(OS_BSD)
Modified: head/www/chromium/files/patch-build_config_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_BUILD.gn Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-build_config_BUILD.gn Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig 2018-08-01 00:08:26.000000000 +0200
-+++ build/config/BUILD.gn 2018-08-05 13:59:34.648903000 +0200
-@@ -167,7 +167,7 @@
+--- build/config/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
++++ build/config/BUILD.gn 2019-01-31 21:42:37.569620000 +0100
+@@ -170,7 +170,7 @@
# builds, and we have to tell it to turn it off.
defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
}
@@ -9,7 +9,7 @@
# Enable libstdc++ debugging facilities to help catch problems early, see
# http://crbug.com/65151 .
# TODO(phajdan.jr): Should we enable this for all of POSIX?
-@@ -269,9 +269,7 @@
+@@ -272,9 +272,7 @@
]
} else if (is_linux) {
libs = [
@@ -19,12 +19,12 @@
]
}
}
-@@ -320,7 +318,7 @@
+@@ -351,7 +349,7 @@
"//build/config/ios:ios_dynamic_flags",
"//build/config/ios:ios_executable_flags",
]
- } else if (is_linux || is_android || current_os == "aix") {
+ } else if (is_linux || is_bsd || is_android || current_os == "aix") {
- configs += [ "//build/config/gcc:executable_ldconfig" ]
- if (is_android) {
- configs += [ "//build/config/android:executable_config" ]
+ configs += [ "//build/config/gcc:executable_config" ]
+ if (is_chromecast) {
+ configs += [ "//build/config/chromecast:executable_config" ]
Modified: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,15 +1,15 @@
---- build/config/BUILDCONFIG.gn.orig 2018-12-12 22:56:02.000000000 +0100
-+++ build/config/BUILDCONFIG.gn 2018-12-15 22:33:58.610110000 +0100
+--- build/config/BUILDCONFIG.gn.orig 2019-02-06 23:06:36.000000000 +0100
++++ build/config/BUILDCONFIG.gn 2019-02-08 19:05:14.524345000 +0100
@@ -131,10 +131,10 @@
is_official_build = false
# Whether we're a traditional desktop unix.
- is_desktop_linux = current_os == "linux"
-+ is_desktop_linux = current_os == "linux" || current_os == "bsd"
++ is_desktop_linux = current_os == "linux" || current_os == "freebsd"
# Set to true when compiling with the Clang compiler.
- is_clang = current_os != "linux" ||
-+ is_clang = current_os != "linux" || current_os == "bsd" ||
++ is_clang = current_os != "linux" || current_os == "freebsd" ||
(current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" &&
current_cpu != "mips" && current_cpu != "mips64")
@@ -19,21 +19,21 @@
- if (host_os == "linux") {
- if (target_os != "linux") {
-+ if (host_os == "linux" || host_os == "bsd") {
-+ if (target_os != "linux" || target_os != "bsd") {
++ if (host_os == "linux" || host_os == "freebsd") {
++ if (target_os != "linux" || target_os != "freebsd") {
# 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
-@@ -227,7 +227,7 @@
+@@ -228,7 +228,7 @@
assert(host_os == "linux" || host_os == "mac",
"Android builds are only supported on Linux and Mac hosts.")
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
-} else if (target_os == "chromeos" || target_os == "linux") {
-+} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") {
++} else if (target_os == "chromeos" || target_os == "linux" || target_os == "freebsd") {
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -301,6 +301,7 @@
+@@ -302,6 +302,7 @@
is_nacl = false
is_posix = false
is_win = true
@@ -41,7 +41,7 @@
} else if (current_os == "mac") {
is_aix = false
is_android = false
-@@ -312,6 +313,7 @@
+@@ -313,6 +314,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -49,7 +49,7 @@
} else if (current_os == "android") {
is_aix = false
is_android = true
-@@ -323,6 +325,7 @@
+@@ -324,6 +326,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -57,7 +57,7 @@
} else if (current_os == "chromeos") {
is_aix = false
is_android = false
-@@ -334,6 +337,7 @@
+@@ -335,6 +338,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -65,7 +65,7 @@
} else if (current_os == "nacl") {
# current_os == "nacl" will be passed by the nacl toolchain definition.
# It is not set by default or on the command line. We treat is as a
-@@ -348,6 +352,7 @@
+@@ -349,6 +353,7 @@
is_nacl = true
is_posix = true
is_win = false
@@ -73,7 +73,7 @@
} else if (current_os == "fuchsia") {
is_aix = false
is_android = false
-@@ -359,6 +364,7 @@
+@@ -360,6 +365,7 @@
is_nacl = false
is_posix = false
is_win = false
@@ -81,7 +81,7 @@
} else if (current_os == "ios") {
is_aix = false
is_android = false
-@@ -370,6 +376,7 @@
+@@ -371,6 +377,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -89,7 +89,7 @@
} else if (current_os == "linux") {
is_aix = false
is_android = false
-@@ -381,6 +388,7 @@
+@@ -382,6 +389,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -97,12 +97,12 @@
} else if (current_os == "aix") {
is_aix = true
is_android = false
-@@ -392,6 +400,19 @@
+@@ -393,6 +401,19 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
-+} else if (current_os == "bsd") {
++} else if (current_os == "freebsd") {
+ is_aix = false
+ is_android = false
+ is_chromeos = false
Modified: head/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,5 +1,5 @@
---- build/config/compiler/BUILD.gn.orig 2018-12-12 22:56:02.000000000 +0100
-+++ build/config/compiler/BUILD.gn 2018-12-16 01:04:15.942884000 +0100
+--- build/config/compiler/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
++++ build/config/compiler/BUILD.gn 2019-01-31 21:56:18.122280000 +0100
@@ -53,7 +53,7 @@
# only two architectures that are currently checked in). Turn this off when
# you are using a custom toolchain and need to control -B in cflags.
@@ -18,23 +18,16 @@
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
# TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
# crbug.com/485542
-@@ -391,15 +391,6 @@
- "-Wl,-z,now",
- "-Wl,-z,relro",
- ]
--
-- # Compiler instrumentation can introduce dependencies in DSOs to symbols in
-- # the executable they are loaded into, so they are unresolved at link-time.
-- if (!using_sanitizer && !is_safestack) {
-- ldflags += [
-- "-Wl,-z,defs",
-- "-Wl,--as-needed",
-- ]
-- }
- }
+@@ -393,7 +393,7 @@
- # Linux-specific compiler flags setup.
-@@ -502,7 +493,7 @@
+ # Compiler instrumentation can introduce dependencies in DSOs to symbols in
+ # the executable they are loaded into, so they are unresolved at link-time.
+- if (!using_sanitizer) {
++ if (!using_sanitizer && !is_bsd) {
+ ldflags += [
+ "-Wl,-z,defs",
+ "-Wl,--as-needed",
+@@ -501,7 +501,7 @@
}
}
@@ -43,7 +36,7 @@
cflags += [
# TODO(hans): Remove this once Clang generates better optimized debug info
# by default. https://crbug.com/765793
-@@ -793,7 +784,7 @@
+@@ -808,7 +808,7 @@
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -52,21 +45,26 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1498,13 +1489,6 @@
- cflags += [
- # TODO(thakis): https://crbug.com/753973
- "-Wno-enum-compare-switch",
--
+@@ -1488,11 +1488,13 @@
+ if (current_toolchain == host_toolchain || !use_xcode_clang) {
+ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
+ # recognize.
+- cflags += [
- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
- "-Wno-ignored-pragma-optimize",
--
-- # TODO(hans): https://crbug.com/890307
-- "-Wno-defaulted-function-deleted",
- ]
- }
- }
-@@ -1691,7 +1675,7 @@
+- ]
++ if (!is_bsd) {
++ cflags += [
++ # Ignore warnings about MSVC optimization pragmas.
++ # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
++ "-Wno-ignored-pragma-optimize",
++ ]
++ }
+ if (is_fuchsia) {
+ cflags += [
+ # TODO(hans): https://crbug.com/890307
+@@ -1684,7 +1686,7 @@
# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
# have a "thin archive" mode (it does accept -T, but it means truncating
# archive names to 16 characters, which is not what we want).
@@ -75,16 +73,16 @@
arflags = [ "-T" ]
}
}
-@@ -2264,7 +2248,7 @@
- # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
- cflags += [ "-gdwarf-3" ]
+@@ -2269,7 +2271,7 @@
+ # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
+ # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
+ if (!is_nacl || is_clang) {
+- cflags += [ "-g2" ]
++ cflags += [ "-g0" ]
}
-- cflags += [ "-g2" ]
-+ cflags += [ "-g0" ]
}
if (use_debug_fission && !is_nacl && !is_android) {
- # NOTE: Some Chrome OS builds globally set |use_debug_fission| to true,
-@@ -2284,7 +2268,7 @@
+@@ -2290,7 +2292,7 @@
# DWARF info may be corrupt; offsets in a range list entry are in different
# sections" there. Maybe just a bug in nacl_switch_32.S.
if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
Modified: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2018-12-12 22:56:02.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc 2019-01-04 00:08:47.109460000 +0100
-@@ -99,7 +99,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig 2019-01-30 02:17:41.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc 2019-02-06 19:21:07.067687000 +0100
+@@ -101,7 +101,7 @@
#include "chrome/app/shutdown_signal_handlers_posix.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -133,7 +133,7 @@
+@@ -135,7 +135,7 @@
#include "v8/include/v8.h"
#endif
@@ -18,7 +18,7 @@
#include "base/environment.h"
#endif
-@@ -233,7 +233,7 @@
+@@ -235,7 +235,7 @@
#endif // defined(OS_WIN)
@@ -27,7 +27,25 @@
void AdjustLinuxOOMScore(const std::string& process_type) {
// Browsers and zygotes should still be killable, but killed last.
const int kZygoteScore = 0;
-@@ -401,7 +401,7 @@
+@@ -339,7 +339,7 @@
+ return false;
+ }
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Show the man page if --help or -h is on the command line.
+ void HandleHelpSwitches(const base::CommandLine& command_line) {
+ if (command_line.HasSwitch(switches::kHelp) ||
+@@ -349,7 +349,7 @@
+ PLOG(FATAL) << "execlp failed";
+ }
+ }
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+
+ #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+ void SIGTERMProfilingShutdown(int signal) {
+@@ -403,7 +403,7 @@
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -36,7 +54,16 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -595,7 +595,7 @@
+@@ -585,7 +585,7 @@
+ *exit_code = 0;
+ return true; // Got a --version switch; exit with a success error code.
+ }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // This will directly exit if the user asked for help.
+ HandleHelpSwitches(command_line);
+ #endif
+@@ -609,7 +609,7 @@
#if defined(OS_CHROMEOS)
chromeos::RegisterPathProvider();
#endif
@@ -45,7 +72,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -912,7 +912,7 @@
+@@ -925,7 +925,7 @@
InitializePDF();
#endif
@@ -54,7 +81,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -928,7 +928,7 @@
+@@ -941,7 +941,7 @@
breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID)
}
@@ -63,7 +90,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -938,7 +938,7 @@
+@@ -951,7 +951,7 @@
void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
// Note: If you are adding a new process type below, be sure to adjust the
// AdjustLinuxOOMScore function too.
Modified: head/www/chromium/files/patch-chrome_app_chromium__strings.grd
==============================================================================
--- head/www/chromium/files/patch-chrome_app_chromium__strings.grd Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig 2017-09-05 21:05:12.000000000 +0200
-+++ chrome/app/chromium_strings.grd 2017-09-07 19:17:30.228682000 +0200
-@@ -913,7 +913,7 @@
+--- chrome/app/chromium_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100
++++ chrome/app/chromium_strings.grd 2019-02-12 16:28:22.555513000 +0100
+@@ -797,7 +797,7 @@
</message>
<!-- ProcessSingleton -->
@@ -8,4 +8,13 @@
+ <if expr="is_linux or is_macosx or is_posix">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
+ </message>
+@@ -1042,7 +1042,7 @@
+ </message>
+
+ <!-- Plugin Placeholders -->
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
+ Restart Chromium to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
</message>
Modified: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
==============================================================================
--- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig 2017-09-05 21:05:12.000000000 +0200
-+++ chrome/app/google_chrome_strings.grd 2017-09-07 19:16:11.038110000 +0200
-@@ -917,7 +917,7 @@
+--- chrome/app/google_chrome_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100
++++ chrome/app/google_chrome_strings.grd 2019-02-12 16:29:36.841110000 +0100
+@@ -808,7 +808,7 @@
</message>
<!-- ProcessSingleton -->
@@ -8,4 +8,13 @@
+ <if expr="is_linux or is_macosx or is_posix">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
+ </message>
+@@ -1060,7 +1060,7 @@
+ </message>
+
+ <!-- Plugin Placeholders -->
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
+ Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
</message>
Modified: head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,15 +1,21 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-03 21:16:37.000000000 +0100
-+++ chrome/app/shutdown_signal_handlers_posix.cc 2018-12-05 14:20:17.094777000 +0100
-@@ -183,7 +183,11 @@
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-12 22:56:02.000000000 +0100
++++ chrome/app/shutdown_signal_handlers_posix.cc 2019-01-13 01:50:13.594124000 +0100
+@@ -183,12 +183,18 @@
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
--#if !defined(ADDRESS_SANITIZER)
+#if defined(OS_BSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
-+#elif !defined(ADDRESS_SANITIZER)
++#else
+ #if !defined(ADDRESS_SANITIZER)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else
// ASan instrumentation bloats the stack frames, so we need to increase the
+ // stack size to avoid hitting the guard page.
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
++#endif
+ #endif
+ ShutdownDetector* detector = new ShutdownDetector(
+ g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc Sun Feb 24 10:52:18 2019 (r493749)
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc Sun Feb 24 10:52:51 2019 (r493750)
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2018-12-12 22:56:02.000000000 +0100
-+++ chrome/browser/about_flags.cc 2018-12-28 16:40:37.628497000 +0100
-@@ -884,7 +884,7 @@
+--- chrome/browser/about_flags.cc.orig 2019-01-30 02:17:44.000000000 +0100
++++ chrome/browser/about_flags.cc 2019-01-31 22:07:28.598255000 +0100
+@@ -832,7 +832,7 @@
{"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
@@ -9,7 +9,16 @@
const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = {
{autofill::kAutofillForcedFontWeightParameterName,
autofill::kAutofillForcedFontWeightParameterMedium},
-@@ -2609,12 +2609,12 @@
+@@ -859,7 +859,7 @@
+ {"Dedicated Suggestion Line", kPedalSuggestionDedicated,
+ base::size(kPedalSuggestionDedicated), nullptr},
+ };
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+
+ const FeatureEntry::Choice kAutoplayPolicyChoices[] = {
+ {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+@@ -2497,12 +2497,12 @@
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -24,7 +33,7 @@
{"enable-origin-trials", flag_descriptions::kOriginTrialsName,
flag_descriptions::kOriginTrialsDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2813,12 +2813,12 @@
+@@ -2696,12 +2696,12 @@
FEATURE_VALUE_TYPE(
password_manager::features::kPasswordsKeyboardAccessory)},
#endif // OS_ANDROID
@@ -36,10 +45,10 @@
FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)},
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #if defined(OS_CHROMEOS)
{"enable-experimental-accessibility-features",
flag_descriptions::kExperimentalAccessibilityFeaturesName,
-@@ -3225,7 +3225,7 @@
+ flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
+@@ -3127,7 +3127,7 @@
flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
@@ -48,7 +57,7 @@
{"omnibox-new-answer-layout",
flag_descriptions::kOmniboxNewAnswerLayoutName,
flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop,
-@@ -3257,7 +3257,7 @@
+@@ -3156,7 +3156,7 @@
flag_descriptions::kOmniboxDriveSuggestionsName,
flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
@@ -57,7 +66,7 @@
#if defined(OS_ANDROID)
{"enable-custom-feedback-ui",
-@@ -3566,13 +3566,13 @@
+@@ -3449,7 +3449,7 @@
flag_descriptions::kClickToOpenPDFDescription, kOsAll,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list