Date: Sun, 8 Mar 2020 19:44:41 +0000 (UTC) From: Conrad Meyer <cem@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528072 - in head/www/chromium: . files Message-ID: <202003081944.028JifSL064822@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem (src committer) Date: Sun Mar 8 19:44:41 2020 New Revision: 528072 URL: https://svnweb.freebsd.org/changeset/ports/528072 Log: www/chromium: update to 80.0.3987.132 This addresses some security issues, including at least one Google admits was being exploited in the wild. For more, see: https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html PR: 244625 Approved by: jrm, rene Security: CVE-2020-6407, CVE-2020-6418 (in the wild), CVE-2020-6420 Differential Revision: https://reviews.freebsd.org/D23984 Added: head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc (contents, props changed) head/www/chromium/files/patch-base_profiler_register__context.h (contents, props changed) head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc (contents, props changed) head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h (contents, props changed) head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc (contents, props changed) head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc (contents, props changed) head/www/chromium/files/patch-build_linux_unbundle_libxml.gn (contents, props changed) head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc (contents, props changed) head/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h (contents, props changed) head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc (contents, props changed) head/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor.cc (contents, props changed) head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h (contents, props changed) head/www/chromium/files/patch-third__party_libpng_pnglibconf.h (contents, props changed) head/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp (contents, props changed) head/www/chromium/files/patch-v8_include_v8config.h (contents, props changed) Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/patch-BUILD.gn head/www/chromium/files/patch-ash_display_mirror__window__controller.cc head/www/chromium/files/patch-base_BUILD.gn head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc head/www/chromium/files/patch-base_debug_elf__reader.cc head/www/chromium/files/patch-base_files_file__util__posix.cc head/www/chromium/files/patch-base_i18n_icu__util.cc head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc head/www/chromium/files/patch-base_process_launch.h head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc head/www/chromium/files/patch-base_test_test__file__util__posix.cc head/www/chromium/files/patch-base_threading_platform__thread.h head/www/chromium/files/patch-base_threading_platform__thread__posix.cc head/www/chromium/files/patch-build_config_BUILD.gn head/www/chromium/files/patch-build_config_compiler_BUILD.gn head/www/chromium/files/patch-build_config_compiler_compiler.gni head/www/chromium/files/patch-cc_BUILD.gn head/www/chromium/files/patch-cc_trees_property__tree.cc head/www/chromium/files/patch-chrome_app_chrome__command__ids.h head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc 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_generated__resources.grd head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd head/www/chromium/files/patch-chrome_app_settings__strings.grdp head/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd head/www/chromium/files/patch-chrome_browser_about__flags.cc head/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc head/www/chromium/files/patch-chrome_browser_browser__resources.grd 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_chrome__content__browser__client.h head/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc head/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc head/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc head/www/chromium/files/patch-chrome_browser_flag__descriptions.h head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc head/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.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_browser_ui_views_chrome__browser__main__extra__parts__views.cc head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc head/www/chromium/files/patch-chrome_common_BUILD.gn head/www/chromium/files/patch-chrome_common_channel__info__posix.cc head/www/chromium/files/patch-chrome_common_chrome__features.cc head/www/chromium/files/patch-chrome_common_chrome__features.h head/www/chromium/files/patch-chrome_common_chrome__paths.cc head/www/chromium/files/patch-chrome_common_chrome__switches.cc head/www/chromium/files/patch-chrome_common_chrome__switches.h head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni head/www/chromium/files/patch-chrome_common_features.gni head/www/chromium/files/patch-chrome_common_pref__names.cc head/www/chromium/files/patch-chrome_common_pref__names.h head/www/chromium/files/patch-chrome_common_webui__url__constants.cc head/www/chromium/files/patch-chrome_common_webui__url__constants.h head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc head/www/chromium/files/patch-chrome_test_BUILD.gn head/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc head/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc head/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc head/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc head/www/chromium/files/patch-components_crash_content_app_BUILD.gn head/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc head/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc head/www/chromium/files/patch-components_feature__engagement_public_event__constants.h head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc head/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h head/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc head/www/chromium/files/patch-components_feature__engagement_public_feature__list.h head/www/chromium/files/patch-components_flags__ui_flags__state.cc head/www/chromium/files/patch-components_gcm__driver_gcm__client.h head/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc head/www/chromium/files/patch-components_metrics_BUILD.gn head/www/chromium/files/patch-components_neterror_resources_neterror.js head/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc head/www/chromium/files/patch-components_os__crypt_os__crypt.h head/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.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-components_sync__device__info_device__info__sync__bridge.cc head/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc head/www/chromium/files/patch-components_viz_host_host__display__client.cc head/www/chromium/files/patch-components_viz_host_host__display__client.h head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h head/www/chromium/files/patch-content_app_content__main__runner__impl.cc head/www/chromium/files/patch-content_browser_browser__main__loop.cc head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc head/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc head/www/chromium/files/patch-content_browser_media_media__internals.cc head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc head/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc head/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc head/www/chromium/files/patch-content_browser_utility__process__host.cc head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc head/www/chromium/files/patch-content_common_BUILD.gn head/www/chromium/files/patch-content_gpu_BUILD.gn head/www/chromium/files/patch-content_gpu_gpu__main.cc head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc head/www/chromium/files/patch-content_public_common_child__process__host.h head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h head/www/chromium/files/patch-content_public_common_content__features.cc head/www/chromium/files/patch-content_public_common_content__switches.cc head/www/chromium/files/patch-content_public_common_content__switches.h head/www/chromium/files/patch-content_public_test_browser__test__base.cc head/www/chromium/files/patch-content_renderer_render__thread__impl.cc head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h head/www/chromium/files/patch-content_shell_BUILD.gn head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc head/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc head/www/chromium/files/patch-extensions_common_api___permission__features.json head/www/chromium/files/patch-extensions_common_api_runtime.json head/www/chromium/files/patch-extensions_common_image__util.cc head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc head/www/chromium/files/patch-gpu_config_gpu__control__list.cc head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc head/www/chromium/files/patch-ipc_ipc__channel.h head/www/chromium/files/patch-ipc_ipc__channel__common.cc head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc head/www/chromium/files/patch-ipc_ipc__message__utils.h head/www/chromium/files/patch-media_audio_BUILD.gn head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc head/www/chromium/files/patch-media_media__options.gni head/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc head/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc head/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc head/www/chromium/files/patch-media_webrtc_webrtc__switches.cc head/www/chromium/files/patch-mojo_public_c_system_thunks.cc head/www/chromium/files/patch-net_BUILD.gn head/www/chromium/files/patch-net_base_address__tracker__linux.cc head/www/chromium/files/patch-net_base_network__change__notifier.cc head/www/chromium/files/patch-net_dns_host__resolver__proc.cc head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc head/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc head/www/chromium/files/patch-net_url__request_url__request__context.cc head/www/chromium/files/patch-net_url__request_url__request__context.h head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc head/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc head/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc head/www/chromium/files/patch-remoting_resources_remoting__strings.grd head/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc head/www/chromium/files/patch-services_network_BUILD.gn head/www/chromium/files/patch-services_network_network__context.cc head/www/chromium/files/patch-services_network_network__service.cc head/www/chromium/files/patch-services_network_network__service.h head/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc head/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc head/www/chromium/files/patch-third__party_angle_BUILD.gn head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c head/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc head/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc head/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc head/www/chromium/files/patch-third__party_blink_renderer_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_boringssl_src_crypto_cpu-aarch64-linux.c head/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni head/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc 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_SkOSFile__stdio.cpp head/www/chromium/files/patch-third__party_swiftshader_BUILD.gn head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp head/www/chromium/files/patch-third__party_webrtc_BUILD.gn head/www/chromium/files/patch-third__party_zlib_arm__features.c head/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc head/www/chromium/files/patch-ui_base_ui__base__features.cc head/www/chromium/files/patch-ui_base_ui__base__features.h head/www/chromium/files/patch-ui_base_webui_web__ui__util.cc head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc head/www/chromium/files/patch-ui_compositor_compositor.cc head/www/chromium/files/patch-ui_compositor_compositor.h head/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc head/www/chromium/files/patch-ui_gfx_BUILD.gn head/www/chromium/files/patch-ui_gfx_canvas__skia.cc head/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h head/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc head/www/chromium/files/patch-ui_gfx_render__text.cc head/www/chromium/files/patch-ui_gl_BUILD.gn head/www/chromium/files/patch-ui_gl_generate__bindings.py head/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc head/www/chromium/files/patch-ui_native__theme_native__theme__base.cc head/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc head/www/chromium/files/patch-ui_views_controls_label.cc head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc head/www/chromium/files/patch-ui_views_examples_widget__example.cc head/www/chromium/files/patch-ui_views_style_platform__style.cc head/www/chromium/files/patch-ui_views_views__delegate.cc head/www/chromium/files/patch-ui_views_views__delegate.h head/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc head/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc head/www/chromium/files/patch-ui_views_window_dialog__delegate.cc head/www/chromium/files/patch-ui_views_window_frame__background.cc head/www/chromium/files/patch-v8_BUILD.gn head/www/chromium/files/patch-v8_src_api_api.cc head/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc head/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/Makefile Sun Mar 8 19:44:41 2020 (r528072) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 79.0.3945.130 +PORTVERSION= 80.0.3987.132 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -119,7 +119,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ - use_jumbo_build=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ @@ -160,10 +159,10 @@ ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true \ - GN_ARGS+=enable_hevc_demuxing=true + GN_ARGS+=enable_platform_hevc=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false \ - GN_ARGS+=enable_hevc_demuxing=false + GN_ARGS+=enable_platform_hevc=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true @@ -259,7 +258,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: @@ -301,7 +300,10 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} -.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin +.for d in protoc mksnapshot + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} +.endfor +.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/distinfo Sun Mar 8 19:44:41 2020 (r528072) @@ -1,7 +1,7 @@ -TIMESTAMP = 1579261549 -SHA256 (chromium-79.0.3945.130.tar.xz) = 56193431ab9d1193773b133d86b419bfae8d8b9196eea253660895e0e8f87ba0 -SIZE (chromium-79.0.3945.130.tar.xz) = 778319112 -SHA256 (chromium-79.0.3945.130-testdata.tar.xz) = da0b544e2f9a3022c5120a0dc21b945e4565e7e4b64f086eefd720e2c1e516d8 -SIZE (chromium-79.0.3945.130-testdata.tar.xz) = 252386344 +TIMESTAMP = 1583291717 +SHA256 (chromium-80.0.3987.132.tar.xz) = 2c0012059046a5a7e2bf6e9502f1898f1953226d63b724b82fc18226e285c201 +SIZE (chromium-80.0.3987.132.tar.xz) = 796975056 +SHA256 (chromium-80.0.3987.132-testdata.tar.xz) = 6cbe559778ab75386c90b2de29416bc63b5b6d5b1232876b6a7626359362a91b +SIZE (chromium-80.0.3987.132-testdata.tar.xz) = 251267384 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Modified: head/www/chromium/files/patch-BUILD.gn ============================================================================== --- head/www/chromium/files/patch-BUILD.gn Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-BUILD.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2019-12-16 21:51:21 UTC +--- BUILD.gn.orig 2020-03-03 18:53:46 UTC +++ BUILD.gn @@ -411,7 +411,7 @@ group("gn_all") { ] @@ -57,7 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -905,7 +894,6 @@ if (is_chromeos) { +@@ -918,7 +907,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -65,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1076,7 +1064,7 @@ if (!is_ios) { +@@ -1069,7 +1057,7 @@ if (!is_ios) { ] } @@ -74,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1085,7 +1073,7 @@ if (!is_ios) { +@@ -1078,7 +1066,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1227,9 +1215,6 @@ group("chromium_builder_perf") { +@@ -1220,9 +1208,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] Modified: head/www/chromium/files/patch-ash_display_mirror__window__controller.cc ============================================================================== --- head/www/chromium/files/patch-ash_display_mirror__window__controller.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-ash_display_mirror__window__controller.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-03-03 18:53:46 UTC +++ ash/display/mirror_window_controller.cc -@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow( +@@ -298,7 +298,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); Modified: head/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-base_BUILD.gn Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_BUILD.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2019-12-16 21:51:21 UTC +--- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC +++ base/BUILD.gn -@@ -1274,7 +1274,7 @@ jumbo_component("base") { +@@ -1302,7 +1302,7 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -9,7 +9,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1300,7 +1300,7 @@ jumbo_component("base") { +@@ -1328,7 +1328,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1903,6 +1903,33 @@ jumbo_component("base") { +@@ -1919,6 +1919,33 @@ jumbo_component("base") { } } @@ -51,10 +51,10 @@ + # iOS if (is_ios) { - set_sources_assignment_filter([]) -@@ -3071,6 +3098,12 @@ test("base_unittests") { - ] - set_sources_assignment_filter(sources_assignment_filter) + sources -= [ +@@ -3069,6 +3096,12 @@ test("base_unittests") { + + manifest = "//build/config/fuchsia/tests.cmx" } + + if (is_bsd) { @@ -63,5 +63,5 @@ + ] + } - if (is_win) { - deps += [ "//base:scoped_handle_test_dll" ] + if (!is_fuchsia && !is_ios) { + sources += [ "files/file_locking_unittest.cc" ] Modified: head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc ============================================================================== --- head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,7 +1,7 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-03-03 18:52:59 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -5,18 +5,28 @@ - #include "base/allocator/allocator_shim.h" +@@ -6,18 +6,28 @@ + #include "base/compiler_specific.h" #include <dlfcn.h> -#include <malloc.h> @@ -36,7 +36,7 @@ } // extern "C" namespace { -@@ -24,32 +34,32 @@ namespace { +@@ -25,32 +35,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { @@ -73,4 +73,4 @@ + __free(address); } - size_t GlibcGetSizeEstimate(const AllocatorDispatch*, + NO_SANITIZE("cfi-icall") Modified: head/www/chromium/files/patch-base_debug_elf__reader.cc ============================================================================== --- head/www/chromium/files/patch-base_debug_elf__reader.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_debug_elf__reader.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,18 +1,18 @@ ---- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC +--- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC +++ base/debug/elf_reader.cc -@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr); +@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; - while (current_note < section_end) { + while (current_section < section_end) { + current_note = reinterpret_cast<const Nhdr*>(current_section); +#if !defined(OS_BSD) if (current_note->n_type == NT_GNU_BUILD_ID) { - const char* note_name = - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr); -@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + StringPiece note_name(current_section + sizeof(Nhdr), + current_note->n_namesz); +@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - current_note = reinterpret_cast<const Nhdr*>( - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) + + size_t section_size = bits::Align(current_note->n_namesz, 4) + + bits::Align(current_note->n_descsz, 4) + Modified: head/www/chromium/files/patch-base_files_file__util__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_files_file__util__posix.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_files_file__util__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2019-12-16 21:51:21 UTC +--- base/files/file_util_posix.cc.orig 2020-03-03 18:52:59 UTC +++ base/files/file_util_posix.cc -@@ -435,7 +435,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { Modified: head/www/chromium/files/patch-base_i18n_icu__util.cc ============================================================================== --- head/www/chromium/files/patch-base_i18n_icu__util.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_i18n_icu__util.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,20 +1,20 @@ --- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC +++ base/i18n/icu_util.cc -@@ -20,7 +20,7 @@ - #include "build/build_config.h" - #include "third_party/icu/source/common/unicode/putil.h" - #include "third_party/icu/source/common/unicode/udata.h" --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) -+#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) - #include "third_party/icu/source/i18n/unicode/timezone.h" +@@ -43,7 +43,7 @@ #endif -@@ -365,7 +365,7 @@ bool InitializeICU() { - // TODO(jungshik): Some callers do not care about tz at all. If necessary, - // add a boolean argument to this function to init'd the default tz only - // when requested. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (result) - std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) + #include "third_party/icu/source/i18n/unicode/timezone.h" #endif + +@@ -288,7 +288,7 @@ void InitializeIcuTimeZone() { + fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); + icu::TimeZone::adoptDefault( + icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); +-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST) ++#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) + // To respond to the timezone change properly, the default timezone + // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). Added: head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,11 @@ +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-03 18:53:47 UTC ++++ base/memory/madv_free_discardable_memory_posix.cc +@@ -267,7 +267,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT + + bool MadvFreeDiscardableMemoryPosix::IsResident() const { + DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); +-#ifdef OS_MACOSX ++#if defined(OS_MACOSX) || defined(OS_BSD) + std::vector<char> vec(allocated_pages_); + #else + std::vector<unsigned char> vec(allocated_pages_); Modified: head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h ============================================================================== --- head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_memory_platform__shared__memory__region.h Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2019-09-16 12:06:15 UTC +--- base/memory/platform_shared_memory_region.h.orig 2020-03-03 18:52:59 UTC +++ base/memory/platform_shared_memory_region.h -@@ -28,7 +28,7 @@ +@@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" #endif @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size Modified: head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2019-09-16 12:05:39 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-03-03 18:52:59 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const { +@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: +@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: return region.PassPlatformHandle().fd; return ScopedFD(); } @@ -18,7 +18,7 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -27,7 +27,7 @@ , bool executable #endif -@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( Modified: head/www/chromium/files/patch-base_process_launch.h ============================================================================== --- head/www/chromium/files/patch-base_process_launch.h Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_process_launch.h Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2019-06-04 18:55:15 UTC +--- base/process/launch.h.orig 2020-03-03 18:52:59 UTC +++ base/process/launch.h -@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; Added: head/www/chromium/files/patch-base_profiler_register__context.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_profiler_register__context.h Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,60 @@ +--- base/profiler/register_context.h.orig 2020-03-03 18:53:47 UTC ++++ base/profiler/register_context.h +@@ -17,7 +17,7 @@ + #include <windows.h> + #elif defined(OS_MACOSX) + #include <mach/machine/thread_status.h> +-#elif defined(OS_ANDROID) || defined(OS_LINUX) ++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include <sys/ucontext.h> + #endif + +@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc + } + + #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) ++ ++#elif defined(OS_FREEBSD) ++ ++using RegisterContext = mcontext_t; ++ ++#if defined(ARCH_CPU_X86_64) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rsp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rbp); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rip); ++} ++#elif defined(ARCH_CPU_X86) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_esp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_ebp); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_eip); ++} ++#elif defined(ARCH_CPU_ARM64) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_sp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_x[29]); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_elr); ++} ++#endif + + #else // #if defined(OS_WIN) + Added: head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,11 @@ +--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-03-03 18:52:59 UTC ++++ base/profiler/sampling_profiler_thread_token.cc +@@ -7,7 +7,7 @@ + namespace base { + + SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() { +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + return {PlatformThread::CurrentId(), pthread_self()}; + #else + return {PlatformThread::CurrentId()}; Added: head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,20 @@ +--- base/profiler/sampling_profiler_thread_token.h.orig 2020-03-05 05:52:21 UTC ++++ base/profiler/sampling_profiler_thread_token.h +@@ -9,7 +9,7 @@ + #include "base/threading/platform_thread.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include <pthread.h> + #endif + +@@ -21,7 +21,7 @@ namespace base { + // functions used to obtain the stack base address. + struct SamplingProfilerThreadToken { + PlatformThreadId id; +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + pthread_t pthread_id; + #endif + }; Added: head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,65 @@ +--- base/profiler/stack_copier_signal.cc.orig 2020-03-03 18:53:47 UTC ++++ base/profiler/stack_copier_signal.cc +@@ -4,10 +4,16 @@ + + #include "base/profiler/stack_copier_signal.h" + ++#if defined(OS_LINUX) + #include <linux/futex.h> ++#include <syscall.h> ++#elif defined(OS_FREEBSD) ++#include <sys/types.h> ++#include <sys/thr.h> ++#include <sys/umtx.h> ++#endif + #include <signal.h> + #include <sys/ucontext.h> +-#include <syscall.h> + + #include <atomic> + +@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent { + // for a pthread mutex. So, also check the condition. + while (true) { + int res = ++#if defined(OS_LINUX) + syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, + 0, nullptr, nullptr, 0); ++#elif defined(OS_FREEBSD) ++ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr, ++ nullptr); ++#endif + if (futex_.load(std::memory_order_acquire) != 0) + return true; + if (res != 0) +@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent { + + void Signal() { + futex_.store(1, std::memory_order_release); ++#if defined(OS_LINUX) + syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1, + nullptr, nullptr, 0); ++#elif defined(OS_FREEBSD) ++ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr); ++#endif + } + + private: +@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b + if (!scoped_sigaction.succeeded()) + return false; + ++#if defined(OS_LINUX) + if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(), + SIGURG) != 0) { + NOTREACHED(); + return false; + } ++#elif defined(OS_FREEBSD) ++ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { ++ return false; ++ } ++#endif + bool finished_waiting = wait_event.Wait(); + TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"), + "StackCopierSignal copy stack"); Added: head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,63 @@ +--- base/profiler/thread_delegate_posix.cc.orig 2020-03-03 18:53:47 UTC ++++ base/profiler/thread_delegate_posix.cc +@@ -3,6 +3,9 @@ + // found in the LICENSE file. + + #include <pthread.h> ++#if defined(__FreeBSD__) ++#include <pthread_np.h> ++#endif + + #include "base/process/process_handle.h" + #include "base/profiler/thread_delegate_posix.h" +@@ -17,12 +20,20 @@ namespace { + uintptr_t GetThreadStackBaseAddressImpl( + SamplingProfilerThreadToken thread_token) { + pthread_attr_t attr; ++#if defined(OS_FREEBSD) ++ pthread_attr_init(&attr); ++ pthread_attr_get_np(thread_token.pthread_id, &attr); ++#elif defined(OS_LINUX) + pthread_getattr_np(thread_token.pthread_id, &attr); ++#endif + // See crbug.com/617730 for limitations of this approach on Linux. + void* address; + size_t size; + pthread_attr_getstack(&attr, &address, &size); + const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; ++#if defined(OS_FREEBSD) ++ pthread_attr_destroy(&attr); ++#endif + return base_address; + } + +@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist + for (size_t i = 19; i <= 29; ++i) + registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i])); + return registers; +-#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) && +- // defined(ARCH_CPU_32_BITS) ++#elif defined(ARCH_CPU_X86_64) + return { + // Return the set of callee-save registers per the x86-64 System V ABI + // section 3.2.1, plus the stack pointer. ++#if defined(OS_FREEBSD) ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp), ++#else + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]), +@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), ++#endif + }; + #else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) + // Unimplemented for other architectures. Modified: head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc ============================================================================== --- head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_test_fontconfig__util__linux.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ --- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC +++ base/test/fontconfig_util_linux.cc -@@ -6,24 +6,397 @@ +@@ -6,22 +6,397 @@ #include <fontconfig/fontconfig.h> @@ -386,8 +386,6 @@ + kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr); - std::unique_ptr<Environment> env(Environment::Create()); -- // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf. -- // Prevent fontconfig from doing this. - CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str())); + // Write the data to a different file and then atomically rename it to + // fonts.conf. This avoids the file being in a bad state when different Modified: head/www/chromium/files/patch-base_test_test__file__util__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_test_test__file__util__posix.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_test_test__file__util__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/test_file_util_posix.cc.orig 2020-03-03 18:52:59 UTC +++ base/test/test_file_util_posix.cc -@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() { +@@ -84,7 +84,7 @@ void SyncPageCacheToDisk() { sync(); } Modified: head/www/chromium/files/patch-base_threading_platform__thread.h ============================================================================== --- head/www/chromium/files/patch-base_threading_platform__thread.h Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_threading_platform__thread.h Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,15 @@ ---- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +--- base/threading/platform_thread.h.orig 2020-03-03 18:52:59 UTC +++ base/threading/platform_thread.h -@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { +@@ -36,6 +36,8 @@ typedef DWORD PlatformThreadId; + typedef zx_handle_t PlatformThreadId; + #elif defined(OS_MACOSX) + typedef mach_port_t PlatformThreadId; ++#elif defined(OS_FREEBSD) ++typedef long PlatformThreadId; + #elif defined(OS_POSIX) + typedef pid_t PlatformThreadId; + #endif +@@ -221,7 +223,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); Modified: head/www/chromium/files/patch-base_threading_platform__thread__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_threading_platform__thread__posix.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-base_threading_platform__thread__posix.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,17 @@ ---- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread_posix.cc.orig 2020-03-03 18:53:47 UTC +++ base/threading/platform_thread_posix.cc -@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) { +@@ -32,6 +32,10 @@ + #include <sys/syscall.h> + #endif + ++#if defined(OS_FREEBSD) ++#include <sys/thr.h> ++#endif ++ + #if defined(OS_FUCHSIA) + #include <zircon/process.h> + #else +@@ -66,7 +70,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); @@ -9,3 +20,14 @@ // Threads on linux/android may inherit their priority from the thread // where they were created. This explicitly sets the priority of all new // threads. +@@ -188,6 +192,10 @@ PlatformThreadId PlatformThread::CurrentId() { + return g_thread_id; + #elif defined(OS_ANDROID) + return gettid(); ++#elif defined(OS_FREEBSD) ++ long x; ++ thr_self(&x); ++ return x; + #elif defined(OS_FUCHSIA) + return zx_thread_self(); + #elif defined(OS_SOLARIS) || defined(OS_QNX) Modified: head/www/chromium/files/patch-build_config_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-build_config_BUILD.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2019-10-21 19:06:18 UTC +--- build/config/BUILD.gn.orig 2020-03-03 18:53:47 UTC +++ build/config/BUILD.gn -@@ -149,7 +149,7 @@ config("debug") { +@@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -247,9 +247,7 @@ config("default_libs") { +@@ -231,9 +231,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -337,7 +335,7 @@ config("executable_config") { +@@ -321,7 +319,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] Modified: head/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2019-12-16 21:51:21 UTC +--- build/config/compiler/BUILD.gn.orig 2020-03-03 18:53:47 UTC +++ build/config/compiler/BUILD.gn @@ -57,7 +57,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -303,7 +303,7 @@ config("compiler") { +@@ -308,7 +308,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && @@ -18,7 +18,7 @@ # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -398,7 +398,7 @@ config("compiler") { +@@ -403,7 +403,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -498,7 +498,7 @@ config("compiler") { +@@ -503,7 +503,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -768,7 +768,7 @@ config("compiler_cpu_abi") { +@@ -773,7 +773,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1119,7 +1119,7 @@ config("compiler_deterministic") { +@@ -1124,7 +1124,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1508,7 +1508,7 @@ config("default_warnings") { +@@ -1513,7 +1513,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1738,7 +1738,7 @@ config("thin_archive") { +@@ -1761,7 +1761,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2328,7 +2328,7 @@ config("symbols") { +@@ -2351,7 +2351,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -81,7 +81,7 @@ } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2349,7 +2349,7 @@ config("symbols") { +@@ -2372,7 +2372,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && Modified: head/www/chromium/files/patch-build_config_compiler_compiler.gni ============================================================================== --- head/www/chromium/files/patch-build_config_compiler_compiler.gni Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-build_config_compiler_compiler.gni Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2019-12-16 21:51:21 UTC +--- build/config/compiler/compiler.gni.orig 2020-03-03 18:53:47 UTC +++ build/config/compiler/compiler.gni -@@ -192,7 +192,7 @@ declare_args() { +@@ -187,7 +187,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = Added: head/www/chromium/files/patch-build_linux_unbundle_libxml.gn ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build_linux_unbundle_libxml.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -0,0 +1,53 @@ +--- build/linux/unbundle/libxml.gn.orig 2020-03-03 18:53:47 UTC ++++ build/linux/unbundle/libxml.gn +@@ -8,11 +8,48 @@ pkg_config("system_libxml") { + packages = [ "libxml-2.0" ] + } + +-static_library("libxml") { ++source_set("libxml") { ++ public_configs = [ ":system_libxml" ] ++} ++ ++static_library("libxml_utils") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ ":xml_reader", ++ ":xml_writer", ++ "//base/test:test_support", ++ "//services/data_decoder:xml_parser_fuzzer", ++ ] + sources = [ + "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", + ] +- + public_configs = [ ":system_libxml" ] ++} ++ ++static_library("xml_reader") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ "//base/test:test_support", ++ "//components/policy/core/common:unit_tests", ++ "//services/data_decoder:*", ++ "//tools/traffic_annotation/auditor:auditor_sources", ++ ] ++ sources = [ ++ "chromium/xml_reader.cc", ++ "chromium/xml_reader.h", ++ ] ++ deps = [ ":libxml_utils" ] ++} ++ ++static_library("xml_writer") { ++ # The XmlWriter is considered safe to use from any target. ++ visibility = [ "*" ] ++ sources = [ ++ "chromium/xml_writer.cc", ++ "chromium/xml_writer.h", ++ ] ++ deps = [ ":libxml_utils" ] + } Modified: head/www/chromium/files/patch-cc_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-cc_BUILD.gn Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-cc_BUILD.gn Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2019-12-16 21:51:21 UTC +--- cc/BUILD.gn.orig 2020-03-03 18:53:47 UTC +++ cc/BUILD.gn -@@ -576,7 +576,7 @@ cc_test_static_library("test_support") { +@@ -578,7 +578,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers", ] -@@ -780,9 +780,6 @@ cc_test("cc_unittests") { +@@ -783,9 +783,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", Modified: head/www/chromium/files/patch-cc_trees_property__tree.cc ============================================================================== --- head/www/chromium/files/patch-cc_trees_property__tree.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-cc_trees_property__tree.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2019-12-16 21:51:22 UTC +--- cc/trees/property_tree.cc.orig 2020-03-03 18:53:47 UTC +++ cc/trees/property_tree.cc -@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1234,13 +1234,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); Modified: head/www/chromium/files/patch-chrome_app_chrome__command__ids.h ============================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__command__ids.h Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-chrome_app_chrome__command__ids.h Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-03-03 18:53:48 UTC +++ chrome/app/chrome_command_ids.h -@@ -63,7 +63,7 @@ +@@ -62,7 +62,7 @@ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 Modified: head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc ============================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-12-16 21:51:22 UTC +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2020-03-03 18:53:48 UTC +++ chrome/app/chrome_content_browser_overlay_manifest.cc -@@ -70,7 +70,7 @@ +@@ -60,7 +60,7 @@ #include "chrome/browser/ui/webui/app_management/app_management.mojom.h" #endif @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #endif -@@ -189,7 +189,7 @@ const service_manager::Manifest& GetChromeContentBrows +@@ -145,7 +145,7 @@ const service_manager::Manifest& GetChromeContentBrows #else app_management::mojom::PageHandlerFactory, #endif Modified: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc ============================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Sun Mar 8 19:27:27 2020 (r528071) +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Sun Mar 8 19:44:41 2020 (r528072) @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-12-16 21:51:22 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-03-03 18:53:48 UTC +++ chrome/app/chrome_main_delegate.cc @@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -139,7 +139,7 @@ +@@ -142,7 +142,7 @@ #include "v8/include/v8.h" #endif @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -243,7 +243,7 @@ bool UseHooks() { +@@ -246,7 +246,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -302,13 +302,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -43,7 +43,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -52,7 +52,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -357,7 +357,7 @@ void HandleHelpSwitches(const base::CommandLine& comma *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003081944.028JifSL064822>