summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/chromium/Makefile5
-rw-r--r--www/chromium/distinfo10
-rw-r--r--www/chromium/files/extra-patch-clang11
-rw-r--r--www/chromium/files/patch-BUILD.gn32
-rw-r--r--www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc4
-rw-r--r--www/chromium/files/patch-base_BUILD.gn10
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h29
-rw-r--r--www/chromium/files/patch-base_debug_debugger__posix.cc6
-rw-r--r--www/chromium/files/patch-base_debug_elf__reader.cc8
-rw-r--r--www/chromium/files/patch-base_files_file__util.h4
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc6
-rw-r--r--www/chromium/files/patch-base_files_memory__mapped__file__posix.cc11
-rw-r--r--www/chromium/files/patch-base_process_kill.h9
-rw-r--r--www/chromium/files/patch-base_process_kill__posix.cc11
-rw-r--r--www/chromium/files/patch-base_process_launch.h10
-rw-r--r--www/chromium/files/patch-base_process_launch__posix.cc4
-rw-r--r--www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc24
-rw-r--r--www/chromium/files/patch-base_system_sys__info.h11
-rw-r--r--www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc12
-rw-r--r--www/chromium/files/patch-build_config_BUILD.gn8
-rw-r--r--www/chromium/files/patch-build_config_BUILDCONFIG.gn4
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn45
-rw-r--r--www/chromium/files/patch-build_config_features.gni4
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni10
-rw-r--r--www/chromium/files/patch-build_toolchain_get__concurrent__links.py4
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn6
-rw-r--r--www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc11
-rw-r--r--www/chromium/files/patch-cc_trees_property__tree.cc4
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc28
-rw-r--r--www/chromium/files/patch-chrome_app_chromium__strings.grd10
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd8
-rw-r--r--www/chromium/files/patch-chrome_app_google__chrome__strings.grd10
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc53
-rw-r--r--www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__resources.grd6
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc21
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc54
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc43
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc45
-rw-r--r--www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc38
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_process__singleton__posix.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h17
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__window.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc (renamed from www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc)12
-rw-r--r--www/chromium/files/patch-chrome_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc20
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h10
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc13
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths__internal.h4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni4
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc23
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h20
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h12
-rw-r--r--www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc4
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc4
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc10
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc4
-rw-r--r--www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn6
-rw-r--r--www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc10
-rw-r--r--www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h4
-rw-r--r--www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc4
-rw-r--r--www/chromium/files/patch-components_autofill__strings.grdp11
-rw-r--r--www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc39
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h36
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc15
-rw-r--r--www/chromium/files/patch-components_metrics_metrics__log.cc4
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json12
-rw-r--r--www/chromium/files/patch-components_services_font_font__service__app.cc11
-rw-r--r--www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc11
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc26
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc4
-rw-r--r--www/chromium/files/patch-content_browser_media_media__internals.cc12
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc15
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc4
-rw-r--r--www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc6
-rw-r--r--www/chromium/files/patch-content_browser_storage__partition__impl.cc11
-rw-r--r--www/chromium/files/patch-content_browser_storage__partition__impl__map.cc11
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host.cc4
-rw-r--r--www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_gpu_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h4
-rw-r--r--www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc4
-rw-r--r--www/chromium/files/patch-content_public_common_child__process__host.h6
-rw-r--r--www/chromium/files/patch-content_public_common_common__param__traits__macros.h4
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc6
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc4
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.h4
-rw-r--r--www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc12
-rw-r--r--www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc10
-rw-r--r--www/chromium/files/patch-content_renderer_render__process__impl.cc4
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc9
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc14
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h12
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__context.cc6
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc6
-rw-r--r--www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc4
-rw-r--r--www/chromium/files/patch-content_shell_test__runner_test__runner.cc8
-rw-r--r--www/chromium/files/patch-device_bluetooth_BUILD.gn4
-rw-r--r--www/chromium/files/patch-device_gamepad_gamepad__provider.cc8
-rw-r--r--www/chromium/files/patch-device_usb_usb__service__impl.cc14
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc10
-rw-r--r--www/chromium/files/patch-fix-gn-74716
-rw-r--r--www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc19
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc29
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc20
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc8
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__control__list.cc4
-rw-r--r--www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc29
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc56
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc10
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc16
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h4
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc4
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h11
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel__common.cc11
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel__mojo.cc10
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.cc12
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.h10
-rw-r--r--www/chromium/files/patch-media_audio_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_base_video__frame.cc8
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h10
-rw-r--r--www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc4
-rw-r--r--www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc4
-rw-r--r--www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc11
-rw-r--r--www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h10
-rw-r--r--www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc11
-rw-r--r--www/chromium/files/patch-media_capture_video_video__capture__device__client.cc8
-rw-r--r--www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc20
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc20
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc20
-rw-r--r--www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc49
-rw-r--r--www/chromium/files/patch-media_media__options.gni4
-rw-r--r--www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc10
-rw-r--r--www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn6
-rw-r--r--www/chromium/files/patch-net_base_address__tracker__linux.cc160
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc4
-rw-r--r--www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc10
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc4
-rw-r--r--www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (renamed from www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc)4
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc26
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.h11
-rw-r--r--www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc11
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc6
-rw-r--r--www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc6
-rw-r--r--www/chromium/files/patch-services_device_device__service.h11
-rw-r--r--www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc12
-rw-r--r--www/chromium/files/patch-services_device_hid_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_network__context.cc8
-rw-r--r--www/chromium/files/patch-services_network_network__service.cc6
-rw-r--r--www/chromium/files/patch-services_network_network__service.h4
-rw-r--r--www/chromium/files/patch-services_service__manager_embedder_main.cc4
-rw-r--r--www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc4
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc10
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn16
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h18
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc4
-rw-r--r--www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc6
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc (renamed from www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc)8
-rw-r--r--www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h38
-rw-r--r--www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp6
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc6
-rw-r--r--www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp12
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp6
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn6
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h12
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc6
-rw-r--r--www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_zlib_arm__features.c113
-rw-r--r--www/chromium/files/patch-tools_gn_base_files_file__util.h11
-rw-r--r--www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc11
-rw-r--r--www/chromium/files/patch-tools_gn_base_files_scoped__file.cc11
-rw-r--r--www/chromium/files/patch-tools_gn_build_gen.py14
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py4
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_model.py4
-rw-r--r--www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc (renamed from www/chromium/files/patch-ui_base_ime_input__method__initializer.cc)6
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc6
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.h4
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_font__fallback__linux.cc6
-rw-r--r--www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h12
-rw-r--r--www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h19
-rw-r--r--www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc58
-rw-r--r--www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h14
-rw-r--r--www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc43
-rw-r--r--www/chromium/files/patch-ui_gfx_native__pixmap__handle.h29
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn8
-rw-r--r--www/chromium/files/patch-ui_gl_generate__bindings.py4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__surface__glx.cc8
-rw-r--r--www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h4
-rw-r--r--www/chromium/files/patch-ui_message__center_views_message__popup__view.cc10
-rw-r--r--www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc4
-rw-r--r--www/chromium/files/patch-ui_views_controls_label.cc6
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc16
-rw-r--r--www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc4
-rw-r--r--www/chromium/files/patch-ui_views_examples_widget__example.cc4
-rw-r--r--www/chromium/files/patch-ui_views_selection__controller.cc4
-rw-r--r--www/chromium/files/patch-ui_views_views__delegate.h4
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc6
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc8
-rw-r--r--www/chromium/files/patch-ui_views_window_custom__frame__view.cc4
-rw-r--r--www/chromium/files/patch-ui_views_window_dialog__delegate.cc6
-rw-r--r--www/chromium/files/patch-ui_views_window_frame__background.cc4
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api.cc4
-rw-r--r--www/chromium/files/patch-v8_src_base_platform_platform-posix.cc4
-rw-r--r--www/chromium/pkg-plist1
288 files changed, 1826 insertions, 2113 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 73ce8e00b4d1..7b8986710374 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 74.0.3729.169
+PORTVERSION= 75.0.3770.80
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/cpm/chromium/:fonts
@@ -172,13 +172,14 @@ CUPS_VARS_OFF= GN_ARGS+=use_cups=false
DEBUG_VARS= BUILDTYPE=Debug \
GN_ARGS+=is_debug=true \
GN_ARGS+=is_component_build=false \
+ GN_ARGS+=symbol_level=1 \
GN_BOOTSTRAP_FLAGS+=--debug \
WANTSPACE="lots of free disk space (~ 13GB)"
DEBUG_VARS_OFF= BUILDTYPE=Release \
+ GN_ARGS+=blink_symbol_level=0 \
GN_ARGS+=is_debug=false \
GN_ARGS+=is_official_build=true \
GN_ARGS+=symbol_level=0 \
- GN_ARGS+=remove_webcore_debug_symbols=true \
WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
DRIVER_MAKE_ARGS= chromedriver
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index c83cc4f646dd..31ec4fa2ea01 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1559408741
-SHA256 (chromium-74.0.3729.169.tar.xz) = 070f0210017f54b65264f88726431da7582e36a04caa673fe50662e8b41a0cb4
-SIZE (chromium-74.0.3729.169.tar.xz) = 749495820
-SHA256 (chromium-74.0.3729.169-testdata.tar.xz) = b0799bd6f9854778397e8946b6e02ad409e5ad305547e8ee5cf8865f04e91945
-SIZE (chromium-74.0.3729.169-testdata.tar.xz) = 350168484
+TIMESTAMP = 1559766977
+SHA256 (chromium-75.0.3770.80.tar.xz) = da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6
+SIZE (chromium-75.0.3770.80.tar.xz) = 707985016
+SHA256 (chromium-75.0.3770.80-testdata.tar.xz) = baacaa2e67df853aa4c8550da5e533a6d5c41ad31c6bf2e9588364831791ba4a
+SIZE (chromium-75.0.3770.80-testdata.tar.xz) = 351066708
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 7ae5fbc5b6c4..7879e66fc553 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -38,17 +38,6 @@
EXPECT_CALL(callback_, OnError()).Times(2);
---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC
-+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
-@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor)
- std::vector<Task *>::iterator it;
- it = std::remove(tasks_.begin(),
- tasks_.end(),
-- reinterpret_cast<Task *>(NULL));
-+ static_cast<Task *>(NULL));
-
- tasks_.erase(it, tasks_.end());
- tasks_running_ = false;
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 52112d8a9775..cd9926e30c92 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2019-04-30 22:22:25 UTC
+--- BUILD.gn.orig 2019-06-04 18:55:14 UTC
+++ BUILD.gn
-@@ -387,7 +387,7 @@ group("gn_all") {
+@@ -385,7 +385,7 @@ group("gn_all") {
]
}
@@ -9,7 +9,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -428,8 +428,6 @@ group("gn_all") {
+@@ -426,8 +426,6 @@ group("gn_all") {
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
@@ -18,10 +18,10 @@
"//testing:empty_main",
]
-@@ -486,10 +484,6 @@ group("gn_all") {
+@@ -482,10 +480,6 @@ group("gn_all") {
+ "//chrome/test:load_library_perf_tests",
+ "//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
- "//chrome/test/chromedriver:chromedriver_tests",
- "//components/sync:run_sync_testserver",
- "//courgette:courgette",
- "//courgette:courgette_fuzz",
- "//courgette:courgette_minimal_tool",
@@ -29,7 +29,7 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
-@@ -544,10 +538,6 @@ group("gn_all") {
+@@ -540,10 +534,6 @@ group("gn_all") {
"//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
]
if (!is_android) {
-@@ -621,7 +611,7 @@ group("gn_all") {
+@@ -618,7 +608,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -49,7 +49,15 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -878,7 +868,6 @@ if (is_chromeos) {
+@@ -757,7 +747,6 @@ group("gn_all") {
+ "//chrome/browser/vr:vr_common_perftests",
+ "//chrome/browser/vr:vr_common_unittests",
+ "//chrome/browser/vr:vr_pixeltests",
+- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
+ ]
+ if (is_desktop_linux && use_ozone) {
+ deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
+@@ -876,7 +865,6 @@ if (is_chromeos) {
"//ppapi/examples/video_decode",
"//sandbox/linux:chrome_sandbox",
"//sandbox/linux:sandbox_linux_unittests",
@@ -57,7 +65,7 @@
# Blocked on https://github.com/catapult-project/catapult/issues/2297
#"//third_party/catapult/telemetry:bitmaptools",
-@@ -1029,7 +1018,7 @@ if (!is_ios) {
+@@ -1029,7 +1017,7 @@ if (!is_ios) {
]
}
@@ -66,7 +74,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1038,7 +1027,7 @@ if (!is_ios) {
+@@ -1038,7 +1026,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -75,7 +83,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1178,9 +1167,6 @@ group("chromium_builder_perf") {
+@@ -1181,9 +1169,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
index c7e90fe87c3f..8f6bd623a3b3 100644
--- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC
+++ apps/ui/views/app_window_frame_view.cc
-@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
+@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const {
gfx::Rect window_bounds = client_bounds;
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 44ecb3b6b17d..30a152076cec 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2019-04-30 22:22:27 UTC
+--- base/BUILD.gn.orig 2019-06-04 18:55:15 UTC
+++ base/BUILD.gn
-@@ -1188,7 +1188,7 @@ jumbo_component("base") {
+@@ -1234,7 +1234,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" ]
}
-@@ -1214,7 +1214,7 @@ jumbo_component("base") {
+@@ -1260,7 +1260,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 += [
-@@ -1764,6 +1764,33 @@ jumbo_component("base") {
+@@ -1813,6 +1813,33 @@ jumbo_component("base") {
}
}
@@ -52,7 +52,7 @@
# iOS
if (is_ios) {
set_sources_assignment_filter([])
-@@ -2840,6 +2867,12 @@ test("base_unittests") {
+@@ -2910,6 +2937,12 @@ test("base_unittests") {
]
set_sources_assignment_filter(sources_assignment_filter)
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index e05b85fec4a9..ec542f9bb84e 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-04-30 22:22:27 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:55:15 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -14,7 +14,7 @@
#if defined(OS_MACOSX)
@@ -9,30 +9,3 @@
#include <sys/resource.h>
#include <algorithm>
-@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
- }
- }
-
--#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 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
- // 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,
-@@ -144,7 +144,7 @@ void SetSystemPagesAccessInternal(
- 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)));
diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc
index 277dc8eb3238..c483529dd29f 100644
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC
+--- base/debug/debugger_posix.cc.orig 2019-06-04 18:55:15 UTC
+++ base/debug/debugger_posix.cc
-@@ -86,7 +86,7 @@ bool BeingDebugged() {
+@@ -87,7 +87,7 @@ bool BeingDebugged() {
KERN_PROC,
KERN_PROC_PID,
getpid()
@@ -9,7 +9,7 @@
, sizeof(struct kinfo_proc),
0
#endif
-@@ -94,33 +94,35 @@ bool BeingDebugged() {
+@@ -95,33 +95,35 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc
index d7597eaaafa6..a39739736202 100644
--- a/www/chromium/files/patch-base_debug_elf__reader.cc
+++ b/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -1,14 +1,14 @@
---- base/debug/elf_reader.cc.orig 2019-04-30 22:22:28 UTC
+--- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC
+++ base/debug/elf_reader.cc
-@@ -82,6 +82,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
- reinterpret_cast<const Nhdr*>(elf_base + header.p_offset);
+@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+ reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
bool found = false;
while (current_note < section_end) {
+#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);
-@@ -91,6 +92,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
break;
}
}
diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h
index 8b78f44f3adf..36ade4d74565 100644
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@@ -1,6 +1,6 @@
---- base/files/file_util.h.orig 2019-04-30 22:22:28 UTC
+--- base/files/file_util.h.orig 2019-06-04 18:55:15 UTC
+++ base/files/file_util.h
-@@ -449,7 +449,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -467,7 +467,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
// the directory |path|, in the number of FilePath::CharType, or -1 on failure.
BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index 1cfb136f5576..b5cfff0a33ba 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,7 +1,7 @@
---- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC
+--- base/files/file_util_posix.cc.orig 2019-06-04 18:55:15 UTC
+++ base/files/file_util_posix.cc
-@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path,
- #endif // !defined(OS_NACL_NONSFI)
+@@ -419,7 +419,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+ }
bool CreateLocalNonBlockingPipe(int fds[2]) {
-#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc b/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc
deleted file mode 100644
index 7ebabeead36b..000000000000
--- a/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC
-+++ base/files/memory_mapped_file_posix.cc
-@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory(
- // Only Android API>=21 supports the fallocate call. Older versions need
- // to manually extend the file by writing zeros at block intervals.
- do_manual_extension = true;
-+#elif defined(OS_BSD)
-+ do_manual_extension = true;
- #elif defined(OS_MACOSX)
- // MacOS doesn't support fallocate even though their new APFS filesystem
- // does support sparse files. It does, however, have the functionality
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index 800bfe47cb6c..d65a9a7748e6 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,6 +1,6 @@
---- base/process/kill.h.orig 2019-03-11 22:00:51 UTC
+--- base/process/kill.h.orig 2019-06-04 18:55:15 UTC
+++ base/process/kill.h
-@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);
@@ -9,3 +9,8 @@
// Spawns a thread to wait asynchronously for the child |process| to exit
// and then reaps it.
BASE_EXPORT void EnsureProcessGetsReaped(Process process);
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ #endif // defined(OS_POSIX)
+
+ // Registers |process| to be asynchronously monitored for termination, forcibly
diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc
index 12caf81e5eab..69e4dbc6c05e 100644
--- a/www/chromium/files/patch-base_process_kill__posix.cc
+++ b/www/chromium/files/patch-base_process_kill__posix.cc
@@ -1,4 +1,4 @@
---- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC
+--- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC
+++ base/process/kill_posix.cc
@@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
@@ -9,3 +9,12 @@
void EnsureProcessGetsReaped(Process process) {
DCHECK(!process.is_current());
+@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) {
+ PlatformThread::CreateNonJoinable(
+ 0, new BackgroundReaper(std::move(process), TimeDelta()));
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ #endif // !defined(OS_MACOSX)
+ #endif // !defined(OS_NACL_NONSFI)
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index 4bedd7017e8f..500e4c48250b 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,15 +1,15 @@
---- base/process/launch.h.orig 2019-04-30 22:22:28 UTC
+--- base/process/launch.h.orig 2019-06-04 18:55:15 UTC
+++ base/process/launch.h
-@@ -179,7 +179,7 @@ struct BASE_EXPORT LaunchOptions {
- FileHandleMappingVector fds_to_remap;
- #endif // defined(OS_WIN)
+@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions {
+ bool clear_environment = false;
+ #endif // OS_WIN || OS_POSIX || OS_FUCHSIA
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// 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
-@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions {
// Sets parent process death signal to SIGKILL.
bool kill_on_parent_death = false;
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index 8c88a282881d..ce6054a8ff79 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC
+--- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC
+++ base/process/launch_posix.cc
-@@ -64,6 +64,7 @@
+@@ -65,6 +65,7 @@
#error "macOS should use launch_mac.cc"
#endif
diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc
new file mode 100644
index 000000000000..f317e0971a3e
--- /dev/null
+++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc
@@ -0,0 +1,24 @@
+--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-06-04 18:55:15 UTC
++++ base/sampling_heap_profiler/sampling_heap_profiler.cc
+@@ -30,6 +30,10 @@
+ #include <sys/prctl.h>
+ #endif
+
++#if defined(OS_BSD)
++#include <pthread_np.h>
++#endif
++
+ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
+ defined(OFFICIAL_BUILD)
+ #include "base/trace_event/cfi_backtrace_android.h"
+@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() {
+ #elif defined(OS_MACOSX)
+ int err = pthread_getname_np(pthread_self(), name, kBufferLen);
+ if (err == 0 && *name != '\0')
++ return strdup(name);
++#elif defined(OS_BSD)
++ pthread_get_name_np(pthread_self(), name, kBufferLen);
++ if (*name != '\0')
+ return strdup(name);
+ #endif // defined(OS_LINUX) || defined(OS_ANDROID)
+
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
new file mode 100644
index 000000000000..52bf9a20881d
--- /dev/null
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -0,0 +1,11 @@
+--- base/system/sys_info.h.orig 2019-06-04 18:55:15 UTC
++++ base/system/sys_info.h
+@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
+ static bool IsLowEndDeviceImpl();
+ static HardwareInfo GetHardwareInfoSync();
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
+ static int64_t AmountOfAvailablePhysicalMemory(
+ const SystemMemoryInfoKB& meminfo);
+ #endif
diff --git a/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc b/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc
deleted file mode 100644
index 022b9c6da63c..000000000000
--- a/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC
-+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
-@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo
- EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
- }
-
-+#if defined(OS_BSD)
-+#define ThreadNamesSet DISABLED_ThreadNamesSet
-+#endif
- TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) {
- constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT,
- TaskShutdownBehavior::BLOCK_SHUTDOWN};
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 992a193c9313..f8a797d22050 100644
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig 2019-04-30 22:22:28 UTC
+--- build/config/BUILD.gn.orig 2019-06-04 18:55:15 UTC
+++ build/config/BUILD.gn
-@@ -162,7 +162,7 @@ config("debug") {
+@@ -163,7 +163,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?
-@@ -263,9 +263,7 @@ config("default_libs") {
+@@ -264,9 +264,7 @@ config("default_libs") {
]
} else if (is_linux) {
libs = [
@@ -19,7 +19,7 @@
]
}
}
-@@ -346,7 +344,7 @@ config("executable_config") {
+@@ -354,7 +352,7 @@ config("executable_config") {
"//build/config/ios:ios_dynamic_flags",
"//build/config/ios:ios_executable_flags",
]
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
index 92b0373dfb03..7c6d307fbd22 100644
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC
+--- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC
+++ build/config/BUILDCONFIG.gn
@@ -131,10 +131,10 @@ declare_args() {
is_official_build = false
@@ -33,7 +33,7 @@
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -291,10 +291,11 @@ is_android = current_os == "android"
+@@ -288,10 +288,11 @@ is_android = current_os == "android"
is_chromeos = current_os == "chromeos"
is_fuchsia = current_os == "fuchsia"
is_ios = current_os == "ios"
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 6e16740cec05..d6840799fa79 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2019-04-30 22:22:28 UTC
+--- build/config/compiler/BUILD.gn.orig 2019-06-04 18:55:15 UTC
+++ build/config/compiler/BUILD.gn
@@ -54,7 +54,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)
-@@ -279,7 +279,7 @@ config("compiler") {
+@@ -269,7 +269,7 @@ config("compiler") {
# Linker warnings.
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
!(is_android && use_order_profiling) && !is_mac && !is_ios &&
@@ -18,7 +18,7 @@
# 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
-@@ -381,7 +381,7 @@ config("compiler") {
+@@ -363,7 +363,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,16 +27,16 @@
ldflags += [
"-Wl,-z,defs",
"-Wl,--as-needed",
-@@ -489,7 +489,7 @@ config("compiler") {
+@@ -471,7 +471,7 @@ config("compiler") {
}
}
- if (is_clang && !is_nacl && !use_xcode_clang) {
+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) {
- cflags += [
- # TODO(hans): Remove this once Clang generates better optimized debug info
- # by default. https://crbug.com/765793
-@@ -757,7 +757,7 @@ config("compiler_cpu_abi") {
+ cflags += [ "-fcrash-diagnostics-dir=" +
+ rebase_path("//tools/clang/crashreports", root_build_dir) ]
+
+@@ -740,7 +740,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -45,7 +45,16 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1507,7 +1507,7 @@ config("default_warnings") {
+@@ -1174,7 +1174,7 @@ config("assembler_debug_dir") {
+ # TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move
+ # this behind the -fdebug-compilation-dir cflags in the "compiler" config.
+ if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) {
+- if (!is_win) {
++ if (!is_win && !is_bsd) {
+ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+ asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+ }
+@@ -1490,7 +1490,7 @@ config("default_warnings") {
cflags += [ "-Wno-nonportable-include-path" ]
}
@@ -54,7 +63,7 @@
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
cflags += [
-@@ -1707,7 +1707,7 @@ config("thin_archive") {
+@@ -1699,7 +1699,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).
@@ -63,16 +72,16 @@
arflags = [ "-T" ]
} else if (is_win && use_lld) {
arflags = [ "/llvmlibthin" ]
-@@ -2291,7 +2291,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) {
-- cflags += [ "-g2" ]
-+ cflags += [ "-g0" ]
- }
+@@ -2286,7 +2286,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) {
+- cflags += [ "-g2" ]
++ cflags += [ "-g0" ]
}
+
if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2312,7 +2312,7 @@ config("symbols") {
+@@ -2307,7 +2307,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" &&
diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni
index 2fe94bdc8b84..3d15197f9bb6 100644
--- a/www/chromium/files/patch-build_config_features.gni
+++ b/www/chromium/files/patch-build_config_features.gni
@@ -1,6 +1,6 @@
---- build/config/features.gni.orig 2019-03-11 22:00:52 UTC
+--- build/config/features.gni.orig 2019-06-04 18:55:15 UTC
+++ build/config/features.gni
-@@ -41,7 +41,7 @@ declare_args() {
+@@ -45,7 +45,7 @@ declare_args() {
}
# libudev usage. This currently only affects the content layer.
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index e313fc55cc0c..d0a1400adbbe 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,8 +1,8 @@
---- build/toolchain/gcc_toolchain.gni.orig 2019-04-30 22:22:28 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2019-06-04 18:55:15 UTC
+++ build/toolchain/gcc_toolchain.gni
-@@ -44,6 +44,11 @@ analyzer_wrapper =
- rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
- root_build_dir) + " --mode=clang"
+@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") {
+ enable_resource_whitelist_generation = false
+ }
+declare_args() {
+ extra_cxxflags = ""
@@ -12,7 +12,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -636,13 +641,23 @@ template("clang_toolchain") {
+@@ -617,13 +622,23 @@ template("clang_toolchain") {
}
gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
index 6e50c94426cd..45bc3d0a520e 100644
--- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
+++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
@@ -1,6 +1,6 @@
---- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC
+--- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC
+++ build/toolchain/get_concurrent_links.py
-@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes():
+@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes():
return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
except Exception:
return 0
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index ce72fe92ce13..757c9fc0091c 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2019-04-30 22:22:28 UTC
+--- cc/BUILD.gn.orig 2019-06-04 18:55:15 UTC
+++ cc/BUILD.gn
-@@ -554,7 +554,7 @@ cc_test_static_library("test_support") {
+@@ -562,7 +562,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [
"//third_party/mesa_headers",
]
-@@ -753,9 +753,6 @@ cc_test("cc_unittests") {
+@@ -762,9 +762,6 @@ cc_test("cc_unittests") {
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
diff --git a/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc b/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc
new file mode 100644
index 000000000000..83074373b430
--- /dev/null
+++ b/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc
@@ -0,0 +1,11 @@
+--- cc/scheduler/compositor_frame_reporting_controller.cc.orig 2019-06-04 18:55:15 UTC
++++ cc/scheduler/compositor_frame_reporting_controller.cc
+@@ -31,8 +31,6 @@ void CompositorFrameReportingController::WillBeginImpl
+
+ void CompositorFrameReportingController::WillBeginMainFrame() {
+ DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
+- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
+- reporters_[PipelineStage::kBeginImplFrame]);
+ reporters_[PipelineStage::kBeginImplFrame]->StartStage(
+ "SendBeginMainFrameToCommit");
+ AdvanceReporterStage(PipelineStage::kBeginImplFrame,
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index b666f442b657..4d7ff2e198ea 100644
--- a/www/chromium/files/patch-cc_trees_property__tree.cc
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig 2019-04-30 22:22:29 UTC
+--- cc/trees/property_tree.cc.orig 2019-06-04 18:55:15 UTC
+++ cc/trees/property_tree.cc
-@@ -1329,13 +1329,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 53085731c2fb..c9dd9ec6af2c 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2019-04-30 22:22:30 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -101,7 +101,7 @@
+@@ -100,7 +100,7 @@
#include "chrome/app/shutdown_signal_handlers_posix.h"
#endif
@@ -18,7 +18,7 @@
#include "base/environment.h"
#endif
-@@ -238,7 +238,7 @@ bool UseHooks() {
+@@ -240,7 +240,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;
-@@ -297,7 +297,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
if (score > -1)
base::AdjustOOMScore(base::GetCurrentProcId(), score);
}
@@ -36,7 +36,7 @@
// Returns true if this subprocess type needs the ResourceBundle initialized
// and resources loaded.
-@@ -342,7 +342,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
return false;
}
@@ -45,7 +45,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) ||
-@@ -352,7 +352,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
PLOG(FATAL) << "execlp failed";
}
}
@@ -54,7 +54,7 @@
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
void SIGTERMProfilingShutdown(int signal) {
-@@ -406,7 +406,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -63,7 +63,7 @@
// 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.
-@@ -418,7 +418,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
}
}
@@ -72,7 +72,7 @@
#if defined(OS_MACOSX)
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
#endif // OS_MAC
-@@ -475,7 +475,7 @@ void InitLogging(const std::string& process_type) {
+@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) {
void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
if (!exe_entry_point_ticks.is_null())
startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@@ -81,7 +81,7 @@
// Record the startup process creation time on supported platforms.
startup_metric_utils::RecordStartupProcessCreationTime(
base::Process::Current().CreationTime());
-@@ -613,7 +613,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
*exit_code = 0;
return true; // Got a --version switch; exit with a success error code.
}
@@ -90,7 +90,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -637,7 +637,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if defined(OS_CHROMEOS)
chromeos::RegisterPathProvider();
#endif
@@ -99,7 +99,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -953,7 +953,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitializePDF();
#endif
@@ -108,7 +108,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -968,7 +968,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID)
}
@@ -117,7 +117,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -978,7 +978,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -990,7 +990,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
// Note: If you are adding a new process type below, be sure to adjust the
// AdjustLinuxOOMScore function too.
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 3f685553e219..cd8c13d14780 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,15 +1,15 @@
---- chrome/app/chromium_strings.grd.orig 2019-04-30 22:22:30 UTC
+--- chrome/app/chromium_strings.grd.orig 2019-06-04 18:55:16 UTC
+++ chrome/app/chromium_strings.grd
-@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like
+@@ -710,7 +710,7 @@ Signing in anyway will merge Chromium information like
</if>
<!-- about:browser-switch strings -->
- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
- <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
+ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
-@@ -816,7 +816,7 @@ Signing in anyway will merge Chromium information like
+@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like
</message>
<!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
<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>
-@@ -1064,7 +1064,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1098,7 +1098,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
</message>
<!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index ef4409fdb060..93359b5b8b36 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig 2019-04-30 22:22:30 UTC
+--- chrome/app/generated_resources.grd.orig 2019-06-04 18:55:16 UTC
+++ chrome/app/generated_resources.grd
-@@ -4737,7 +4737,7 @@ Keep your key file in a safe place. You will need it t
+@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t
</if>
<!-- chrome://browser-switch strings -->
@@ -9,7 +9,7 @@
<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
Legacy Browser Support
</message>
-@@ -6228,7 +6228,7 @@ the Bookmarks menu.">
+@@ -6304,7 +6304,7 @@ the Bookmarks menu.">
Google Pay
</message>
@@ -18,7 +18,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -7012,7 +7012,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index d7500c7e45d4..fc279b57b18c 100644
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,15 +1,15 @@
---- chrome/app/google_chrome_strings.grd.orig 2019-04-30 22:22:30 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2019-06-04 18:55:16 UTC
+++ chrome/app/google_chrome_strings.grd
-@@ -701,7 +701,7 @@ Signing in anyway will merge Chrome information like b
+@@ -722,7 +722,7 @@ Signing in anyway will merge Chrome information like b
</if>
<!-- about:browser-switch strings -->
- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
+ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
- <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
+ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
-@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b
+@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b
</message>
<!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
<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>
-@@ -1082,7 +1082,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1117,7 +1117,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
</message>
<!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 94318c4fc4ce..6187a7c8ff9a 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2019-04-30 22:22:32 UTC
+--- chrome/app/settings_strings.grdp.orig 2019-06-04 18:55:16 UTC
+++ chrome/app/settings_strings.grdp
-@@ -628,7 +628,7 @@
+@@ -634,7 +634,7 @@
Themes
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
-@@ -642,7 +642,7 @@
+@@ -648,7 +648,7 @@
Use Classic
</message>
</if>
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 3aca9b080313..ad12e08163e9 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,9 +1,9 @@
---- chrome/browser/about_flags.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/about_flags.cc
-@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = {
- SINGLE_VALUE_TYPE(
- spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
- #endif // ENABLE_SPELLCHECK
+@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kCloudPrintXpsDescription, kOsWin,
+ SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
+ #endif // OS_WIN
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
{"enable-webgl2-compute-context",
@@ -16,7 +16,16 @@
{"enable-webgl-draft-extensions",
flag_descriptions::kWebglDraftExtensionsName,
flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kEnableDataSaverLiteModeRebrandName,
+ flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll,
+ FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)},
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ {"enable-save-data", flag_descriptions::kEnableSaveDataName,
+ flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
+ SINGLE_VALUE_TYPE(
+@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = {
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -28,10 +37,10 @@
switches::kDisableInputImeAPI)},
-#endif // OS_WIN || OS_LINUX
+#endif // OS_WIN || OS_LINUX || OS_BSD
- {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
- flag_descriptions::kOriginTrialsDescription, kOsAll,
- FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = {
+ {"enable-brotli", flag_descriptions::kEnableBrotliName,
+ flag_descriptions::kEnableBrotliDescription, kOsAll,
+ FEATURE_VALUE_TYPE(features::kBrotliEncoding)},
+@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
#endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
#endif // OS_ANDROID
@@ -46,16 +55,16 @@
{"enable-experimental-accessibility-features",
flag_descriptions::kExperimentalAccessibilityFeaturesName,
flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
- FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
+@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
@@ -64,7 +73,7 @@
{"enable-speculative-service-worker-start-on-query-input",
flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kClickToOpenPDFDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
@@ -73,16 +82,16 @@
{"direct-manipulation-stylus",
flag_descriptions::kDirectManipulationStylusName,
flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription,
- kOsWin | kOsMac | kOsLinux,
- FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)},
+@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kShowManagedUiDescription,
+ kOsWin | kOsMac | kOsLinux | kOsCrOS,
+ FEATURE_VALUE_TYPE(features::kShowManagedUi)},
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
#if !defined(OS_ANDROID)
{"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName,
-@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
#endif // defined(OS_MACOSX) || defined(OS_CHROMEOS)
@@ -91,7 +100,7 @@
{"autofill-always-show-server-cards-in-sync-transport",
flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
flag_descriptions::
-@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(
autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
@@ -100,7 +109,7 @@
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
{"enable-custom-mac-paper-sizes",
-@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
#endif // OS_CHROMEOS
diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index e9475b6ef063..49e224a58c1c 100644
--- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,6 +1,6 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -59,7 +59,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
return metrics::OmniboxInputType::QUERY;
case ExternalProtocolHandler::UNKNOWN: {
@@ -9,3 +9,9 @@
// Linux impl of GetApplicationNameForProtocol doesn't distinguish
// between URL schemes with handers and those without. This will
// make the default behaviour be search on Linux.
+ return metrics::OmniboxInputType::INVALID;
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ // If block state is unknown, check if there is an application registered
+ // for the url scheme.
+ GURL url(scheme + "://");
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index bd9970fcc5a3..f2961c2c6c96 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,6 +1,6 @@
---- chrome/browser/browser_resources.grd.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/browser_resources.grd.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/browser_resources.grd
-@@ -81,7 +81,7 @@
+@@ -77,7 +77,7 @@
<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
<include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\services\resource_coordinator\public\mojom\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
</if>
@@ -9,7 +9,7 @@
<include name="IDR_BROWSER_SWITCHER_APP_HTML" file="resources\browser_switcher\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
<include name="IDR_BROWSER_SWITCHER_APP_JS" file="resources\browser_switcher\app.js" compress="gzip" type="BINDATA" />
<include name="IDR_BROWSER_SWITCHER_BROWSER_SWITCHER_PROXY_HTML" file="resources\browser_switcher\browser_switcher_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
-@@ -689,7 +689,7 @@
+@@ -690,7 +690,7 @@
<include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
</if>
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index 58af50224c04..0e1d75e4a9f5 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,15 +1,18 @@
---- chrome/browser/chrome_browser_main.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -219,7 +219,7 @@
+@@ -218,9 +218,9 @@
#include "components/arc/metrics/stability_metrics_manager.h"
#endif // defined(OS_CHROMEOS)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
#include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-@@ -259,7 +259,7 @@
+ #if defined(OS_LINUX)
+ #include "components/crash/content/app/breakpad_linux.h"
+@@ -258,7 +258,7 @@
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,7 +21,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#endif
-@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
}
@@ -27,7 +30,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1058,14 +1058,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
&user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
@@ -45,7 +48,7 @@
#if defined(OS_MACOSX)
// Get the Keychain API to register for distributed notifications on the main
-@@ -1093,7 +1093,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -54,7 +57,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
#endif
metrics::RendererUptimeTracker::Initialize();
-@@ -1266,6 +1266,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::TimeDelta::FromMinutes(1));
#if !defined(OS_ANDROID)
@@ -62,7 +65,7 @@
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
web_usb_detector_.reset(new WebUsbDetector());
BrowserThread::PostAfterStartupTask(
-@@ -1274,6 +1275,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::BindOnce(&WebUsbDetector::Initialize,
base::Unretained(web_usb_detector_.get())));
}
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index e532f5974300..087df4cd43c4 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
-@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
void ChromeBrowserMainPartsLinux::PostProfileInit() {
ChromeBrowserMainPartsPosix::PostProfileInit();
@@ -13,10 +13,10 @@
void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
- bluez::BluezDBusThreadManager::Initialize();
- bluez::BluezDBusManager::Initialize();
+ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
#endif
-@@ -105,7 +107,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+
+@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
}
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index 87b62fed95fe..d217745edf63 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,6 +1,15 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
+ // ExitHandler takes care of deleting itself.
+ new ExitHandler();
+ } else {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ switch (signal) {
+ case SIGINT:
+ case SIGHUP:
+@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
#if defined(OS_CHROMEOS)
NOTREACHED(); // Should not ever happen on ChromeOS.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 5a419c7cf00e..499684621100 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -411,7 +411,7 @@
+@@ -418,7 +418,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "services/ws/common/switches.h"
@@ -9,16 +9,16 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -457,7 +457,7 @@
- #include "components/services/patch/public/interfaces/constants.mojom.h"
- #endif
+@@ -467,7 +467,7 @@
+ #endif // !defined(OS_ANDROID)
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
#endif
-@@ -474,7 +474,7 @@
+
+@@ -493,7 +493,7 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
#endif
@@ -27,16 +27,16 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#endif
-@@ -1170,7 +1170,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
#elif defined(OS_CHROMEOS)
- main_parts = new chromeos::ChromeBrowserMainPartsChromeos(
- parameters, chrome_feature_list_creator_);
+ main_parts =
+ new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
- main_parts =
- new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_);
+ main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_);
#elif defined(OS_ANDROID)
-@@ -1190,7 +1190,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+ main_parts = new ChromeBrowserMainPartsAndroid(parameters, startup_data_);
+@@ -1213,7 +1213,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_VIEWS)
@@ -45,7 +45,7 @@
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
#else
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1994,7 +1994,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2034,7 +2034,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -54,7 +54,7 @@
#if defined(OS_ANDROID)
bool enable_crash_reporter = true;
#else
-@@ -3529,7 +3529,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -63,21 +63,21 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4281,7 +4281,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
- handle));
+@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle =
browser_switcher::BrowserSwitcherNavigationThrottle ::
-@@ -5115,7 +5115,7 @@ std::unique_ptr<content::OverlayWindow>
+ MaybeCreateThrottleFor(handle);
+@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco
+ std::unique_ptr<content::OverlayWindow>
ChromeContentBrowserClient::CreateWindowForPictureInPicture(
content::PictureInPictureWindowController* controller) {
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_CHROMEOS)
// Note: content::OverlayWindow::Create() is defined by platform-specific
// implementation in chrome/browser/ui/views. This layering hack, which goes
- // through //content and ContentBrowserClient, allows us to work around the
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 00ce028c3619..e7c2a696aeb7 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -368,12 +368,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 12545ce51ceb..40a80672911b 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1234,7 +1234,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1228,7 +1228,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
@@ -9,7 +9,7 @@
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
-@@ -1254,7 +1254,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index 2edbf1a66894..ed5d480faee3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -62,7 +62,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
@@ -18,7 +18,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -257,7 +257,7 @@ void DownloadPrefs::RegisterProfilePrefs(
default_download_path);
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index 7c0829876f81..702f54b47279 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.h.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/download/download_prefs.h.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/download/download_prefs.h
-@@ -104,7 +104,7 @@ class DownloadPrefs {
+@@ -102,7 +102,7 @@ class DownloadPrefs {
// Disables auto-open based on file extension.
void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
@@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -148,7 +148,7 @@ class DownloadPrefs {
+@@ -150,7 +150,7 @@ class DownloadPrefs {
AutoOpenCompareFunctor> AutoOpenSet;
AutoOpenSet auto_open_;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index f44f9ff2ace2..0ae2b1b84f85 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1116,6 +1116,12 @@ jumbo_static_library("extensions") {
+@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") {
deps += [ "//chrome/common:service_process_mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
index 18be000e427e..86b77fad1e6a 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@@ -1,9 +1,9 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/extensions/activity_log/activity_log.cc
@@ -53,7 +53,11 @@
+ #include "extensions/browser/extensions_browser_client.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_messages.h"
- #include "extensions/common/one_shot_event.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
new file mode 100644
index 000000000000..aeed0db920d9
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -0,0 +1,43 @@
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
+@@ -29,7 +29,7 @@
+ #include "extensions/browser/process_manager.h"
+ #include "extensions/common/error_utils.h"
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "extensions/common/permissions/permissions_data.h"
+ #endif
+
+@@ -38,7 +38,7 @@ namespace {
+ bool CanEnableAudioDebugRecordingsFromExtension(
+ const extensions::Extension* extension) {
+ bool enabled_by_permissions = false;
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ if (extension) {
+ enabled_by_permissions =
+ extension->permissions_data()->active_permissions().HasAPIPermission(
+@@ -609,7 +609,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+ }
+
+ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() {
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
+ // this function shouldn't be called by a component extension on behalf of
+ // some web code. It returns a DirectoryEntry for use directly in the calling
+@@ -633,11 +633,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run
+ &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback,
+ this));
+ return true;
+-#else // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ SetError("Not supported on the current OS");
+ SendResponse(false);
+ return false;
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ }
+
+ void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback(
diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc
new file mode 100644
index 000000000000..a9e131364d72
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/bookmark_app_extension_util.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/extensions/bookmark_app_extension_util.cc
+@@ -34,7 +34,7 @@ namespace {
+
+ #if !defined(OS_CHROMEOS)
+ bool CanOsAddDesktopShortcuts() {
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ return true;
+ #else
+ return false;
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index b137f95a0e48..ded61fdbd3ca 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -3524,21 +3524,21 @@ extern const char kAshNotificationStackingBarRedesignD
+@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] =
// Random platform combinations -----------------------------------------------
@@ -24,12 +24,6 @@
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if defined(OS_WIN) || defined(OS_MACOSX)
-
-@@ -3551,13 +3551,13 @@ const char kAutomaticTabDiscardingDescription[] =
-
- #endif // defined(OS_WIN) || defined(OS_MACOSX)
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index bbada3188873..9089bc1a0c0b 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/flag_descriptions.h.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -2100,19 +2100,19 @@ extern const char kAshNotificationStackingBarRedesignD
+@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[];
// Random platform combinations -----------------------------------------------
@@ -22,12 +22,6 @@
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- extern const char kExperimentalUiName[];
- extern const char kExperimentalUiDescription[];
-@@ -2124,12 +2124,12 @@ extern const char kAutomaticTabDiscardingDescription[]
-
- #endif // defined(OS_WIN) || defined(OS_MACOSX)
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc b/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
index ab487829a64c..3bb3c96f9188 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
@@ -1,8 +1,8 @@
---- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/metrics/bluetooth_available_utility.cc
-@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() {
- if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported())
- ReportAvailability(BLUETOOTH_NOT_SUPPORTED);
+@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() {
+ return;
+ }
+#if !defined(OS_BSD)
device::BluetoothAdapterFactory::Get().GetAdapter(
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
new file mode 100644
index 000000000000..d8e26a9e4bc6
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/metrics/chrome_metrics_service_client.cc
+@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ }
+ #endif
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // This creates the DesktopProfileSessionDurationsServices if it didn't exist
+ // already.
+ metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
new file mode 100644
index 000000000000..42006a6f5f96
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/metrics/process_memory_metrics_emitter.cc
+@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+
+ builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024);
+ builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024);
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
+ 1024);
+ #endif
+@@ -382,7 +382,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+ MEMORY_METRICS_HISTOGRAM_MB(
+ std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint",
+ pmd.os_dump().shared_footprint_kb / 1024);
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ MEMORY_METRICS_HISTOGRAM_MB(
+ std::string(UMA_PREFIX) + process_name + ".PrivateSwapFootprint",
+ pmd.os_dump().private_footprint_swap_kb / 1024);
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 1e859d2a3597..0a796e195432 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/net/system_network_context_manager.cc
-@@ -70,12 +70,12 @@
+@@ -72,12 +72,12 @@
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#endif // defined(OS_CHROMEOS)
@@ -15,7 +15,46 @@
namespace {
-@@ -535,7 +535,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+ auth_dynamic_params->enable_negotiate_port =
+ local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ auth_dynamic_params->delegate_by_kdc_policy =
+ local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ #if defined(OS_POSIX)
+ auth_dynamic_params->ntlm_v2_enabled =
+@@ -433,10 +433,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
+ auth_pref_callback);
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
+ auth_pref_callback);
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ #if defined(OS_POSIX)
+ pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
+@@ -481,10 +481,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+ registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
+ registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
+ std::string());
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
+ false);
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ #if defined(OS_POSIX)
+ registry->RegisterBooleanPref(
+@@ -532,7 +532,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
content::GetNetworkService()->ConfigureStubHostResolver(
stub_resolver_enabled, std::move(dns_over_https_servers));
diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
new file mode 100644
index 000000000000..d1f708c3b1c6
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/notifications/notification_display_service_impl.cc
+@@ -31,7 +31,7 @@
+ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
+ #endif
+
+@@ -121,7 +121,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+ AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
+ std::make_unique<PersistentNotificationHandler>());
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ AddNotificationHandler(
+ NotificationHandler::Type::SEND_TAB_TO_SELF,
+ std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 970ace424458..f2c97de5a93c 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -80,7 +80,11 @@
+@@ -81,7 +81,11 @@
#include "net/cert/cert_status_flags.h"
#include "services/identity/public/cpp/identity_manager.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
@@ -11,4 +11,4 @@
+#endif
#include "url/url_constants.h"
- #if defined(SAFE_BROWSING_DB_LOCAL)
+ #if defined(FULL_SAFE_BROWSING)
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
index 7aa9e03d4fc3..943f8b9531b9 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/password_manager/password_store_factory.cc
-@@ -301,7 +301,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
- password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60,
+@@ -302,7 +302,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
network_context_getter);
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
+ profile);
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc
new file mode 100644
index 000000000000..4d7487bd2f26
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc
@@ -0,0 +1,38 @@
+--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/performance_monitor/process_metrics_history.cc
+@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() {
+ #if defined(OS_WIN)
+ disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond();
+ #endif
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond();
+ #endif
+ #if defined(OS_MACOSX)
+@@ -87,7 +87,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+ kDiskUsageHistogramMin, kDiskUsageHistogramMax,
+ kDiskUsageHistogramBucketCount);
+ #endif
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ UMA_HISTOGRAM_COUNTS_10000(
+ "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_);
+ #endif
+@@ -105,7 +105,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+ UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess",
+ true);
+ }
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ UMA_HISTOGRAM_COUNTS_10000(
+ "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_);
+ #endif
+@@ -122,7 +122,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+ kHistogramBucketCount);
+ if (cpu_usage_ > kHighCPUUtilizationThreshold)
+ UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true);
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess",
+ idle_wakeups_);
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h
new file mode 100644
index 000000000000..cb195b6b0cf5
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h
@@ -0,0 +1,11 @@
+--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/performance_monitor/process_metrics_history.h
+@@ -72,7 +72,7 @@ class ProcessMetricsHistory {
+ uint64_t disk_usage_ = 0;
+ #endif
+
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ int idle_wakeups_ = 0;
+ #endif
+ #if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h
index f5660041edd8..a7b46792e1bd 100644
--- a/www/chromium/files/patch-chrome_browser_platform__util.h
+++ b/www/chromium/files/patch-chrome_browser_platform__util.h
@@ -1,6 +1,6 @@
---- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/platform_util.h.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/platform_util.h
-@@ -40,7 +40,7 @@ enum OpenOperationResult {
+@@ -41,7 +41,7 @@ enum OpenOperationResult {
enum OpenItemType {
OPEN_FILE,
OPEN_FOLDER,
diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
new file mode 100644
index 000000000000..41051a24fa78
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-06-04 18:55:17 UTC
++++ chrome/browser/plugins/plugin_info_host_impl.cc
+@@ -411,7 +411,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
+ std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
+ if (cus_plugin_info) {
+ output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (cus_plugin_info->version != base::Version("0")) {
+ output->status = chrome::mojom::PluginStatus::kRestartRequired;
+ }
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index a61d59a37425..5d17a1dd0f59 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
#include "chrome/browser/policy/browser_signin_policy_handler.h"
#endif
@@ -9,7 +9,7 @@
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -962,7 +962,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kAllowPopupsDuringPageUnload,
base::Value::Type::BOOLEAN },
diff --git a/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc b/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc
deleted file mode 100644
index 73f455032c54..000000000000
--- a/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC
-+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc
-@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() {
- #endif
- }
-
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- void CleanupUnusedPolicyDirectory() {
- std::string enrollment_token =
- BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken();
-@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan
- void MachineLevelUserCloudPolicyController::Init(
- PrefService* local_state,
- scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- // This is a function that removes the directory we accidentally create due to
- // crbug.com/880870. The directory is only removed when it's empty and
- // enrollment token doesn't exist. This function is expected to be removed
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
index 8a88cf1b3f27..dac1f7e6fb9a 100644
--- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -185,6 +185,8 @@ class PolicyTestCase {
+@@ -183,6 +183,8 @@ class PolicyTestCase {
const std::string os("chromeos");
#elif defined(OS_LINUX)
const std::string os("linux");
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index aaca29e0e2dd..f21a30fc7cbc 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -331,7 +331,7 @@
+@@ -332,7 +332,7 @@
#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h"
#endif
@@ -9,7 +9,7 @@
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -802,7 +802,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
index 57bcccf51036..390f3f7adb9f 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC
+--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
-@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -183,7 +183,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar,
#endif
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
index 9908a5c69d8f..4daaedead87e 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/process_singleton_posix.cc
-@@ -93,11 +93,11 @@
+@@ -94,11 +94,11 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
@@ -14,7 +14,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -324,7 +324,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
@@ -23,7 +23,7 @@
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -903,7 +903,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+@@ -901,7 +901,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
return PROCESS_NONE;
} else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 6992a643d7db..a8549e03e6b0 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -325,7 +325,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !defined(OS_ANDROID)
MediaGalleriesPreferencesFactory::GetInstance();
#endif
diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
index 8da2f8202915..a9c1d5294f6d 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1500,7 +1500,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1531,7 +1531,7 @@ void RenderViewContextMenu::AppendEditableItems() {
// 'Undo' and 'Redo' for text input with no suggestions and no text selected.
// We make an exception for OS X as context clicking will select the closest
// word. In this case both items are always shown.
@@ -9,7 +9,7 @@
menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
IDS_CONTENT_CONTEXT_UNDO);
menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
-@@ -1542,7 +1542,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1573,7 +1573,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
if (!use_spelling)
return;
@@ -18,7 +18,7 @@
menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
#else
-@@ -1816,7 +1816,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
case IDC_CHECK_SPELLING_WHILE_TYPING:
return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index 492d51dba75a..45105fa21cce 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2019-04-30 22:22:34 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig 2019-06-04 18:55:17 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -29,7 +29,7 @@
#include "ui/base/cocoa/defaults_utils.h"
@@ -25,5 +25,5 @@
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
- content::UpdateFocusRingPreferencesFromSystemSettings(prefs);
#endif
+
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
index 881a83112e53..2d242ce878e6 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
@@ -1,8 +1,8 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
@@ -8,7 +8,12 @@
- #include "base/hash.h"
+ #include "base/hash/hash.h"
#include "base/logging.h"
+//XXX(rene) needs shim headers?
+#if defined(USE_SYSTEM_PROTOBUF)
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
new file mode 100644
index 000000000000..f8a2b34d89f3
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2019-06-07 20:47:39 UTC
++++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
+@@ -11,7 +11,7 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h"
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
+ #endif
+
+@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
+ // Instantiates all the handlers relevant to this platform.
+ void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers(
+ Profile* profile) {
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ applicable_handlers_.push_back(
+ std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile));
+ #elif defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc b/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
new file mode 100644
index 000000000000..5e96fe07a799
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2019-06-04 18:55:18 UTC
++++ chrome/browser/ssl/captive_portal_blocking_page.cc
+@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
+ wifi_service->GetConnectedNetworkSSID(&ssid, &error);
+ if (!error.empty())
+ return std::string();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ ssid = net::GetWifiSSID();
+ #elif defined(OS_ANDROID)
+ ssid = net::android::GetWifiSSID();
diff --git a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
index 7321793f7994..6c2f97d66cc7 100644
--- a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
+++ b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() {
+@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() {
#if defined(OS_ANDROID)
chrome::android::OpenDateAndTimeSettings();
@@ -9,12 +9,12 @@
struct ClockCommand {
const char* const pathname;
const char* const argument;
-@@ -222,7 +222,7 @@ void SSLErrorControllerClient::Proceed() {
+@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() {
+ }
bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \
+ defined(OS_WIN)
return true;
#else
- return false;
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index ec70c89c9cbd..79a597d1c3cf 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -427,7 +427,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
}
#endif // BUILDFLAG(ENABLE_APP_LIST)
@@ -9,8 +9,8 @@
// Dictionary sync is enabled by default.
if (!disabled_types.Has(syncer::DICTIONARY)) {
if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) {
-@@ -443,7 +443,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
+@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+ base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})));
}
}
-#endif // defined(OS_LINUX) || defined(OS_WIN)
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 5702d7653b95..4f8e8717df6e 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,5 +1,14 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
+@@ -36,7 +36,7 @@ constexpr int kUnsupportedVMRefreshFlags =
+ REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
+ REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
+ REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ REFRESH_TYPE_FD_COUNT |
+ #endif
+ REFRESH_TYPE_HARD_FAULTS;
@@ -119,9 +119,9 @@ class TaskGroup {
int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
#endif // BUILDFLAG(ENABLE_NACL)
@@ -11,8 +20,8 @@
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
- private:
-@@ -134,9 +134,9 @@ class TaskGroup {
+
+@@ -135,9 +135,9 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
@@ -24,7 +33,7 @@
void OnCpuRefreshDone(double cpu_usage);
void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
-@@ -205,10 +205,10 @@ class TaskGroup {
+@@ -206,10 +206,10 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
index 1f4bae75e90b..3a5e7410c48d 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler(
const OnCpuRefreshCallback& on_cpu_refresh,
const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -12,7 +12,7 @@
const OnProcessPriorityCallback& on_process_priority)
: process_(std::move(process)),
process_metrics_(CreateProcessMetrics(process_.Handle())),
-@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler(
on_cpu_refresh_callback_(on_cpu_refresh),
on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
on_idle_wakeups_callback_(on_idle_wakeups),
@@ -24,7 +24,7 @@
on_process_priority_callback_(on_process_priority) {
DCHECK(blocking_pool_runner.get());
-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
+@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
on_swapped_mem_refresh_callback_);
}
@@ -33,7 +33,7 @@
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
-@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
+@@ -95,9 +95,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
on_idle_wakeups_callback_);
}
@@ -45,7 +45,7 @@
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
-@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
+@@ -106,7 +106,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this),
on_open_fd_count_callback_);
}
@@ -54,7 +54,7 @@
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY,
refresh_flags)) {
-@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
+@@ -151,13 +151,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
return process_metrics_->GetIdleWakeupsPerSecond();
}
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
index 317827df924a..ee309764291e 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.h
@@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread
using OnCpuRefreshCallback = base::Callback<void(double)>;
@@ -36,7 +36,7 @@
bool RefreshProcessPriority();
// The process that holds the handle that we own so that we can use it for
-@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback on_cpu_refresh_callback_;
const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
const OnIdleWakeupsCallback on_idle_wakeups_callback_;
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index bb256bf4cf94..b83833d2e7d5 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -208,11 +208,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -210,11 +210,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 9bc880776ae1..b583e1f17ba3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -82,7 +82,7 @@
+@@ -80,7 +80,7 @@
#include "chrome/browser/ui/browser_commands_chromeos.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -220,7 +220,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -434,7 +434,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -879,7 +879,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -863,7 +863,7 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__window.h b/www/chromium/files/patch-chrome_browser_ui_browser__window.h
index 2ffa5c8dbd74..92fc3893e97a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__window.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_window.h.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/browser_window.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/browser_window.h
-@@ -426,7 +426,7 @@ class BrowserWindow : public ui::BaseWindow {
+@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow {
bool is_source_keyboard) = 0;
#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 6ada31571847..9d8d22ece35c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -84,7 +84,7 @@ static const char* kBadFlags[] = {
+@@ -88,7 +88,7 @@ static const char* kBadFlags[] = {
extensions::switches::kExtensionsOnChromeURLs,
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 429e0ccb08dd..dfd2913831b6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -79,7 +79,7 @@
+@@ -82,7 +82,7 @@
#include "chrome/browser/ui/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
-@@ -634,8 +634,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
}
#endif // OS_CHROMEOS
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 1dc0e38bfd96..d6566aa6c949 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -117,7 +117,7 @@
+@@ -118,7 +118,7 @@
#include "components/zoom/zoom_controller.h"
#endif // defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 7285edaccb44..ca8bdc608cac 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -439,13 +439,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
+@@ -451,13 +451,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();
@@ -16,7 +16,7 @@
case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: {
return stringifier_->GetKeepaliveCountText(
-@@ -605,7 +605,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -617,7 +617,7 @@ int TaskManagerTableModel::CompareValues(int row1,
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}
@@ -25,7 +25,7 @@
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -613,7 +613,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -625,7 +625,7 @@ int TaskManagerTableModel::CompareValues(int row1,
observed_task_manager()->GetOpenFdCount(tasks_[row2]);
return ValueCompare(proc1_fd_count, proc2_fd_count);
}
@@ -34,7 +34,7 @@
default:
NOTREACHED();
-@@ -779,11 +779,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -791,11 +791,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
type = REFRESH_TYPE_KEEPALIVE_COUNT;
break;
diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
index 97facbead071..de23a230f774 100644
--- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
+@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
return app_menu_icon_controller_->GetTypeAndSeverity().type ==
AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 02759854c0fa..a59c0a52a24f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -27,8 +27,8 @@
{ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR,
IDC_SHOW_BOOKMARK_BAR},
{ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS},
-@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
- {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN},
+@@ -124,14 +124,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
-#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index b27d15095a6c..a7bcfe28ecfd 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -33,7 +33,7 @@
#include "ui/wm/core/wm_state.h"
@@ -18,16 +18,16 @@
ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {}
-@@ -91,7 +91,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+ g_browser_process->system_network_context_manager()->GetContext());
}
- #endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
// On the Linux desktop, we want to prevent the user from logging in as root,
// so that we don't destroy the profile. Now that we have some minimal ui
// initialized, check to see if we're running as root and bail if we are.
-@@ -122,7 +122,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
base::RunLoop().RunUntilIdle();
exit(EXIT_FAILURE);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index 7f2632495c6e..59453a839cab 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
HICON GetSmallWindowIcon() const override;
int GetAppbarAutohideEdges(HMONITOR monitor,
- const base::Closure& callback) override;
+ base::OnceClosure callback) override;
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index e8039e05378e..03cfa74644dc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
#include "components/user_manager/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
#endif
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
namespace {
bool IsUsingGtkTheme(Profile* profile) {
@@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -105,7 +105,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -111,7 +111,7 @@ void BrowserFrame::InitBrowserFrame() {
non_client_view()->set_context_menu_controller(this);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index fcc74080d2d1..c286e0eac942 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1504,7 +1504,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
+@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
// light to dark mode.
const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
bool must_regenerate_frame;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 0184679537b3..432407bf13cc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -47,7 +47,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
@@ -9,8 +9,8 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
- void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
+@@ -353,7 +353,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source,
const gfx::Point& point,
const ui::Event* event) {
-#if defined(OS_LINUX)
@@ -18,7 +18,7 @@
views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
views::MenuRunner::HAS_MNEMONICS);
menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
-@@ -476,7 +476,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
+@@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index 329ca29c6d7b..0e2672a7af5f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -15,7 +15,7 @@
#include "components/sessions/core/tab_restore_service.h"
@@ -18,3 +18,12 @@
if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
PrefService* prefs = browser_->profile()->GetPrefs();
return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
+@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
+ }
+
+ bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ bool is_maximized = browser_->window()->IsMaximized();
+ switch (command_id) {
+ case IDC_MAXIMIZE_WINDOW:
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index ca3cec36db89..f094f7905db9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() {
+@@ -390,7 +390,7 @@ bool HungRendererDialogView::Cancel() {
content::RenderProcessHost* rph =
hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
if (rph) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index 26b5cc5c993b..1ab795897fe8 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -64,7 +64,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
+@@ -65,7 +65,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener)
: views::ImageButton(listener), tab_strip_(tab_strip) {
set_animate_on_state_change(true);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 48008fc42385..1a9200d9205b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -396,7 +396,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
+@@ -436,7 +436,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
// synchronous on desktop Linux, so use that.
// - Chrome OS
// Releasing capture on Ash cancels gestures so avoid it.
@@ -9,7 +9,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -822,7 +822,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
+@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
else
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
@@ -18,7 +18,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -1997,7 +1997,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca
exclude.insert(dragged_window);
}
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index fe0bcae96b25..2aea9636e194 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -198,11 +198,11 @@
+@@ -202,11 +202,11 @@
#include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
#endif
@@ -14,7 +14,7 @@
#include "chrome/browser/ui/webui/sandbox_internals_ui.h"
#endif
-@@ -320,7 +320,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -322,7 +322,7 @@ bool IsAboutUI(const GURL& url) {
#if !defined(OS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -23,7 +23,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if defined(OS_CHROMEOS)
-@@ -605,7 +605,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -619,7 +619,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -32,7 +32,7 @@
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
return &NewWebUI<ConstrainedWebDialogUI>;
#endif
-@@ -650,12 +650,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<CastUI>;
}
#endif
@@ -47,3 +47,9 @@
if (url.host_piece() == chrome::kChromeUIDiscardsHost)
return &NewWebUI<DiscardsUI>;
#endif
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
+ return &NewWebUI<BrowserSwitchUI>;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 0f1ab06c02df..1aad9db11c3b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-04-30 22:22:37 UTC
-+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -550,7 +550,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-06-04 18:55:18 UTC
++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
{"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
{"themes", IDS_SETTINGS_THEMES},
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -568,7 +568,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
{"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn
index dd7ac2a14a03..a13cf3b20a80 100644
--- a/www/chromium/files/patch-chrome_common_BUILD.gn
+++ b/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/BUILD.gn.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/BUILD.gn
-@@ -298,6 +298,10 @@ static_library("common") {
+@@ -306,6 +306,10 @@ static_library("common") {
public_deps += [ "//ppapi/shared_impl" ]
}
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 05a46ca8cebc..55ea8b7fe5b2 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_features.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_features.cc
-@@ -96,13 +96,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
- base::FEATURE_ENABLED_BY_DEFAULT};
- #endif // defined(OS_WIN) || defined(OS_MACOSX)
+@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc
+ base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif // defined(OS_ANDROID)
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -16,7 +16,7 @@
// Enables or disables whether permission prompts are automatically blocked
// after the user has explicitly dismissed them too many times.
-@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{
"ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -25,12 +25,12 @@
// Enables the dual certificate verification trial feature.
// https://crbug.com/649026
const base::Feature kCertDualVerificationTrialFeature{
-@@ -216,7 +216,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+ // Enables or disables windowing related features for desktop PWAs.
const base::Feature kDesktopPWAWindowing {
"DesktopPWAWindowing",
- #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_MACOSX)
-+ defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_MACOSX)
base::FEATURE_ENABLED_BY_DEFAULT
#else
- base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 9dbe451c3022..cb0d9a68581c 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.h.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_features.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_features.h
-@@ -66,10 +66,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kAutomaticTabDiscarding;
- #endif // defined(OS_WIN) || defined(OS_MACOSX)
+@@ -60,10 +60,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ extern const base::Feature kAutoFetchOnNetErrorPage;
+ #endif
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -13,7 +13,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBlockPromptsIfDismissedOften;
-@@ -89,7 +89,7 @@ extern const base::Feature kBrowserHangFixesExperiment
+@@ -79,7 +79,7 @@ extern const base::Feature kBrowserHangFixesExperiment
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBundledConnectionHelpFeature;
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 7204e171dfaf..41357f8211b1 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_paths.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_paths.cc
@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
@@ -34,7 +34,7 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -459,17 +459,19 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -48,15 +48,14 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) {
+ break;
}
#endif
- #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
-- defined(OS_MACOSX)
-+ defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || defined(OS_BSD) || \
+ defined(OS_MACOSX)
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
- return false;
@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
index 3fb733cf24c3..3283c4a35e38 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_paths_internal.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_paths_internal.h
-@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -47,7 +47,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index a745cfc0a35d..8b28f290fb44 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_switches.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_switches.cc
-@@ -905,12 +905,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
+@@ -878,12 +878,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
#endif
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index cfa5d6b0e9ef..854ec871e183 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_switches.h.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_switches.h
-@@ -279,12 +279,12 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -269,12 +269,12 @@ extern const char kAllowNaClFileHandleAPI[];
extern const char kAllowNaClSocketAPI[];
#endif
diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
index 3d9c9f081c82..f04b49402457 100644
--- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
+++ b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
@@ -1,6 +1,6 @@
---- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC
+--- chrome/common/extensions/api/api_sources.gni.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/extensions/api/api_sources.gni
-@@ -109,7 +109,7 @@ if (is_chromeos) {
+@@ -108,7 +108,7 @@ if (is_chromeos) {
"wallpaper.json",
"wallpaper_private.json",
]
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index d47f7a521c01..bbcd4ed5bd9a 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2019-04-30 22:22:38 UTC
+--- chrome/common/pref_names.cc.orig 2019-06-04 18:55:19 UTC
+++ chrome/common/pref_names.cc
-@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
+@@ -953,7 +953,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
// only using an account that belongs to one of the domains from this pref.
const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
-@@ -1043,7 +1043,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1047,7 +1047,7 @@ const char kShowUpdatePromotionInfoBar[] =
"browser.show_update_promotion_info_bar";
#endif
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1430,7 +1430,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1434,7 +1434,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";
@@ -27,3 +27,18 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
+@@ -1716,12 +1716,12 @@ const char kAuthAndroidNegotiateAccountType[] =
+ // domain sub-content requests.
+ const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
+ // along with kAuthNegotiateDelegateWhitelist.
+ const char kAuthNegotiateDelegateByKdcPolicy[] =
+ "auth.negotiate_delegate_by_kdc_policy";
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ #if defined(OS_POSIX)
+ // Boolean that specifies whether NTLMv2 is enabled.
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index b6cc11ac3076..5be274fc6212 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2019-04-30 22:22:38 UTC
+--- chrome/common/pref_names.h.orig 2019-06-04 18:55:19 UTC
+++ chrome/common/pref_names.h
-@@ -301,7 +301,7 @@ extern const char kHistoryMenuPromoShown[];
+@@ -302,7 +302,7 @@ extern const char kHistoryMenuPromoShown[];
extern const char kForceGoogleSafeSearch[];
extern const char kForceYouTubeRestrict[];
extern const char kAllowedDomainsForApps[];
@@ -9,7 +9,7 @@
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -334,7 +334,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -332,7 +332,7 @@ extern const char kDefaultBrowserSettingEnabled[];
#if defined(OS_MACOSX)
extern const char kShowUpdatePromotionInfoBar[];
#endif
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
-@@ -490,7 +490,7 @@ extern const char kAppWindowPlacement[];
+@@ -488,7 +488,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];
@@ -27,3 +27,15 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if defined(OS_ANDROID)
+@@ -692,9 +692,9 @@ extern const char kGSSAPILibraryName[];
+ extern const char kAuthAndroidNegotiateAccountType[];
+ extern const char kAllowCrossOriginAuthPrompt[];
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ extern const char kAuthNegotiateDelegateByKdcPolicy[];
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ #if defined(OS_POSIX)
+ extern const char kNtlmV2Enabled[];
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index 0178d066c1c3..a349d6d2512c 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2019-04-30 22:22:38 UTC
+--- chrome/common/webui_url_constants.cc.orig 2019-06-04 18:55:19 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -243,7 +243,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
+@@ -251,7 +251,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
const char kChromeUICastHost[] = "cast";
#endif
@@ -9,7 +9,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
const char kChromeUIHatsHost[] = "hats";
-@@ -254,17 +254,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
+@@ -262,17 +262,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
#endif
@@ -18,9 +18,9 @@
const char kChromeUISandboxHost[] = "sandbox";
#endif
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
#endif
@@ -30,7 +30,7 @@
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
#endif
-@@ -418,13 +418,13 @@ const char* const kChromeHostURLs[] = {
+@@ -463,13 +463,13 @@ const char* const kChromeHostURLs[] = {
kChromeUIInternetDetailDialogHost,
kChromeUIAssistantOptInHost,
#endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index f87fab6c631a..009fc83dd3df 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2019-04-30 22:22:38 UTC
+--- chrome/common/webui_url_constants.h.orig 2019-06-04 18:55:19 UTC
+++ chrome/common/webui_url_constants.h
-@@ -238,7 +238,7 @@ extern const char kChromeUIMetroFlowURL[];
+@@ -246,7 +246,7 @@ extern const char kChromeUIMetroFlowURL[];
extern const char kChromeUICastHost[];
#endif
@@ -9,7 +9,7 @@
extern const char kChromeUIDiscardsHost[];
extern const char kChromeUIDiscardsURL[];
extern const char kChromeUIHatsHost[];
-@@ -250,17 +250,17 @@ extern const char kChromeUIHatsURL[];
+@@ -258,17 +258,17 @@ extern const char kChromeUIHatsURL[];
extern const char kChromeUILinuxProxyConfigHost[];
#endif
@@ -18,9 +18,9 @@
extern const char kChromeUISandboxHost[];
#endif
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
#endif
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
index 4f7730c6c009..9e5a27985621 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-04-30 22:22:38 UTC
+--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-06-04 18:55:19 UTC
+++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1035,7 +1035,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -986,7 +986,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
}
case chrome::mojom::PluginStatus::kRestartRequired: {
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index c85786968784..1b6bc6ce6e8a 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2019-04-30 22:22:38 UTC
+--- chrome/test/BUILD.gn.orig 2019-06-04 18:55:19 UTC
+++ chrome/test/BUILD.gn
-@@ -5318,7 +5318,7 @@ test("chrome_app_unittests") {
+@@ -5399,7 +5399,7 @@ test("chrome_app_unittests") {
"//components/crash/core/common",
"//components/flags_ui:switches",
]
diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
index 46364dec4660..90b47cba6dc7 100644
--- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
+++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
@@ -1,4 +1,4 @@
---- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/test/base/in_process_browser_test.cc.orig 2019-06-04 18:55:19 UTC
+++ chrome/test/base/in_process_browser_test.cc
@@ -74,6 +74,10 @@
#include "chrome/test/base/scoped_bundle_swizzler_mac.h"
@@ -11,7 +11,7 @@
#if defined(OS_WIN)
#include "base/win/scoped_com_initializer.h"
#include "base/win/windows_version.h"
-@@ -102,7 +106,7 @@
+@@ -106,7 +110,7 @@
#include "ui/events/test/event_generator.h"
#endif // defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index 92d87008ea8f..b6da2ed23b8a 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,7 +1,7 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-04-30 22:22:40 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-06-04 18:55:20 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
@@ -67,7 +67,7 @@
- #include "ui/compositor/compositor_switches.h"
+ #include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_switches.h"
-#if defined(OS_LINUX)
@@ -9,7 +9,7 @@
#include <fontconfig/fontconfig.h>
#include <signal.h>
#include <sys/prctl.h>
-@@ -245,7 +245,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -263,7 +263,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{cc::switches::kDisableThreadedAnimation, ""},
#endif // defined(OS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -18,7 +18,7 @@
#if defined(ARCH_CPU_X86_FAMILY)
// This is needed for now to enable the x11 Ozone platform to work with
// current Linux/NVidia OpenGL drivers.
-@@ -255,7 +255,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -273,7 +273,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{switches::kEnableHardwareOverlays, "cast"},
#endif
#endif
@@ -27,7 +27,7 @@
// It's better to start GPU process on demand. For example, for TV platforms
// cast starts in background and can't render until TV switches to cast
// input.
-@@ -394,7 +394,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart()
+@@ -412,7 +412,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart()
}
void CastBrowserMainParts::ToolkitInitialized() {
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index 195c522244cf..de12823db6fa 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2019-04-30 22:22:40 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2019-06-04 18:55:20 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -559,7 +559,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -575,7 +575,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
index 3e40c44a59da..e90005f6196c 100644
--- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
+++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
@@ -1,7 +1,7 @@
---- chromecast/browser/metrics/BUILD.gn.orig 2019-04-30 22:22:40 UTC
+--- chromecast/browser/metrics/BUILD.gn.orig 2019-06-04 18:55:20 UTC
+++ chromecast/browser/metrics/BUILD.gn
-@@ -27,7 +27,7 @@ cast_source_set("metrics") {
- "//content/public/common",
+@@ -31,7 +31,7 @@ cast_source_set("metrics") {
+ "//third_party/metrics_proto",
]
- if (is_linux) {
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc
index 2583740d3c4c..9b6852216fb1 100644
--- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-04-30 22:22:40 UTC
+--- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-06-04 18:55:20 UTC
+++ chromecast/browser/metrics/cast_metrics_service_client.cc
-@@ -40,9 +40,9 @@
+@@ -38,9 +38,9 @@
#include "content/public/common/content_switches.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -12,7 +12,7 @@
#if defined(OS_ANDROID)
#include "chromecast/base/android/dumpstate_writer.h"
-@@ -62,10 +62,10 @@ const char kMetricsOldClientID[] = "user_experience_me
+@@ -60,10 +60,10 @@ const char kMetricsOldClientID[] = "user_experience_me
const char kClientIdName[] = "Client ID";
#else
@@ -26,8 +26,8 @@
const struct ChannelMap {
const char* chromecast_channel;
@@ -280,19 +280,19 @@ CastMetricsServiceClient::CastMetricsServiceClient(
- scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory)
- : pref_service_(pref_service),
+ : delegate_(delegate),
+ pref_service_(pref_service),
client_info_loaded_(false),
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h
index fc468ca98236..8f4202cc7940 100644
--- a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h
@@ -1,6 +1,6 @@
---- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-04-30 22:22:40 UTC
+--- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-06-04 18:55:20 UTC
+++ chromecast/browser/metrics/cast_metrics_service_client.h
-@@ -98,10 +98,10 @@ class CastMetricsServiceClient : public ::metrics::Met
+@@ -111,10 +111,10 @@ class CastMetricsServiceClient : public ::metrics::Met
std::string force_client_id_;
bool client_info_loaded_;
diff --git a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
index 0376d204aedd..f64cb5f727f3 100644
--- a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
+++ b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
@@ -1,4 +1,4 @@
---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-04-30 22:22:40 UTC
+--- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-06-04 18:55:21 UTC
+++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc
@@ -16,9 +16,9 @@
#include "chromecast/media/cma/backend/av_sync.h"
@@ -12,7 +12,7 @@
#if defined(OS_FUCHSIA)
#include <zircon/syscalls.h>
-@@ -228,7 +228,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
+@@ -239,7 +239,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner();
}
diff --git a/www/chromium/files/patch-components_autofill__strings.grdp b/www/chromium/files/patch-components_autofill__strings.grdp
deleted file mode 100644
index 4c460344c084..000000000000
--- a/www/chromium/files/patch-components_autofill__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill_strings.grdp.orig 2019-04-30 22:22:41 UTC
-+++ components/autofill_strings.grdp
-@@ -217,7 +217,7 @@
- <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
- Save card
- </message>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
- <then>
- <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
- Do you want to save this card to your Google Account?
diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
index 4ea93ce1bac1..6102d4b3edaf 100644
--- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
+++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
@@ -1,6 +1,6 @@
---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-06-04 18:55:21 UTC
+++ components/autofill/content/renderer/password_form_conversion_utils.cc
-@@ -37,7 +37,11 @@
+@@ -36,7 +36,11 @@
#include "third_party/blink/public/web/web_form_control_element.h"
#include "third_party/blink/public/web/web_input_element.h"
#include "third_party/blink/public/web/web_local_frame.h"
diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
index 63fb2231566d..c35f7619cbf4 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
@@ -1,24 +1,6 @@
---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-04-30 22:22:41 UTC
+--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-06-04 18:55:21 UTC
+++ components/autofill/core/browser/autofill_experiments.cc
-@@ -29,7 +29,7 @@
-
- namespace autofill {
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- const base::Feature kAutofillDropdownLayoutExperiment{
- "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT};
- const char kAutofillDropdownLayoutParameterName[] = "variant";
-@@ -37,7 +37,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
- const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon";
- const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] =
- "two-lines-leading-icon";
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- bool IsCreditCardUploadEnabled(const PrefService* pref_service,
- const syncer::SyncService* sync_service,
-@@ -144,7 +144,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
+@@ -227,7 +227,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
}
bool OfferStoreUnmaskedCards(bool is_off_the_record) {
@@ -27,20 +9,3 @@
// The checkbox can be forced on with a flag, but by default we don't store
// on Linux due to lack of system keychain integration. See crbug.com/162735
return base::CommandLine::ForCurrentProcess()->HasSwitch(
-@@ -182,7 +182,7 @@ bool ShouldUseActiveSignedInAccount() {
- features::kAutofillGetPaymentsIdentityFromSync);
- }
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- ForcedPopupLayoutState GetForcedPopupLayoutState() {
- if (!base::FeatureList::IsEnabled(
- autofill::kAutofillDropdownLayoutExperiment))
-@@ -206,6 +206,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() {
- NOTREACHED();
- return ForcedPopupLayoutState::kDefault;
- }
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- } // namespace autofill
diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h
deleted file mode 100644
index b7727fba91a8..000000000000
--- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC
-+++ components/autofill/core/browser/autofill_experiments.h
-@@ -23,13 +23,13 @@ class SyncService;
- namespace autofill {
-
- // Parameterized Features (grouped with parameter name and options)
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- extern const base::Feature kAutofillDropdownLayoutExperiment;
- extern const char kAutofillDropdownLayoutParameterName[];
- extern const char kAutofillDropdownLayoutParameterLeadingIcon[];
- extern const char kAutofillDropdownLayoutParameterTrailingIcon[];
- extern const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[];
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- // Returns true if uploading credit cards to Wallet servers is enabled. This
- // requires the appropriate flags and user settings to be true and the user to
-@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record);
- // Returns whether the account of the active signed-in user should be used.
- bool ShouldUseActiveSignedInAccount();
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- enum class ForcedPopupLayoutState {
- kDefault, // No popup layout forced by experiment.
- kLeadingIcon, // Experiment forces leading (left in LTR) icon layout.
-@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState {
- // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon
- // or kAutofillDropdownLayoutParameterTrailingIcon, respectively.
- ForcedPopupLayoutState GetForcedPopupLayoutState();
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- } // namespace autofill
-
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
new file mode 100644
index 000000000000..1beaa01507fc
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -0,0 +1,15 @@
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-06-04 18:55:21 UTC
++++ components/autofill/core/browser/personal_data_manager.cc
+@@ -1949,10 +1949,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
+
+ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
+ // The feature is only for Linux, Windows and Mac.
+-#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \
++#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || \
+ defined(OS_CHROMEOS)
+ return false;
+-#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) ||
++#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) ||
+ // defined(OS_CHROMEOS)
+
+ // This option should only be shown for users that have not enabled the Sync
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index 2c387d6b45ee..4c3918ed3c93 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC
+--- components/metrics/metrics_log.cc.orig 2019-06-04 18:55:21 UTC
+++ components/metrics/metrics_log.cc
-@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic
+@@ -197,7 +197,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic
// OperatingSystemVersion refers to the ChromeOS release version.
#if defined(OS_CHROMEOS)
os->set_kernel_version(base::SysInfo::KernelVersion());
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index 762c269bd4d4..e45e15c95769 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,4 +1,4 @@
---- components/policy/resources/policy_templates.json.orig 2019-04-30 22:22:43 UTC
+--- components/policy/resources/policy_templates.json.orig 2019-06-04 18:55:21 UTC
+++ components/policy/resources/policy_templates.json
@@ -984,7 +984,7 @@
'name': 'HomepageLocation',
@@ -36,7 +36,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -3338,7 +3338,7 @@
+@@ -3369,7 +3369,7 @@
'name': 'GSSAPILibraryName',
'type': 'string',
'schema': { 'type': 'string' },
@@ -45,7 +45,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -3390,7 +3390,7 @@
+@@ -3421,7 +3421,7 @@
'name': 'NtlmV2Enabled',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -54,7 +54,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -6448,7 +6448,7 @@
+@@ -6537,7 +6537,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -7578,7 +7578,7 @@
+@@ -7667,7 +7667,7 @@
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -8094,7 +8094,7 @@
+@@ -8183,7 +8183,7 @@
'name': 'FullscreenAllowed',
'type': 'main',
'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_services_font_font__service__app.cc b/www/chromium/files/patch-components_services_font_font__service__app.cc
deleted file mode 100644
index a3b5f0d436e1..000000000000
--- a/www/chromium/files/patch-components_services_font_font__service__app.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/services/font/font_service_app.cc.orig 2019-04-30 22:22:43 UTC
-+++ components/services/font/font_service_app.cc
-@@ -21,7 +21,7 @@
- #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/test/fontconfig_util_linux.h"
- #endif
-
diff --git a/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc b/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
deleted file mode 100644
index 6d0f62b2804d..000000000000
--- a/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC
-+++ components/sync/device_info/local_device_info_provider_impl.cc
-@@ -15,7 +15,7 @@ namespace {
- sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) {
- #if defined(OS_CHROMEOS)
- return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
- #elif defined(OS_ANDROID) || defined(OS_IOS)
- return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 5db305e07832..8dcb31f8c439 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2019-04-30 22:22:45 UTC
+--- content/browser/BUILD.gn.orig 2019-06-04 18:55:22 UTC
+++ content/browser/BUILD.gn
-@@ -1959,11 +1959,6 @@ jumbo_source_set("browser") {
+@@ -1982,11 +1982,6 @@ jumbo_source_set("browser") {
"tracing/cros_tracing_agent.h",
]
deps += [ "//chromeos/resources" ]
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 7fa5cc6e1e36..0e034f5a2b61 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC
+--- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC
+++ content/browser/browser_main_loop.cc
-@@ -250,6 +250,13 @@
+@@ -251,6 +251,13 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -14,7 +14,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -593,6 +600,11 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,21 +26,21 @@
#endif
#if defined(USE_X11)
-@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -636,7 +648,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ }
#endif // defined(OS_ANDROID) || defined(OS_CHROMEOS)
- #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_ANDROID)
-+ defined(OS_ANDROID) || defined(OS_BSD)
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
+ defined(OS_ANDROID)
// We use quite a few file descriptors for our IPC as well as disk the disk
// cache,and the default limit on the Mac is low (256), so bump it up.
-
-@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ // users can easily hit this limit with many open tabs. Bump up the limit to
// an arbitrarily high number. See https://crbug.com/539567
base::IncreaseFdLimitTo(8192);
- #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) ||
-- // defined(OS_ANDROID)
-+ // defined(OS_ANDROID) || defined(OS_BSD)
+-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) ||
++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ||
+ // defined(OS_ANDROID)
#if defined(OS_WIN)
- net::EnsureWinsockInit();
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 1d877f9a09d8..8bbab3b5f149 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2019-05-04 09:09:15 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -1071,7 +1071,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
+@@ -1082,7 +1082,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
std::unique_ptr<base::CommandLine> cmd_line =
std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
#else
diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc
index ee8b12acbe04..6ae21e6412c6 100644
--- a/www/chromium/files/patch-content_browser_media_media__internals.cc
+++ b/www/chromium/files/patch-content_browser_media_media__internals.cc
@@ -1,11 +1,11 @@
---- content/browser/media/media_internals.cc.orig 2019-04-30 22:22:46 UTC
+--- content/browser/media/media_internals.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/media/media_internals.cc
-@@ -766,7 +766,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+@@ -785,7 +785,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+ device_dict->SetString("id", descriptor.device_id);
device_dict->SetString("name", descriptor.GetNameAndModel());
device_dict->Set("formats", std::move(format_list));
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
-- defined(OS_ANDROID)
-+ defined(OS_ANDROID) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_ANDROID)
device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString());
#endif
- video_capture_capabilities_cached_data_.Append(std::move(device_dict));
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index cc4c2747f097..c8ba9a364c0c 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-05-04 09:04:28 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -231,7 +231,7 @@
#include "content/browser/compositor/image_transport_factory.h"
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include <sys/time.h>
#endif
-@@ -1214,7 +1214,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1211,7 +1211,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@@ -18,7 +18,16 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
-@@ -1643,7 +1643,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -1222,7 +1222,7 @@ size_t GetPlatformProcessLimit() {
+ #else
+ // TODO(https://crbug.com/104689): Implement on other platforms.
+ return kUnknownPlatformProcessLimit;
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+
+@@ -1636,7 +1636,7 @@ bool RenderProcessHostImpl::Init() {
renderer_prefix =
browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 01f2bfa6f20e..57078cc52adc 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-04-30 22:22:46 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-06-04 18:55:23 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -406,10 +406,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -401,10 +401,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
is_for_guests_only_ = is_for_guests_only;
}
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index 4d34292703dd..7ca66923447d 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-04-30 22:22:46 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr
+@@ -163,7 +163,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 3bba837a46fd..5405f6235346 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-04-30 22:22:46 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -123,7 +123,7 @@
+@@ -124,7 +124,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -2221,7 +2221,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2287,7 +2287,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
return NeedsInputGrab();
#endif
return false;
-@@ -2419,7 +2419,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2485,7 +2485,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 0317c81068ea..f2c74c926b5e 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -609,7 +609,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
if (event->type() == ui::ET_MOUSE_EXITED) {
if (mouse_locked || selection_popup)
return false;
diff --git a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
index f71c1f4eeed4..f59102abdd13 100644
--- a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
+++ b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
@@ -1,4 +1,4 @@
---- content/browser/service_manager/service_manager_context.cc.orig 2019-04-30 22:22:46 UTC
+--- content/browser/service_manager/service_manager_context.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/service_manager/service_manager_context.cc
@@ -99,7 +99,7 @@
#include "jni/ContentNfcDelegate_jni.h"
@@ -9,7 +9,7 @@
#include "components/services/font/font_service_app.h"
#include "components/services/font/public/interfaces/constants.mojom.h"
#endif
-@@ -387,12 +387,12 @@ void CreateInProcessAudioService(
+@@ -378,12 +378,12 @@ void CreateInProcessAudioService(
BrowserMainLoop::GetAudioManager(), std::move(request)));
}
@@ -24,7 +24,7 @@
std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
service_manager::mojom::ServiceRequest request) {
-@@ -614,7 +614,7 @@ ServiceManagerContext::ServiceManagerContext(
+@@ -605,7 +605,7 @@ ServiceManagerContext::ServiceManagerContext(
base::BindRepeating(&CreateVideoCaptureService));
}
diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl.cc b/www/chromium/files/patch-content_browser_storage__partition__impl.cc
deleted file mode 100644
index 3c7bfdd0bade..000000000000
--- a/www/chromium/files/patch-content_browser_storage__partition__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/storage_partition_impl.cc.orig 2019-04-30 22:22:46 UTC
-+++ content/browser/storage_partition_impl.cc
-@@ -773,7 +773,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
- // TODO(jam): enable for all, still used on WebView.
- // See copy of this ifdef in:
- // StoragePartitionImplMap::Get
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- if (base::FeatureList::IsEnabled(network::features::kNetworkService))
- NOTREACHED();
- #endif
diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc b/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
deleted file mode 100644
index c9eb89523cb2..000000000000
--- a/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/storage_partition_impl_map.cc.orig 2019-04-30 22:22:46 UTC
-+++ content/browser/storage_partition_impl_map.cc
-@@ -426,7 +426,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
- bool create_request_context = true;
- if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
- // These ifdefs should match StoragePartitionImpl::GetURLRequestContext.
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- create_request_context = false;
- #elif defined(OS_ANDROID)
- create_request_context =
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
index b179156ccf8b..f7c1d9642ea3 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host.cc.orig 2019-05-04 09:00:43 UTC
+--- content/browser/utility_process_host.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/utility_process_host.cc
-@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost(
+@@ -213,7 +213,7 @@ UtilityProcessHost::UtilityProcessHost(
: client_(client),
client_task_runner_(client_task_runner),
sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
index 52e024a14b9e..d5e03434e915 100644
--- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
+++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
@@ -1,6 +1,6 @@
---- content/browser/webui/shared_resources_data_source.cc.orig 2019-04-30 22:22:47 UTC
+--- content/browser/webui/shared_resources_data_source.cc.orig 2019-06-04 18:55:23 UTC
+++ content/browser/webui/shared_resources_data_source.cc
-@@ -102,9 +102,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
+@@ -101,9 +101,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
{IDR_MOJO_BIG_BUFFER_MOJOM_LITE_JS, "js/big_buffer.mojom-lite.js"},
{IDR_MOJO_FILE_MOJOM_LITE_JS, "js/file.mojom-lite.js"},
{IDR_MOJO_STRING16_MOJOM_LITE_JS, "js/string16.mojom-lite.js"},
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index da49aeb651da..18c6260202f9 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2019-04-30 22:22:47 UTC
+--- content/common/BUILD.gn.orig 2019-06-04 18:55:23 UTC
+++ content/common/BUILD.gn
-@@ -377,6 +377,12 @@ source_set("common") {
+@@ -375,6 +375,12 @@ source_set("common") {
libs += [ "android" ]
}
diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn
index ec8cd90795ce..ae4a514badf4 100644
--- a/www/chromium/files/patch-content_gpu_BUILD.gn
+++ b/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,6 +1,6 @@
---- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC
+--- content/gpu/BUILD.gn.orig 2019-06-04 18:55:23 UTC
+++ content/gpu/BUILD.gn
-@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") {
+@@ -124,7 +124,7 @@ target(link_target_type, "gpu_sources") {
# Use DRI on desktop Linux builds.
if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index c2bd54f54ced..507f6788c8d5 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -13,7 +13,7 @@
#include "build/build_config.h"
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/font_loader.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#endif
-@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -41,11 +41,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
bool sync_dir) override;
private:
diff --git a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
index 7b5450cd4120..de0f19f529d7 100644
--- a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
+++ b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
@@ -1,4 +1,4 @@
---- content/public/app/content_packaged_services_manifest.cc.orig 2019-04-30 22:22:47 UTC
+--- content/public/app/content_packaged_services_manifest.cc.orig 2019-06-04 18:55:23 UTC
+++ content/public/app/content_packaged_services_manifest.cc
@@ -23,7 +23,7 @@
#include "services/video_capture/public/cpp/manifest.h"
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/manifest.h" // nogncheck
#endif
-@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer
+@@ -63,7 +63,7 @@ const service_manager::Manifest& GetContentPackagedSer
.PackageService(tracing::GetManifest())
.PackageService(video_capture::GetManifest())
.PackageService(viz::GetManifest())
diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h
index be119b0b033f..bd32ffbf6314 100644
--- a/www/chromium/files/patch-content_public_common_child__process__host.h
+++ b/www/chromium/files/patch-content_public_common_child__process__host.h
@@ -1,6 +1,6 @@
---- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC
+--- content/public/common/child_process_host.h.orig 2019-06-04 18:55:23 UTC
+++ content/public/common/child_process_host.h
-@@ -47,7 +47,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
+@@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
// No special behavior requested.
CHILD_NORMAL = 0,
@@ -9,7 +9,7 @@
// Indicates that the child execed after forking may be execced from
// /proc/self/exe rather than using the "real" app path. This prevents
// autoupdate from confusing us if it changes the file out from under us.
-@@ -56,7 +56,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
+@@ -60,7 +60,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
// gdb). In this case, you'd use GetChildPath to get the real executable
// file name, and then prepend the GDB command to the command line.
CHILD_ALLOW_SELF = 1 << 0,
diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
index 3c1be570ceb5..97050b5cf57f 100644
--- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
+++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
@@ -1,6 +1,6 @@
---- content/public/common/common_param_traits_macros.h.orig 2019-04-30 22:22:47 UTC
+--- content/public/common/common_param_traits_macros.h.orig 2019-06-04 18:55:23 UTC
+++ content/public/common/common_param_traits_macros.h
-@@ -330,7 +330,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
+@@ -331,7 +331,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index c81eb3c51df9..571c55458c84 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_features.cc.orig 2019-04-30 22:22:47 UTC
+--- content/public/common/content_features.cc.orig 2019-06-04 18:55:23 UTC
+++ content/public/common/content_features.cc
-@@ -541,7 +541,7 @@ const base::Feature kWebAssemblyThreads {
+@@ -559,7 +559,7 @@ const base::Feature kWebAssemblyThreads {
};
// Enable WebAssembly trap handler.
@@ -9,7 +9,7 @@
defined(ARCH_CPU_X86_64)
const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -576,7 +576,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
+@@ -594,7 +594,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
// https://w3c.github.io/webauthn
const base::Feature kWebAuthCable {
"WebAuthenticationCable",
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index d33ebd1592a4..551441cfb891 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2019-04-30 22:22:47 UTC
+--- content/public/common/content_switches.cc.orig 2019-06-04 18:55:23 UTC
+++ content/public/common/content_switches.cc
-@@ -974,7 +974,7 @@ const char kDisableAudioSupportForDesktopShare[] =
+@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation";
const char kDisablePanelFitting[] = "disable-panel-fitting";
#endif
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index 9357ebdf49af..7e6bd5f8314a 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig 2019-04-30 22:22:47 UTC
+--- content/public/common/content_switches.h.orig 2019-06-04 18:55:23 UTC
+++ content/public/common/content_switches.h
-@@ -272,7 +272,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
+@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
CONTENT_EXPORT extern const char kDisablePanelFitting[];
#endif
diff --git a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
index cb6e8ea8c523..c1a03f802347 100644
--- a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
+++ b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
@@ -1,11 +1,11 @@
---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-04-30 22:22:47 UTC
+--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/media/audio/audio_device_factory.cc
-@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
-
+@@ -35,7 +35,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
namespace {
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// Due to driver deadlock issues on Windows (http://crbug/422522) there is a
// chance device authorization response is never received from the browser side.
+ // In this case we will time out, to avoid renderer hang forever waiting for
diff --git a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
index 82527438f4a3..e99ce330e9fd 100644
--- a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
+++ b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
@@ -1,15 +1,15 @@
---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-04-30 22:22:47 UTC
+--- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/media/stream/processed_local_audio_source.cc
-@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier =
- const_cast<void**>(&kProcessedLocalAudioSourceIdentifier);
+@@ -80,7 +80,7 @@ void LogAudioProcesingProperties(
+ } // namespace
- bool ApmInAudioServiceEnabled() {
+ bool IsApmInAudioServiceEnabled() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
#else
return false;
-@@ -402,7 +402,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
+@@ -406,7 +406,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
bool key_pressed) {
#if defined(OS_WIN) || defined(OS_MACOSX)
DCHECK_LE(volume, 1.0);
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index 153f389402ac..3eb2dcd8f640 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig 2019-05-04 08:57:40 UTC
+--- content/renderer/render_process_impl.cc.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/render_process_impl.cc
-@@ -163,7 +163,7 @@ RenderProcessImpl::RenderProcessImpl(
+@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl(
SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
"--no-wasm-trap-handler");
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index d1679ca5f8fd..03a7cdfad5c5 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_thread_impl.cc.orig 2019-04-30 22:22:47 UTC
+--- content/renderer/render_thread_impl.cc.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/render_thread_impl.cc
@@ -191,12 +191,21 @@
#include "mojo/public/cpp/bindings/message_dumper.h"
@@ -40,12 +40,7 @@
render_message_filter()->SetThreadPriority(
ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
#endif
-@@ -1329,11 +1338,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
- gpu::kGpuFeatureStatusEnabled);
- const bool enable_gpu_memory_buffers =
- !is_gpu_compositing_disabled_ &&
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+@@ -1332,7 +1341,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
#else
cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index cbf1811092a4..6d7ab6884b04 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-04-30 22:22:47 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -111,7 +111,7 @@
+@@ -113,7 +113,7 @@
#if defined(OS_MACOSX)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -206,7 +206,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
->Clone();
thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
@@ -18,7 +18,7 @@
font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
SkFontConfigInterface::SetGlobal(font_loader_);
#endif
-@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -215,7 +215,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
connector_ = service_manager::Connector::Create(&request);
}
@@ -27,7 +27,7 @@
if (g_sandbox_enabled && sandboxEnabled()) {
#if defined(OS_MACOSX)
sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
-@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
+@@ -243,7 +243,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
}
void RendererBlinkPlatformImpl::Shutdown() {
@@ -36,7 +36,7 @@
// SandboxSupport contains a map of OutOfProcessFont objects, which hold
// WebStrings and WebVectors, which become invalidated when blink is shut
// down. Hence, we need to clear that map now, just before blink::shutdown()
-@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
+@@ -324,7 +324,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
base::PlatformThreadId thread_id) {
@@ -45,7 +45,7 @@
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
render_thread->render_message_filter()->SetThreadPriority(
thread_id, base::ThreadPriority::DISPLAY);
-@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -337,7 +337,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index d9c45a56c8f7..1a432146787a 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,15 +1,15 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2019-04-30 22:22:47 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC
+++ content/renderer/renderer_blink_platform_impl.h
@@ -30,7 +30,7 @@
#include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
- #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h"
+ #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
std::unique_ptr<service_manager::Connector> connector_;
scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
@@ -18,9 +18,9 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -302,7 +302,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
- blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
- scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
+@@ -311,7 +311,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+ std::unique_ptr<blink::WebTransmissionEncodingInfoHandler>
+ web_transmission_encoding_info_handler_;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 7e4cb78da138..4454beb5747c 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2019-04-30 22:22:47 UTC
+--- content/shell/BUILD.gn.orig 2019-06-04 18:55:23 UTC
+++ content/shell/BUILD.gn
-@@ -934,7 +934,7 @@ group("content_shell_crash_test") {
+@@ -947,7 +947,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
index 2be54e0a8040..1cb41f0e4fbc 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC
+--- content/shell/browser/shell_browser_context.cc.orig 2019-06-04 18:55:23 UTC
+++ content/shell/browser/shell_browser_context.cc
-@@ -28,7 +28,7 @@
+@@ -30,7 +30,7 @@
#if defined(OS_WIN)
#include "base/base_paths_win.h"
@@ -9,7 +9,7 @@
#include "base/nix/xdg_util.h"
#elif defined(OS_MACOSX)
#include "base/base_paths_mac.h"
-@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
+@@ -108,7 +108,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
#if defined(OS_WIN)
CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
path_ = path_.Append(std::wstring(L"content_shell"));
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 5176c7191552..2d060a4979d9 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,12 +1,12 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
@@ -48,7 +48,7 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
- #include "ui/base/ime/input_method_initializer.h"
++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+ #include "ui/base/ime/init/input_method_initializer.h"
#endif
#if defined(OS_CHROMEOS)
@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
index cfb8a0cb8b2c..ad856fcc3d60 100644
--- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-04-30 22:22:48 UTC
+--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC
+++ content/shell/browser/web_test/web_test_browser_main_parts.cc
@@ -42,7 +42,7 @@
#if defined(USE_AURA) && defined(USE_X11)
@@ -6,6 +6,6 @@
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
- #include "ui/base/ime/input_method_initializer.h"
+ #include "ui/base/ime/init/input_method_initializer.h"
#endif
diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
index ecdcc7c8c05b..2441104b8d0d 100644
--- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
+++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
@@ -1,6 +1,6 @@
---- content/shell/test_runner/test_runner.cc.orig 2019-04-30 22:22:48 UTC
+--- content/shell/test_runner/test_runner.cc.orig 2019-06-04 18:55:23 UTC
+++ content/shell/test_runner/test_runner.cc
-@@ -65,7 +65,7 @@
+@@ -66,7 +66,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/skia_util.h"
@@ -9,7 +9,7 @@
#include "third_party/blink/public/platform/web_font_render_style.h"
#endif
-@@ -1544,7 +1544,7 @@ void TestRunner::Reset() {
+@@ -1546,7 +1546,7 @@ void TestRunner::Reset() {
drag_image_.reset();
blink::WebSecurityPolicy::ClearOriginAccessList();
@@ -18,7 +18,7 @@
blink::WebFontRenderStyle::SetSubpixelPositioning(false);
#endif
-@@ -2087,7 +2087,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
+@@ -2075,7 +2075,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
}
void TestRunner::SetTextSubpixelPositioning(bool value) {
diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn
index 4db9a662777c..a12985011fa7 100644
--- a/www/chromium/files/patch-device_bluetooth_BUILD.gn
+++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn
@@ -1,6 +1,6 @@
---- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC
+--- device/bluetooth/BUILD.gn.orig 2019-06-04 18:55:23 UTC
+++ device/bluetooth/BUILD.gn
-@@ -277,7 +277,7 @@ component("bluetooth") {
+@@ -274,7 +274,7 @@ component("bluetooth") {
]
}
diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
index 336b1eec540d..4d7296969f8f 100644
--- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
+++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,9 +1,9 @@
---- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC
+--- device/gamepad/gamepad_provider.cc.orig 2019-06-04 18:55:24 UTC
+++ device/gamepad/gamepad_provider.cc
-@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
- monitor->AddDevicesChangedObserver(this);
+@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
- polling_thread_.reset(new base::Thread("Gamepad polling thread"));
+ if (!polling_thread_)
+ polling_thread_.reset(new base::Thread("Gamepad polling thread"));
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On Linux, the data fetcher needs to watch file descriptors, so the message
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc
index 0bd29eae3f82..4f222e5fe7e0 100644
--- a/www/chromium/files/patch-device_usb_usb__service__impl.cc
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc
@@ -1,9 +1,9 @@
---- device/usb/usb_service_impl.cc.orig 2019-04-30 22:22:48 UTC
+--- device/usb/usb_service_impl.cc.orig 2019-06-04 18:55:24 UTC
+++ device/usb/usb_service_impl.cc
-@@ -233,8 +233,10 @@ UsbServiceImpl::UsbServiceImpl()
- }
+@@ -234,8 +234,10 @@ UsbServiceImpl::UsbServiceImpl()
UsbServiceImpl::~UsbServiceImpl() {
+ NotifyWillDestroyUsbService();
+#if !defined(OS_FREEBSD)
if (hotplug_enabled_)
libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
@@ -11,7 +11,7 @@
}
void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) {
-@@ -289,6 +291,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -290,6 +292,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
context_ = std::move(context);
@@ -19,7 +19,7 @@
int rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -301,6 +304,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -302,6 +305,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
// This will call any enumeration callbacks queued while initializing.
RefreshDevices();
@@ -27,7 +27,7 @@
#if defined(OS_WIN)
DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-@@ -497,6 +501,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
+@@ -498,6 +502,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
device->OnDisconnect();
}
@@ -35,7 +35,7 @@
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
libusb_device* device_raw,
-@@ -530,6 +535,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
+@@ -531,6 +536,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
return 0;
}
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index fe4e306decb4..69a2fd402969 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2019-04-30 22:22:49 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2019-06-04 18:55:24 UTC
+++ extensions/browser/api/messaging/message_service.cc
-@@ -60,7 +60,7 @@ namespace {
+@@ -61,7 +61,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
"Could not establish connection. Receiving end does not exist.";
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -374,7 +374,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp(
if (!opener_port->IsValidPort())
return;
@@ -18,7 +18,7 @@
bool has_permission = extension->permissions_data()->HasAPIPermission(
APIPermission::kNativeMessaging);
if (!has_permission) {
-@@ -420,11 +420,11 @@ void MessageService::OpenChannelToNativeApp(
+@@ -433,11 +433,11 @@ void MessageService::OpenChannelToNativeApp(
channel->opener->IncrementLazyKeepaliveCount();
AddChannel(std::move(channel), receiver_port_id);
@@ -31,4 +31,4 @@
+#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
}
- void MessageService::OpenChannelToTab(int source_process_id,
+ void MessageService::OpenChannelToTab(const ChannelEndpoint& source,
diff --git a/www/chromium/files/patch-fix-gn-74 b/www/chromium/files/patch-fix-gn-74
deleted file mode 100644
index 1cbe4a33ad72..000000000000
--- a/www/chromium/files/patch-fix-gn-74
+++ /dev/null
@@ -1,716 +0,0 @@
---- tools/gn/build/gen.py.orig 2019-06-01 16:49:59 UTC
-+++ tools/gn/build/gen.py
-@@ -530,6 +530,7 @@ def WriteGNNinja(path, platform, host, options):
- 'tools/gn/setup.cc',
- 'tools/gn/source_dir.cc',
- 'tools/gn/source_file.cc',
-+ 'tools/gn/source_file_type.cc',
- 'tools/gn/standard_out.cc',
- 'tools/gn/string_utils.cc',
- 'tools/gn/substitution_list.cc',
---- tools/gn/tools/gn/binary_target_generator.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/binary_target_generator.cc
-@@ -68,38 +68,6 @@ void BinaryTargetGenerator::DoRun() {
- return;
- }
-
--bool BinaryTargetGenerator::FillSources() {
-- bool ret = TargetGenerator::FillSources();
-- for (std::size_t i = 0; i < target_->sources().size(); ++i) {
-- const auto& source = target_->sources()[i];
-- switch (source.type()) {
-- case SourceFile::SOURCE_CPP:
-- case SourceFile::SOURCE_H:
-- case SourceFile::SOURCE_C:
-- case SourceFile::SOURCE_M:
-- case SourceFile::SOURCE_MM:
-- case SourceFile::SOURCE_S:
-- case SourceFile::SOURCE_ASM:
-- case SourceFile::SOURCE_O:
-- // These are allowed.
-- break;
-- case SourceFile::SOURCE_RC:
-- case SourceFile::SOURCE_DEF:
-- case SourceFile::SOURCE_RS:
-- case SourceFile::SOURCE_GO:
-- case SourceFile::SOURCE_UNKNOWN:
-- case SourceFile::SOURCE_NUMTYPES:
-- *err_ =
-- Err(scope_->GetValue(variables::kSources, true)->list_value()[i],
-- std::string("Only source, header, and object files belong in "
-- "the sources of a ") +
-- Target::GetStringForOutputType(target_->output_type()) +
-- ". " + source.value() + " is not one of the valid types.");
-- }
-- }
-- return ret;
--}
--
- bool BinaryTargetGenerator::FillCompleteStaticLib() {
- if (target_->output_type() == Target::STATIC_LIBRARY) {
- const Value* value = scope_->GetValue(variables::kCompleteStaticLib, true);
---- tools/gn/tools/gn/binary_target_generator.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/binary_target_generator.h
-@@ -22,7 +22,6 @@ class BinaryTargetGenerator : public TargetGenerator {
-
- protected:
- void DoRun() override;
-- bool FillSources() override;
-
- private:
- bool FillCompleteStaticLib();
---- tools/gn/tools/gn/c_tool.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/c_tool.h
-@@ -12,6 +12,7 @@
- #include "tools/gn/label.h"
- #include "tools/gn/label_ptr.h"
- #include "tools/gn/scope.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/substitution_list.h"
- #include "tools/gn/substitution_pattern.h"
- #include "tools/gn/tool.h"
---- tools/gn/tools/gn/compile_commands_writer.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/compile_commands_writer.cc
-@@ -122,7 +122,7 @@ void WriteCommand(const Target* target,
- const CompileFlags& flags,
- std::vector<OutputFile>& tool_outputs,
- PathOutput& path_output,
-- SourceFile::Type source_type,
-+ SourceFileType source_type,
- const char* tool_name,
- EscapeOptions opts,
- std::string* compile_commands) {
-@@ -144,16 +144,16 @@ void WriteCommand(const Target* target,
- } else if (range.type == &CSubstitutionCFlags) {
- command_out << flags.cflags;
- } else if (range.type == &CSubstitutionCFlagsC) {
-- if (source_type == SourceFile::SOURCE_C)
-+ if (source_type == SOURCE_C)
- command_out << flags.cflags_c;
- } else if (range.type == &CSubstitutionCFlagsCc) {
-- if (source_type == SourceFile::SOURCE_CPP)
-+ if (source_type == SOURCE_CPP)
- command_out << flags.cflags_cc;
- } else if (range.type == &CSubstitutionCFlagsObjC) {
-- if (source_type == SourceFile::SOURCE_M)
-+ if (source_type == SOURCE_M)
- command_out << flags.cflags_objc;
- } else if (range.type == &CSubstitutionCFlagsObjCc) {
-- if (source_type == SourceFile::SOURCE_MM)
-+ if (source_type == SOURCE_MM)
- command_out << flags.cflags_objcc;
- } else if (range.type == &SubstitutionLabel ||
- range.type == &SubstitutionLabelName ||
-@@ -222,11 +222,9 @@ void CompileCommandsWriter::RenderJSON(const BuildSett
- for (const auto& source : target->sources()) {
- // If this source is not a C/C++/ObjC/ObjC++ source (not header) file,
- // continue as it does not belong in the compilation database.
-- SourceFile::Type source_type = source.type();
-- if (source_type != SourceFile::SOURCE_CPP &&
-- source_type != SourceFile::SOURCE_C &&
-- source_type != SourceFile::SOURCE_M &&
-- source_type != SourceFile::SOURCE_MM)
-+ SourceFileType source_type = GetSourceFileType(source);
-+ if (source_type != SOURCE_CPP && source_type != SOURCE_C &&
-+ source_type != SOURCE_M && source_type != SOURCE_MM)
- continue;
-
- const char* tool_name = Tool::kToolNone;
-@@ -324,4 +322,4 @@ void CompileCommandsWriter::VisitDeps(const Target* ta
- VisitDeps(pair.ptr, visited);
- }
- }
--}
-+}
-\ No newline at end of file
---- tools/gn/tools/gn/general_tool.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/general_tool.h
-@@ -11,6 +11,7 @@
- #include "base/macros.h"
- #include "tools/gn/label.h"
- #include "tools/gn/label_ptr.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/substitution_list.h"
- #include "tools/gn/substitution_pattern.h"
- #include "tools/gn/tool.h"
---- tools/gn/tools/gn/header_checker.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/header_checker.cc
-@@ -18,6 +18,7 @@
- #include "tools/gn/err.h"
- #include "tools/gn/filesystem_utils.h"
- #include "tools/gn/scheduler.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/target.h"
- #include "tools/gn/trace.h"
- #include "util/worker_pool.h"
-@@ -151,10 +152,9 @@ void HeaderChecker::RunCheckOverFiles(const FileMap& f
-
- for (const auto& file : files) {
- // Only check C-like source files (RC files also have includes).
-- SourceFile::Type type = file.first.type();
-- if (type != SourceFile::SOURCE_CPP && type != SourceFile::SOURCE_H &&
-- type != SourceFile::SOURCE_C && type != SourceFile::SOURCE_M &&
-- type != SourceFile::SOURCE_MM && type != SourceFile::SOURCE_RC)
-+ SourceFileType type = GetSourceFileType(file.first);
-+ if (type != SOURCE_CPP && type != SOURCE_H && type != SOURCE_C &&
-+ type != SOURCE_M && type != SOURCE_MM && type != SOURCE_RC)
- continue;
-
- if (!check_generated_) {
---- tools/gn/tools/gn/ninja_binary_target_writer.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/ninja_binary_target_writer.cc
-@@ -23,23 +23,22 @@
- #include "tools/gn/ninja_utils.h"
- #include "tools/gn/scheduler.h"
- #include "tools/gn/settings.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/string_utils.h"
- #include "tools/gn/substitution_writer.h"
- #include "tools/gn/target.h"
-
- bool NinjaBinaryTargetWriter::SourceFileTypeSet::CSourceUsed() {
-- return Get(SourceFile::SOURCE_CPP) || Get(SourceFile::SOURCE_H) ||
-- Get(SourceFile::SOURCE_C) || Get(SourceFile::SOURCE_M) ||
-- Get(SourceFile::SOURCE_MM) || Get(SourceFile::SOURCE_RC) ||
-- Get(SourceFile::SOURCE_S);
-+ return Get(SOURCE_CPP) || Get(SOURCE_H) || Get(SOURCE_C) || Get(SOURCE_M) ||
-+ Get(SOURCE_MM) || Get(SOURCE_RC) || Get(SOURCE_S);
- }
-
- bool NinjaBinaryTargetWriter::SourceFileTypeSet::RustSourceUsed() {
-- return Get(SourceFile::SOURCE_RS);
-+ return Get(SOURCE_RS);
- }
-
- bool NinjaBinaryTargetWriter::SourceFileTypeSet::GoSourceUsed() {
-- return Get(SourceFile::SOURCE_GO);
-+ return Get(SOURCE_GO);
- }
-
- NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const Target* target,
-@@ -50,6 +49,10 @@ NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const
- NinjaBinaryTargetWriter::~NinjaBinaryTargetWriter() = default;
-
- void NinjaBinaryTargetWriter::Run() {
-+ SourceFileTypeSet used_types;
-+ for (const auto& source : target_->sources())
-+ used_types.Set(GetSourceFileType(source));
-+
- NinjaCBinaryTargetWriter writer(target_, out_);
- writer.Run();
- }
---- tools/gn/tools/gn/ninja_binary_target_writer.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/ninja_binary_target_writer.h
-@@ -23,12 +23,11 @@ class NinjaBinaryTargetWriter : public NinjaTargetWrit
- class SourceFileTypeSet {
- public:
- SourceFileTypeSet() {
-- memset(flags_, 0,
-- sizeof(bool) * static_cast<int>(SourceFile::SOURCE_NUMTYPES));
-+ memset(flags_, 0, sizeof(bool) * static_cast<int>(SOURCE_NUMTYPES));
- }
-
-- void Set(SourceFile::Type type) { flags_[static_cast<int>(type)] = true; }
-- bool Get(SourceFile::Type type) const {
-+ void Set(SourceFileType type) { flags_[static_cast<int>(type)] = true; }
-+ bool Get(SourceFileType type) const {
- return flags_[static_cast<int>(type)];
- }
-
-@@ -37,7 +36,7 @@ class NinjaBinaryTargetWriter : public NinjaTargetWrit
- bool GoSourceUsed();
-
- private:
-- bool flags_[static_cast<int>(SourceFile::SOURCE_NUMTYPES)];
-+ bool flags_[static_cast<int>(SOURCE_NUMTYPES)];
- };
-
- NinjaBinaryTargetWriter(const Target* target, std::ostream& out);
---- tools/gn/tools/gn/ninja_c_binary_target_writer.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/ninja_c_binary_target_writer.cc
-@@ -24,6 +24,7 @@
- #include "tools/gn/ninja_utils.h"
- #include "tools/gn/scheduler.h"
- #include "tools/gn/settings.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/string_utils.h"
- #include "tools/gn/substitution_writer.h"
- #include "tools/gn/target.h"
-@@ -66,27 +67,27 @@ void AddSourceSetObjectFiles(const Target* source_set,
- if (source_set->GetOutputFilesForSource(source, &tool_name, &tool_outputs))
- obj_files->push_back(tool_outputs[0]);
-
-- used_types.Set(source.type());
-+ used_types.Set(GetSourceFileType(source));
- }
-
- // Add MSVC precompiled header object files. GCC .gch files are not object
- // files so they are omitted.
- if (source_set->config_values().has_precompiled_headers()) {
-- if (used_types.Get(SourceFile::SOURCE_C)) {
-+ if (used_types.Get(SOURCE_C)) {
- const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCc);
- if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) {
- GetPCHOutputFiles(source_set, CTool::kCToolCc, &tool_outputs);
- obj_files->Append(tool_outputs.begin(), tool_outputs.end());
- }
- }
-- if (used_types.Get(SourceFile::SOURCE_CPP)) {
-+ if (used_types.Get(SOURCE_CPP)) {
- const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCxx);
- if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) {
- GetPCHOutputFiles(source_set, CTool::kCToolCxx, &tool_outputs);
- obj_files->Append(tool_outputs.begin(), tool_outputs.end());
- }
- }
-- if (used_types.Get(SourceFile::SOURCE_M)) {
-+ if (used_types.Get(SOURCE_M)) {
- const CTool* tool =
- source_set->toolchain()->GetToolAsC(CTool::kCToolObjC);
- if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) {
-@@ -94,7 +95,7 @@ void AddSourceSetObjectFiles(const Target* source_set,
- obj_files->Append(tool_outputs.begin(), tool_outputs.end());
- }
- }
-- if (used_types.Get(SourceFile::SOURCE_MM)) {
-+ if (used_types.Get(SOURCE_MM)) {
- const CTool* tool =
- source_set->toolchain()->GetToolAsC(CTool::kCToolObjCxx);
- if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) {
-@@ -118,7 +119,7 @@ void NinjaCBinaryTargetWriter::Run() {
- // Figure out what source types are needed.
- SourceFileTypeSet used_types;
- for (const auto& source : target_->sources())
-- used_types.Set(source.type());
-+ used_types.Set(GetSourceFileType(source));
-
- WriteCompilerVars(used_types);
-
-@@ -234,34 +235,31 @@ void NinjaCBinaryTargetWriter::WriteCompilerVars(
- target_->config_values().has_precompiled_headers();
-
- EscapeOptions opts = GetFlagOptions();
-- if (used_types.Get(SourceFile::SOURCE_S) ||
-- used_types.Get(SourceFile::SOURCE_ASM)) {
-+ if (used_types.Get(SOURCE_S) || used_types.Get(SOURCE_ASM)) {
- WriteOneFlag(target_, &CSubstitutionAsmFlags, false, Tool::kToolNone,
- &ConfigValues::asmflags, opts, path_output_, out_);
- }
-- if (used_types.Get(SourceFile::SOURCE_C) ||
-- used_types.Get(SourceFile::SOURCE_CPP) ||
-- used_types.Get(SourceFile::SOURCE_M) ||
-- used_types.Get(SourceFile::SOURCE_MM)) {
-+ if (used_types.Get(SOURCE_C) || used_types.Get(SOURCE_CPP) ||
-+ used_types.Get(SOURCE_M) || used_types.Get(SOURCE_MM)) {
- WriteOneFlag(target_, &CSubstitutionCFlags, false, Tool::kToolNone,
- &ConfigValues::cflags, opts, path_output_, out_);
- }
-- if (used_types.Get(SourceFile::SOURCE_C)) {
-+ if (used_types.Get(SOURCE_C)) {
- WriteOneFlag(target_, &CSubstitutionCFlagsC, has_precompiled_headers,
- CTool::kCToolCc, &ConfigValues::cflags_c, opts, path_output_,
- out_);
- }
-- if (used_types.Get(SourceFile::SOURCE_CPP)) {
-+ if (used_types.Get(SOURCE_CPP)) {
- WriteOneFlag(target_, &CSubstitutionCFlagsCc, has_precompiled_headers,
- CTool::kCToolCxx, &ConfigValues::cflags_cc, opts, path_output_,
- out_);
- }
-- if (used_types.Get(SourceFile::SOURCE_M)) {
-+ if (used_types.Get(SOURCE_M)) {
- WriteOneFlag(target_, &CSubstitutionCFlagsObjC, has_precompiled_headers,
- CTool::kCToolObjC, &ConfigValues::cflags_objc, opts,
- path_output_, out_);
- }
-- if (used_types.Get(SourceFile::SOURCE_MM)) {
-+ if (used_types.Get(SOURCE_MM)) {
- WriteOneFlag(target_, &CSubstitutionCFlagsObjCc, has_precompiled_headers,
- CTool::kCToolObjCxx, &ConfigValues::cflags_objcc, opts,
- path_output_, out_);
-@@ -321,14 +319,14 @@ void NinjaCBinaryTargetWriter::WritePCHCommands(
-
- const CTool* tool_c = target_->toolchain()->GetToolAsC(CTool::kCToolCc);
- if (tool_c && tool_c->precompiled_header_type() != CTool::PCH_NONE &&
-- used_types.Get(SourceFile::SOURCE_C)) {
-+ used_types.Get(SOURCE_C)) {
- WritePCHCommand(&CSubstitutionCFlagsC, CTool::kCToolCc,
- tool_c->precompiled_header_type(), input_dep,
- order_only_deps, object_files, other_files);
- }
- const CTool* tool_cxx = target_->toolchain()->GetToolAsC(CTool::kCToolCxx);
- if (tool_cxx && tool_cxx->precompiled_header_type() != CTool::PCH_NONE &&
-- used_types.Get(SourceFile::SOURCE_CPP)) {
-+ used_types.Get(SOURCE_CPP)) {
- WritePCHCommand(&CSubstitutionCFlagsCc, CTool::kCToolCxx,
- tool_cxx->precompiled_header_type(), input_dep,
- order_only_deps, object_files, other_files);
-@@ -336,7 +334,7 @@ void NinjaCBinaryTargetWriter::WritePCHCommands(
-
- const CTool* tool_objc = target_->toolchain()->GetToolAsC(CTool::kCToolObjC);
- if (tool_objc && tool_objc->precompiled_header_type() == CTool::PCH_GCC &&
-- used_types.Get(SourceFile::SOURCE_M)) {
-+ used_types.Get(SOURCE_M)) {
- WritePCHCommand(&CSubstitutionCFlagsObjC, CTool::kCToolObjC,
- tool_objc->precompiled_header_type(), input_dep,
- order_only_deps, object_files, other_files);
-@@ -345,7 +343,7 @@ void NinjaCBinaryTargetWriter::WritePCHCommands(
- const CTool* tool_objcxx =
- target_->toolchain()->GetToolAsC(CTool::kCToolObjCxx);
- if (tool_objcxx && tool_objcxx->precompiled_header_type() == CTool::PCH_GCC &&
-- used_types.Get(SourceFile::SOURCE_MM)) {
-+ used_types.Get(SOURCE_MM)) {
- WritePCHCommand(&CSubstitutionCFlagsObjCc, CTool::kCToolObjCxx,
- tool_objcxx->precompiled_header_type(), input_dep,
- order_only_deps, object_files, other_files);
-@@ -478,7 +476,7 @@ void NinjaCBinaryTargetWriter::WriteSources(
- deps.resize(0);
- const char* tool_name = Tool::kToolNone;
- if (!target_->GetOutputFilesForSource(source, &tool_name, &tool_outputs)) {
-- if (source.type() == SourceFile::SOURCE_DEF)
-+ if (GetSourceFileType(source) == SOURCE_DEF)
- other_files->push_back(source);
- continue; // No output for this source.
- }
-@@ -599,7 +597,7 @@ void NinjaCBinaryTargetWriter::WriteLinkerStuff(
- const SourceFile* optional_def_file = nullptr;
- if (!other_files.empty()) {
- for (const SourceFile& src_file : other_files) {
-- if (src_file.type() == SourceFile::SOURCE_DEF) {
-+ if (GetSourceFileType(src_file) == SOURCE_DEF) {
- optional_def_file = &src_file;
- implicit_deps.push_back(
- OutputFile(settings_->build_settings(), src_file));
---- tools/gn/tools/gn/source_dir.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/source_dir.cc
-@@ -98,10 +98,10 @@ SourceFile SourceDir::ResolveRelativeFile(
- return ret;
-
- const std::string& input_string = p.string_value();
-- if (!ValidateResolveInput<std::string>(true, p, input_string, err))
-+ if (!ValidateResolveInput<std::string>(true, p, input_string, err)) {
- return ret;
--
-- ret.SetValue(ResolveRelative(input_string, value_, true, source_root));
-+ }
-+ ret.value_ = ResolveRelative(input_string, value_, true, source_root);
- return ret;
- }
-
---- tools/gn/tools/gn/source_file_type.cc.orig 2019-06-01 16:50:13 UTC
-+++ tools/gn/tools/gn/source_file_type.cc
-@@ -0,0 +1,37 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "tools/gn/source_file_type.h"
-+
-+#include "tools/gn/filesystem_utils.h"
-+#include "tools/gn/source_file.h"
-+
-+SourceFileType GetSourceFileType(const SourceFile& file) {
-+ base::StringPiece extension = FindExtension(&file.value());
-+ if (extension == "cc" || extension == "cpp" || extension == "cxx")
-+ return SOURCE_CPP;
-+ if (extension == "h" || extension == "hpp" || extension == "hxx" ||
-+ extension == "hh")
-+ return SOURCE_H;
-+ if (extension == "c")
-+ return SOURCE_C;
-+ if (extension == "m")
-+ return SOURCE_M;
-+ if (extension == "mm")
-+ return SOURCE_MM;
-+ if (extension == "rc")
-+ return SOURCE_RC;
-+ if (extension == "S" || extension == "s" || extension == "asm")
-+ return SOURCE_S;
-+ if (extension == "o" || extension == "obj")
-+ return SOURCE_O;
-+ if (extension == "def")
-+ return SOURCE_DEF;
-+ if (extension == "rs")
-+ return SOURCE_RS;
-+ if (extension == "go")
-+ return SOURCE_GO;
-+
-+ return SOURCE_UNKNOWN;
-+}
---- tools/gn/tools/gn/source_file_type.h.orig 2019-06-01 16:50:13 UTC
-+++ tools/gn/tools/gn/source_file_type.h
-@@ -0,0 +1,34 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef TOOLS_GN_SOURCE_FILE_TYPE_H_
-+#define TOOLS_GN_SOURCE_FILE_TYPE_H_
-+
-+class SourceFile;
-+
-+// This should be sequential integers starting from 0 so they can be used as
-+// array indices.
-+enum SourceFileType {
-+ SOURCE_UNKNOWN = 0,
-+ SOURCE_ASM,
-+ SOURCE_C,
-+ SOURCE_CPP,
-+ SOURCE_H,
-+ SOURCE_M,
-+ SOURCE_MM,
-+ SOURCE_S,
-+ SOURCE_RC,
-+ SOURCE_O, // Object files can be inputs, too. Also counts .obj.
-+ SOURCE_DEF,
-+
-+ SOURCE_RS,
-+ SOURCE_GO,
-+
-+ // Must be last.
-+ SOURCE_NUMTYPES,
-+};
-+
-+SourceFileType GetSourceFileType(const SourceFile& file);
-+
-+#endif // TOOLS_GN_SOURCE_FILE_TYPE_H_
---- tools/gn/tools/gn/source_file.cc.orig 2019-06-01 16:50:13 UTC
-+++ tools/gn/tools/gn/source_file.cc
-@@ -21,45 +21,15 @@ void AssertValueSourceFileString(const std::string& s)
- DCHECK(!EndsWithSlash(s)) << s;
- }
-
--SourceFile::Type GetSourceFileType(const std::string& file) {
-- base::StringPiece extension = FindExtension(&file);
-- if (extension == "cc" || extension == "cpp" || extension == "cxx")
-- return SourceFile::SOURCE_CPP;
-- if (extension == "h" || extension == "hpp" || extension == "hxx" ||
-- extension == "hh" || extension == "inc")
-- return SourceFile::SOURCE_H;
-- if (extension == "c")
-- return SourceFile::SOURCE_C;
-- if (extension == "m")
-- return SourceFile::SOURCE_M;
-- if (extension == "mm")
-- return SourceFile::SOURCE_MM;
-- if (extension == "rc")
-- return SourceFile::SOURCE_RC;
-- if (extension == "S" || extension == "s" || extension == "asm")
-- return SourceFile::SOURCE_S;
-- if (extension == "o" || extension == "obj")
-- return SourceFile::SOURCE_O;
-- if (extension == "def")
-- return SourceFile::SOURCE_DEF;
-- if (extension == "rs")
-- return SourceFile::SOURCE_RS;
-- if (extension == "go")
-- return SourceFile::SOURCE_GO;
--
-- return SourceFile::SOURCE_UNKNOWN;
--}
--
- } // namespace
-
--SourceFile::SourceFile() : type_(SOURCE_UNKNOWN) {}
-+SourceFile::SourceFile() = default;
-
- SourceFile::SourceFile(const base::StringPiece& p)
- : value_(p.data(), p.size()) {
- DCHECK(!value_.empty());
- AssertValueSourceFileString(value_);
- NormalizePath(&value_);
-- type_ = GetSourceFileType(value_);
- }
-
- SourceFile::SourceFile(SwapIn, std::string* value) {
-@@ -67,7 +37,6 @@ SourceFile::SourceFile(SwapIn, std::string* value) {
- DCHECK(!value_.empty());
- AssertValueSourceFileString(value_);
- NormalizePath(&value_);
-- type_ = GetSourceFileType(value_);
- }
-
- SourceFile::~SourceFile() = default;
-@@ -92,9 +61,4 @@ SourceDir SourceFile::GetDir() const {
-
- base::FilePath SourceFile::Resolve(const base::FilePath& source_root) const {
- return ResolvePath(value_, true, source_root);
--}
--
--void SourceFile::SetValue(const std::string& value) {
-- value_ = value;
-- type_ = GetSourceFileType(value_);
- }
---- tools/gn/tools/gn/source_file.h.orig 2019-06-01 16:50:13 UTC
-+++ tools/gn/tools/gn/source_file.h
-@@ -74,15 +74,10 @@ class SourceFile {
- return value_ < other.value_;
- }
-
-- void swap(SourceFile& other) {
-- value_.swap(other.value_);
-- std::swap(type_, other.type_);
-- }
-+ void swap(SourceFile& other) { value_.swap(other.value_); }
-
- private:
- friend class SourceDir;
--
-- void SetValue(const std::string& value);
-
- std::string value_;
-
---- tools/gn/tools/gn/target_generator.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/target_generator.h
-@@ -47,7 +47,7 @@ class TargetGenerator {
-
- const BuildSettings* GetBuildSettings() const;
-
-- virtual bool FillSources();
-+ bool FillSources();
- bool FillPublic();
- bool FillConfigs();
- bool FillOutputs(bool allow_substitutions);
---- tools/gn/tools/gn/target.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/target.cc
-@@ -16,6 +16,7 @@
- #include "tools/gn/filesystem_utils.h"
- #include "tools/gn/functions.h"
- #include "tools/gn/scheduler.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/substitution_writer.h"
- #include "tools/gn/tool.h"
- #include "tools/gn/toolchain.h"
-@@ -486,10 +487,10 @@ bool Target::GetOutputFilesForSource(const SourceFile&
- outputs->clear();
- *computed_tool_type = Tool::kToolNone;
-
-- SourceFile::Type file_type = source.type();
-- if (file_type == SourceFile::SOURCE_UNKNOWN)
-+ SourceFileType file_type = GetSourceFileType(source);
-+ if (file_type == SOURCE_UNKNOWN)
- return false;
-- if (file_type == SourceFile::SOURCE_O) {
-+ if (file_type == SOURCE_O) {
- // Object files just get passed to the output and not compiled.
- outputs->push_back(OutputFile(settings()->build_settings(), source));
- return true;
---- tools/gn/tools/gn/tool.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/tool.cc
-@@ -261,27 +261,27 @@ std::unique_ptr<Tool> Tool::CreateTool(const std::stri
- }
-
- // static
--const char* Tool::GetToolTypeForSourceType(SourceFile::Type type) {
-+const char* Tool::GetToolTypeForSourceType(SourceFileType type) {
- switch (type) {
-- case SourceFile::SOURCE_C:
-+ case SOURCE_C:
- return CTool::kCToolCc;
-- case SourceFile::SOURCE_CPP:
-+ case SOURCE_CPP:
- return CTool::kCToolCxx;
-- case SourceFile::SOURCE_M:
-+ case SOURCE_M:
- return CTool::kCToolObjC;
-- case SourceFile::SOURCE_MM:
-+ case SOURCE_MM:
- return CTool::kCToolObjCxx;
-- case SourceFile::SOURCE_ASM:
-- case SourceFile::SOURCE_S:
-+ case SOURCE_ASM:
-+ case SOURCE_S:
- return CTool::kCToolAsm;
-- case SourceFile::SOURCE_RC:
-+ case SOURCE_RC:
- return CTool::kCToolRc;
-- case SourceFile::SOURCE_UNKNOWN:
-- case SourceFile::SOURCE_H:
-- case SourceFile::SOURCE_O:
-- case SourceFile::SOURCE_DEF:
-- case SourceFile::SOURCE_GO:
-- case SourceFile::SOURCE_RS:
-+ case SOURCE_UNKNOWN:
-+ case SOURCE_H:
-+ case SOURCE_O:
-+ case SOURCE_DEF:
-+ case SOURCE_GO:
-+ case SOURCE_RS:
- return kToolNone;
- default:
- NOTREACHED();
---- tools/gn/tools/gn/tool.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/tool.h
-@@ -12,7 +12,7 @@
- #include "tools/gn/label.h"
- #include "tools/gn/label_ptr.h"
- #include "tools/gn/scope.h"
--#include "tools/gn/source_file.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/substitution_list.h"
- #include "tools/gn/substitution_pattern.h"
-
-@@ -171,7 +171,7 @@ class Tool {
- Toolchain* toolchain,
- Err* err);
-
-- static const char* GetToolTypeForSourceType(SourceFile::Type type);
-+ static const char* GetToolTypeForSourceType(SourceFileType type);
- static const char* GetToolTypeForTargetFinalOutput(const Target* target);
-
- protected:
---- tools/gn/tools/gn/toolchain.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/toolchain.cc
-@@ -88,16 +88,16 @@ void Toolchain::ToolchainSetupComplete() {
- setup_complete_ = true;
- }
-
--const Tool* Toolchain::GetToolForSourceType(SourceFile::Type type) const {
-+const Tool* Toolchain::GetToolForSourceType(SourceFileType type) const {
- return GetTool(Tool::GetToolTypeForSourceType(type));
- }
-
--const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFile::Type type) const {
-+const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFileType type) const {
- return GetToolAsC(Tool::GetToolTypeForSourceType(type));
- }
-
- const GeneralTool* Toolchain::GetToolForSourceTypeAsGeneral(
-- SourceFile::Type type) const {
-+ SourceFileType type) const {
- return GetToolAsGeneral(Tool::GetToolTypeForSourceType(type));
- }
-
---- tools/gn/tools/gn/toolchain.h.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/toolchain.h
-@@ -12,6 +12,7 @@
- #include "tools/gn/item.h"
- #include "tools/gn/label_ptr.h"
- #include "tools/gn/scope.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/substitution_type.h"
- #include "tools/gn/tool.h"
- #include "tools/gn/value.h"
-@@ -87,9 +88,9 @@ class Toolchain : public Item {
- }
-
- // Returns the tool for compiling the given source file type.
-- const Tool* GetToolForSourceType(SourceFile::Type type) const;
-- const CTool* GetToolForSourceTypeAsC(SourceFile::Type type) const;
-- const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFile::Type type) const;
-+ const Tool* GetToolForSourceType(SourceFileType type) const;
-+ const CTool* GetToolForSourceTypeAsC(SourceFileType type) const;
-+ const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFileType type) const;
-
- // Returns the tool that produces the final output for the given target type.
- // This isn't necessarily the tool you would expect. For copy target, this
---- tools/gn/tools/gn/visual_studio_writer.cc.orig 2019-05-21 22:00:02 UTC
-+++ tools/gn/tools/gn/visual_studio_writer.cc
-@@ -24,6 +24,7 @@
- #include "tools/gn/label_pattern.h"
- #include "tools/gn/parse_tree.h"
- #include "tools/gn/path_output.h"
-+#include "tools/gn/source_file_type.h"
- #include "tools/gn/standard_out.h"
- #include "tools/gn/target.h"
- #include "tools/gn/variables.h"
diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
index d372604c006a..28d60e8b1438 100644
--- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,4 +1,4 @@
---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-05-04 08:44:56 UTC
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-06-04 18:55:24 UTC
+++ google_apis/gcm/engine/heartbeat_manager.cc
@@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
// Minimum time spent sleeping before we force a new heartbeat.
@@ -34,3 +34,20 @@
}
void HeartbeatManager::CheckForMissedHeartbeat() {
+@@ -213,14 +213,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
+ return;
+ }
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Otherwise check again later.
+ base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ FROM_HERE,
+ base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
+ weak_ptr_factory_.GetWeakPtr()),
+ base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ }
+
+ void HeartbeatManager::UpdateHeartbeatInterval() {
diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
index a79056f2f9cf..f503dac620b2 100644
--- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
uint32_t GetPlatformSpecificTextureTarget() {
@@ -7,5 +7,5 @@
-#elif defined(OS_ANDROID) || defined(OS_LINUX)
+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
return GL_TEXTURE_EXTERNAL_OES;
- #elif defined(OS_WIN)
+ #elif defined(OS_WIN) || defined(OS_FUCHSIA)
return GL_TEXTURE_2D;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
new file mode 100644
index 000000000000..5b78e4c1edba
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -0,0 +1,29 @@
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-06-04 18:55:24 UTC
++++ gpu/command_buffer/service/external_vk_image_backing.cc
+@@ -18,7 +18,7 @@
+ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
+ #endif
+
+@@ -140,7 +140,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
+ #if defined(OS_FUCHSIA)
+ NOTIMPLEMENTED_LOG_ONCE();
+ return nullptr;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ if (!texture_) {
+ VkMemoryGetFdInfoKHR get_fd_info;
+ get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
+@@ -202,7 +202,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
+ }
+ return std::make_unique<ExternalVkImageGlRepresentation>(
+ manager, this, tracker, texture_, texture_->service_id());
+-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
++#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
+ #error Unsupported OS
+ #endif
+ }
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
new file mode 100644
index 000000000000..83495ad0fe0e
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
@@ -0,0 +1,20 @@
+--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-06-04 18:55:24 UTC
++++ gpu/command_buffer/service/external_vk_image_gl_representation.cc
+@@ -128,7 +128,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
+ #if defined(OS_FUCHSIA)
+ NOTIMPLEMENTED_LOG_ONCE();
+ return 0;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ if (handle.vk_handle_type() !=
+ VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
+ DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
+@@ -143,7 +143,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
+ fd.release());
+
+ return gl_semaphore;
+-#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX)
++#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD)
+ #error Unsupported OS
+ #endif
+ }
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
index 3b7af1803ca1..b03603d96bda 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
@@ -1,7 +1,7 @@
---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC
+--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/command_buffer/tests/gl_test_utils.cc
-@@ -22,7 +22,7 @@
- #include "ui/gfx/geometry/size.h"
+@@ -23,7 +23,7 @@
+ #include "ui/gl/gl_version_info.h"
#include "ui/gl/init/gl_factory.h"
-#if defined(OS_LINUX)
@@ -9,7 +9,7 @@
#include "ui/gl/gl_image_native_pixmap.h"
#endif
-@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
+@@ -429,7 +429,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
}
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index fbf362282dab..d158686e6f56 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC
+--- gpu/config/gpu_control_list.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/config/gpu_control_list.cc
@@ -16,7 +16,11 @@
#include "base/values.h"
@@ -21,7 +21,7 @@
return kGLTypeGL;
#elif defined(OS_MACOSX)
return kGLTypeGL;
-@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -700,7 +704,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
return kOsAndroid;
#elif defined(OS_FUCHSIA)
return kOsFuchsia;
diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
index a930facd388a..5f486e27a8cf 100644
--- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/ipc/common/gpu_memory_buffer_support.cc
@@ -12,7 +12,7 @@
#include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
@@ -6,10 +6,19 @@
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
#include "ui/gfx/client_native_pixmap_factory.h"
#include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
-@@ -37,7 +37,7 @@ namespace gpu {
+ #endif
+@@ -22,7 +22,7 @@
+ #include "ui/ozone/public/ozone_platform.h"
+ #endif
+
+-#if defined(USE_OZONE) || defined(OS_LINUX)
++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD)
+ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
+ #endif
+
+@@ -40,7 +40,7 @@ namespace gpu {
GpuMemoryBufferSupport::GpuMemoryBufferSupport() {
#if defined(USE_OZONE)
client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
@@ -18,16 +27,16 @@
client_native_pixmap_factory_.reset(
gfx::CreateClientNativePixmapFactoryDmabuf());
#endif
-@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
+@@ -54,7 +54,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
return gfx::IO_SURFACE_BUFFER;
#elif defined(OS_ANDROID)
return gfx::ANDROID_HARDWARE_BUFFER;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || defined(USE_OZONE)
++#elif defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
return gfx::NATIVE_PIXMAP;
#elif defined(OS_WIN)
return gfx::DXGI_SHARED_HANDLE;
-@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
+@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
#elif defined(USE_OZONE)
return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
format, usage);
@@ -36,12 +45,12 @@
return false; // TODO(julian.isorce): Add linux support.
#elif defined(OS_WIN)
switch (usage) {
-@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
+@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
return GpuMemoryBufferImplIOSurface::CreateFromHandle(
std::move(handle), size, format, usage, std::move(callback));
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
case gfx::NATIVE_PIXMAP:
return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
client_native_pixmap_factory(), std::move(handle), size, format,
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index d077e2e95c77..579cba128615 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig 2019-04-30 22:22:49 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/ipc/service/gpu_init.cc
@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
}
@@ -9,6 +9,15 @@
bool CanAccessNvidiaDeviceFile() {
bool res = true;
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() {
+ }
+ return res;
+ }
+-#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
++#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
+
+ } // namespace
+
@@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
// crash during feature collection.
gpu::SetKeysForCrashLogging(gpu_info_);
@@ -27,3 +36,48 @@
// On Chrome OS ARM Mali, GPU driver userspace creates threads when
// initializing a GL context, so start the sandbox early.
// TODO(zmo): Need to collect OS version before this.
+@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
+ attempted_startsandbox = true;
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) && !defined(OS_BSD)
+
+ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
+
+@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ InitializeDirectCompositionOverlaySupport(&gpu_info_);
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Driver may create a compatibility profile context when collect graphics
+ // information on Linux platform. Try to collect graphics information
+ // based on core profile context after disabling platform extensions.
+@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ }
+ }
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ if (use_swiftshader) {
+ AdjustInfoToSwiftShader();
+@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+ InitializeDirectCompositionOverlaySupport(&gpu_info_);
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Driver may create a compatibility profile context when collect graphics
+ // information on Linux platform. Try to collect graphics information
+ // based on core profile context after disabling platform extensions.
+@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+ }
+ }
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ if (use_swiftshader) {
+ AdjustInfoToSwiftShader();
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
index 774599403f09..fc8d721f4aca 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
@@ -1,11 +1,11 @@
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/ipc/service/gpu_memory_buffer_factory.cc
@@ -12,7 +12,7 @@
#include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
#include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
#endif
@@ -13,8 +13,8 @@
return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
#elif defined(OS_ANDROID)
return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || defined(OS_FUCHSIA)
++#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap);
#elif defined(OS_WIN)
return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
index c030d54a8b8a..900372366661 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.cc
-@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000;
+@@ -54,8 +54,10 @@ const int kGpuTimeout = 10000;
#endif
#if defined(USE_X11)
@@ -11,7 +11,7 @@
const unsigned char text[20] = "check";
#endif
-@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread()
+@@ -78,8 +80,10 @@ GpuWatchdogThread::GpuWatchdogThread()
display_(nullptr),
window_(0),
atom_(x11::None),
@@ -22,7 +22,7 @@
weak_factory_(this) {
base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
-@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread()
+@@ -94,7 +98,9 @@ GpuWatchdogThread::GpuWatchdogThread()
#endif
#if defined(USE_X11)
@@ -32,7 +32,7 @@
SetupXServer();
#endif
base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
-@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() {
+@@ -242,8 +248,10 @@ GpuWatchdogThread::~GpuWatchdogThread() {
power_monitor->RemoveObserver(this);
#if defined(USE_X11)
@@ -43,7 +43,7 @@
if (display_) {
DCHECK(window_);
XDestroyWindow(display_, window_);
-@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover
+@@ -467,7 +475,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover
return;
#endif
@@ -52,7 +52,7 @@
// Don't crash if we're not on the TTY of our host X11 server.
int active_tty = GetActiveTTY();
if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
-@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() {
+@@ -554,7 +562,9 @@ void GpuWatchdogThread::SetupXServer() {
CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
atom_ = XInternAtom(display_, "CHECK", x11::False);
}
@@ -62,7 +62,7 @@
}
void GpuWatchdogThread::SetupXChangeProp() {
-@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT
+@@ -657,7 +667,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT
}
#endif
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
index ea9edd7d8ce0..782be406427b 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-06-04 18:55:24 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.h
-@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
+@@ -195,8 +195,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
XDisplay* display_;
gfx::AcceleratedWidget window_;
XAtom atom_;
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index bba3fffcfd2b..c10bfa481ca5 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-04-30 22:22:49 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-06-04 18:55:24 UTC
+++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -310,7 +310,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -305,7 +305,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
#endif
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 747fd95f2c63..bcf27d2ad1a8 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,12 +1,13 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-05-04 12:16:20 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-06-04 18:55:24 UTC
+++ gpu/vulkan/vulkan_function_pointers.h
-@@ -114,12 +114,12 @@ struct VulkanFunctionPointers {
+@@ -131,13 +131,13 @@ struct VulkanFunctionPointers {
#endif
// Device functions shared between Linux and Android.
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr;
+ PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr;
#endif
// Linux-only device functions.
@@ -15,14 +16,16 @@
PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
#endif
-@@ -245,12 +245,12 @@ struct VulkanFunctionPointers {
- gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn
+@@ -286,14 +286,14 @@ struct VulkanFunctionPointers {
+ ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
#define vkGetSemaphoreFdKHR \
gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn
+ #define vkImportSemaphoreFdKHR \
+ gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn
#endif
-#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
index 6cd14cc0bb2b..36ed1838d3ff 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
+++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC
+--- headless/lib/browser/headless_content_browser_client.h.orig 2019-06-04 18:55:24 UTC
+++ headless/lib/browser/headless_content_browser_client.h
-@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C
+@@ -35,7 +35,7 @@ class HeadlessContentBrowserClient : public content::C
::storage::OptionalQuotaSettingsCallback callback) override;
content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
content::BrowserContext* context) override;
diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc
index e483961a2640..662865cc76f0 100644
--- a/www/chromium/files/patch-ipc_ipc__channel__common.cc
+++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC
+--- ipc/ipc_channel_common.cc.orig 2019-06-04 18:55:25 UTC
+++ ipc/ipc_channel_common.cc
@@ -9,7 +9,7 @@
@@ -9,3 +9,12 @@
namespace {
int g_global_pid = 0;
+@@ -25,7 +25,7 @@ int Channel::GetGlobalPid() {
+ return g_global_pid;
+ }
+
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ // static
+ std::unique_ptr<Channel> Channel::CreateClient(
diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
index 3a90d60689d4..83e7e79932aa 100644
--- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
+++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC
+--- ipc/ipc_channel_mojo.cc.orig 2019-06-04 18:55:25 UTC
+++ ipc/ipc_channel_mojo.cc
-@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory {
+@@ -64,10 +64,10 @@ class MojoChannelFactory : public ChannelFactory {
};
base::ProcessId GetSelfPID() {
@@ -8,4 +8,8 @@
+#if defined(OS_LINUX) || defined(OS_BSD)
if (int global_pid = Channel::GetGlobalPid())
return global_pid;
- #endif // OS_LINUX
+-#endif // OS_LINUX
++#endif // OS_LINUX || OS_BSD
+ #if defined(OS_NACL)
+ return -1;
+ #else
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
index ae32e31c76cd..6b3f197c066a 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC
+--- ipc/ipc_message_utils.cc.orig 2019-06-04 18:55:25 UTC
+++ ipc/ipc_message_utils.cc
-@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
+@@ -356,7 +356,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
+ l->append(base::NumberToString(p));
}
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
-- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
-+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
void ParamTraits<long>::Log(const param_type& p, std::string* l) {
l->append(base::NumberToString(p));
- }
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
index 1d0395498400..b3744d4c0d96 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC
+--- ipc/ipc_message_utils.h.orig 2019-06-04 18:55:25 UTC
+++ ipc/ipc_message_utils.h
@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> {
+ // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long.
// Since we want to support Android 32<>64 bit IPC, as long as we don't have
// these traits for 32 bit ARM then that'll catch any errors.
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
-- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
-+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
template <>
struct ParamTraits<long> {
- typedef long param_type;
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index 08c0915c9573..93cc2c74270f 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig 2019-04-30 22:22:52 UTC
+--- media/audio/BUILD.gn.orig 2019-06-04 18:55:25 UTC
+++ media/audio/BUILD.gn
-@@ -240,8 +240,18 @@ source_set("audio") {
+@@ -236,8 +236,18 @@ source_set("audio") {
deps += [ "//media/base/android:media_jni_headers" ]
}
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 82a946ca4a4d..0ceb731b9952 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2019-04-30 22:22:52 UTC
+--- media/base/video_frame.cc.orig 2019-06-04 18:55:25 UTC
+++ media/base/video_frame.cc
@@ -53,7 +53,7 @@ static std::string StorageTypeToString(
return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
// This is not strictly needed but makes explicit that, at VideoFrame
// level, DmaBufs are not mappable from userspace.
storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -461,7 +461,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
+@@ -495,7 +495,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
return frame;
}
@@ -27,7 +27,7 @@
// static
scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
const VideoFrameLayout& layout,
-@@ -592,7 +592,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -626,7 +626,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
}
}
@@ -36,7 +36,7 @@
// If there are any |dmabuf_fds_| plugged in, we should duplicate them.
if (frame->storage_type() == STORAGE_DMABUFS) {
wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_);
-@@ -916,7 +916,7 @@ size_t VideoFrame::shared_memory_offset() const {
+@@ -950,7 +950,7 @@ size_t VideoFrame::shared_memory_offset() const {
return shared_memory_offset_;
}
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 8e612fdf9a8f..02dbb8ddb239 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,6 +1,6 @@
---- media/base/video_frame.h.orig 2019-04-30 22:22:52 UTC
+--- media/base/video_frame.h.orig 2019-06-04 18:55:25 UTC
+++ media/base/video_frame.h
-@@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -72,7 +72,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers.
STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer.
STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory.
@@ -9,7 +9,7 @@
// TODO(mcasas): Consider turning this type into STORAGE_NATIVE
// based on the idea of using this same enum value for both DMA
// buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -266,7 +266,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
uint8_t* a_data,
base::TimeDelta timestamp);
@@ -18,7 +18,7 @@
// Wraps provided dmabufs
// (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
// VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -437,7 +437,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -458,7 +458,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// Returns the offset into the shared memory where the frame data begins.
size_t shared_memory_offset() const;
@@ -27,7 +27,7 @@
// Returns a vector containing the backing DmaBufs for this frame. The number
// of returned DmaBufs will be equal or less than the number of planes of
// the frame. If there are less, this means that the last FD contains the
-@@ -631,7 +631,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -652,7 +652,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// memory.
size_t shared_memory_offset_;
diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
index 96b1e260622c..9b6f3f3cae07 100644
--- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,6 +1,6 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-06-04 18:55:25 UTC
+++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
+@@ -202,7 +202,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
for (const auto& entry : devices_config_) {
device_descriptors->emplace_back(
base::StringPrintf("fake_device_%d", entry_index), entry.device_id,
diff --git a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
index 68ef7b96cf59..1956355946a5 100644
--- a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
+++ b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
@@ -1,6 +1,6 @@
---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-04-30 22:22:52 UTC
+--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-06-04 18:55:25 UTC
+++ media/capture/video/mock_gpu_memory_buffer_manager.cc
-@@ -106,7 +106,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
+@@ -115,7 +115,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
gfx::GpuMemoryBufferHandle handle;
handle.type = gfx::NATIVE_PIXMAP;
handle.id = handle_.id;
diff --git a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc
index 68c6b71bdaa2..9d683ea59bbd 100644
--- a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc
+++ b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc
@@ -1,4 +1,4 @@
---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC
+--- media/capture/video/shared_memory_handle_provider.cc.orig 2019-06-04 18:55:25 UTC
+++ media/capture/video/shared_memory_handle_provider.cc
@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
return true;
@@ -9,3 +9,12 @@
bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
mojo::ScopedHandle fd_handle,
uint32_t memory_size_in_bytes) {
+@@ -80,7 +80,7 @@ bool SharedMemoryHandleProvider::InitAsReadOnlyFromRaw
+ shared_memory_.emplace(memory_handle, read_only_flag_);
+ return true;
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ mojo::ScopedSharedBufferHandle
+ SharedMemoryHandleProvider::GetHandleForInterProcessTransit(bool read_only) {
diff --git a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h
index 81bc00c85a6e..5508655ecfcf 100644
--- a/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h
+++ b/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h
@@ -1,6 +1,6 @@
---- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC
+--- media/capture/video/shared_memory_handle_provider.h.orig 2019-06-04 18:55:25 UTC
+++ media/capture/video/shared_memory_handle_provider.h
-@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
+@@ -38,10 +38,10 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
// This requires platforms where base::SharedMemoryHandle is backed by a
// file descriptor.
@@ -8,4 +8,8 @@
+#if defined(OS_LINUX) || defined(OS_BSD)
bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
uint32_t memory_size_in_bytes);
- #endif // defined(OS_LINUX)
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ uint32_t GetMemorySizeInBytes();
+
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
new file mode 100644
index 000000000000..0583c7fbe78a
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
@@ -0,0 +1,11 @@
+--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-06-04 18:55:25 UTC
++++ media/capture/video/video_capture_buffer_pool_impl.cc
+@@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
+ int buffer_id) {
+ // This requires platforms where base::SharedMemoryHandle is backed by a
+ // file descriptor.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ base::AutoLock lock(lock_);
+
+ VideoCaptureBufferTracker* tracker = GetTracker(buffer_id);
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
index 27e69b0a1564..bd9dfa2a89f3 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,11 +1,11 @@
---- media/capture/video/video_capture_device_client.cc.orig 2019-04-30 22:22:52 UTC
+--- media/capture/video/video_capture_device_client.cc.orig 2019-06-04 18:55:25 UTC
+++ media/capture/video/video_capture_device_client.cc
-@@ -237,7 +237,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
// Windows RGB24 defines blue at lowest byte,
// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- origin_colorspace = libyuv::FOURCC_RAW;
+ fourcc_format = libyuv::FOURCC_RAW;
#elif defined(OS_WIN)
- origin_colorspace = libyuv::FOURCC_24BG;
+ fourcc_format = libyuv::FOURCC_24BG;
diff --git a/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
new file mode 100644
index 000000000000..26475695c709
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
@@ -0,0 +1,20 @@
+--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-06-04 18:55:25 UTC
++++ media/gpu/linux/platform_video_frame_utils.cc
+@@ -103,7 +103,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
+ DCHECK(video_frame);
+
+ gfx::GpuMemoryBufferHandle handle;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ handle.type = gfx::NATIVE_PIXMAP;
+
+ std::vector<base::ScopedFD> duped_fds =
+@@ -124,7 +124,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
+ }
+ #else
+ NOTREACHED();
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ return handle;
+ }
+
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc
new file mode 100644
index 000000000000..b695531c0bf2
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc
@@ -0,0 +1,20 @@
+--- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-06-04 18:55:25 UTC
++++ media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc
+@@ -15,7 +15,7 @@
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+ #include "media/video/picture.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "media/gpu/linux/platform_video_frame_utils.h"
+ #endif
+
+@@ -124,7 +124,7 @@ scoped_refptr<VideoFrame> VaapiDmaBufVideoFrameMapper:
+ }
+
+ gfx::GpuMemoryBufferHandle gmb_handle;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ gmb_handle = CreateGpuMemoryBufferHandle(video_frame.get());
+ #endif
+ if (gmb_handle.is_null()) {
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc
new file mode 100644
index 000000000000..1b1de4489d36
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc
@@ -0,0 +1,20 @@
+--- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-06-04 18:55:25 UTC
++++ media/gpu/vaapi/vaapi_video_encode_accelerator.cc
+@@ -41,7 +41,7 @@
+ #include "media/gpu/vp8_reference_frame_vector.h"
+ #include "media/gpu/vp9_reference_frame_vector.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "media/gpu/linux/platform_video_frame_utils.h"
+ #endif
+
+@@ -555,7 +555,7 @@ scoped_refptr<VaapiEncodeJob> VaapiVideoEncodeAccelera
+ vaapi_wrapper_, MakeGLContextCurrentCallback(), BindGLImageCallback(),
+ PictureBuffer(kDummyPictureBufferId, frame->coded_size()));
+ gfx::GpuMemoryBufferHandle gmb_handle;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ gmb_handle = CreateGpuMemoryBufferHandle(frame.get());
+ #endif
+ if (gmb_handle.is_null()) {
diff --git a/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc
new file mode 100644
index 000000000000..dee939e97028
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc
@@ -0,0 +1,49 @@
+--- media/gpu/video_frame_mapper_factory.cc.orig 2019-06-04 18:55:25 UTC
++++ media/gpu/video_frame_mapper_factory.cc
+@@ -7,36 +7,36 @@
+ #include "build/build_config.h"
+ #include "media/gpu/buildflags.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "media/gpu/linux/generic_dmabuf_video_frame_mapper.h"
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+ #include "media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.h"
+-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+
+ namespace media {
+
+ // static
+ std::unique_ptr<VideoFrameMapper> VideoFrameMapperFactory::CreateMapper() {
+-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+ return CreateMapper(false);
+ #else
+ return CreateMapper(true);
+-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+ }
+
+ // static
+ std::unique_ptr<VideoFrameMapper> VideoFrameMapperFactory::CreateMapper(
+ bool linear_buffer_mapper) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (linear_buffer_mapper)
+ return std::make_unique<GenericDmaBufVideoFrameMapper>();
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+ return VaapiDmaBufVideoFrameMapper::Create();
+-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX)
++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD))
+
+ return nullptr;
+ }
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 37813f6b1266..dd172ea7c2b0 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2019-04-30 22:22:52 UTC
+--- media/media_options.gni.orig 2019-06-04 18:55:25 UTC
+++ media/media_options.gni
-@@ -121,6 +121,9 @@ declare_args() {
+@@ -111,6 +111,9 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
index e73bf4b08e6f..5f2c85e18843 100644
--- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
+++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
@@ -1,4 +1,4 @@
---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-04-30 22:22:52 UTC
+--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-06-04 18:55:25 UTC
+++ media/mojo/services/gpu_mojo_media_client.cc
@@ -55,7 +55,7 @@ namespace media {
namespace {
@@ -9,12 +9,12 @@
gpu::CommandBufferStub* GetCommandBufferStub(
base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
base::UnguessableToken channel_token,
-@@ -188,7 +188,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+@@ -199,7 +199,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_,
std::move(get_stub_cb)));
#elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \
- defined(OS_LINUX)
+ defined(OS_LINUX) || defined(OS_BSD)
- std::unique_ptr<VideoDecoder> vda_video_decoder = VdaVideoDecoder::Create(
- task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
- gpu_preferences_, gpu_workarounds_,
+ video_decoder = VdaVideoDecoder::Create(
+ task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
+ gpu_preferences_, gpu_workarounds_,
diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
index c0da7eea7be5..98490d51a42c 100644
--- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
+++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
@@ -1,6 +1,6 @@
---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-04-30 22:22:53 UTC
+--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-06-04 18:55:26 UTC
+++ mojo/public/js/mojo_bindings_resources.grd
-@@ -38,7 +38,7 @@
+@@ -41,7 +41,7 @@
use_base_dir="false"
type="BINDATA"
compress="gzip" />
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 2ada31f443ce..5837974110a3 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig 2019-04-30 22:22:54 UTC
+--- net/BUILD.gn.orig 2019-06-04 18:55:26 UTC
+++ net/BUILD.gn
@@ -98,7 +98,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1899,7 +1899,7 @@ component("net") {
+@@ -1901,7 +1901,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux and Android.
@@ -18,7 +18,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -1992,6 +1992,16 @@ component("net") {
+@@ -1994,6 +1994,16 @@ component("net") {
]
sources -= [ "disk_cache/blockfile/file_posix.cc" ]
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc
index 863a043a34f6..58b31b6a4e54 100644
--- a/www/chromium/files/patch-net_base_address__tracker__linux.cc
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc
@@ -1,4 +1,4 @@
---- net/base/address_tracker_linux.cc.orig 2019-04-30 22:22:54 UTC
+--- net/base/address_tracker_linux.cc.orig 2019-06-04 18:55:26 UTC
+++ net/base/address_tracker_linux.cc
@@ -21,96 +21,10 @@
namespace net {
@@ -99,156 +99,50 @@
}
AddressTrackerLinux::AddressTrackerLinux()
-@@ -151,6 +65,7 @@ AddressTrackerLinux::~AddressTrackerLinux() {
- }
+@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux(
+ AddressTrackerLinux::~AddressTrackerLinux() = default;
void AddressTrackerLinux::Init() {
+#if !defined(OS_FREEBSD)
netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
if (!netlink_fd_.is_valid()) {
PLOG(ERROR) << "Could not create NETLINK socket";
-@@ -239,6 +154,10 @@ void AddressTrackerLinux::Init() {
- return;
- }
- }
-+#else // !OS_FREEBSD
-+ NOTIMPLEMENTED();
-+ AbortAndForceOnline();
-+#endif // !OS_FREEBSD
+@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
+ connection_type_initialized_cv_.Broadcast();
}
- void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -250,25 +169,6 @@ void AddressTrackerLinux::AbortAndForceOnline() {
- connection_type_initialized_cv_.Broadcast();
++#if !defined(OS_BSD)
+ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
+ AddressTrackerAutoLock lock(*this, address_map_lock_);
+ return address_map_;
+@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
+ const char* interface_name = get_interface_name_(interface_index, buf);
+ return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
}
++#endif // !OS_BSD
--AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
-- AddressTrackerAutoLock lock(*this, address_map_lock_);
-- return address_map_;
--}
--
--std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const {
-- AddressTrackerAutoLock lock(*this, online_links_lock_);
-- return online_links_;
--}
--
--bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const {
-- if (ignored_interfaces_.empty())
-- return false;
--
-- char buf[IFNAMSIZ] = {0};
-- const char* interface_name = get_interface_name_(interface_index, buf);
-- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
--}
--
NetworkChangeNotifier::ConnectionType
AddressTrackerLinux::GetCurrentConnectionType() {
- // http://crbug.com/125097
-@@ -326,102 +226,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
+@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
bool* address_changed,
bool* link_changed,
bool* tunnel_changed) {
-- DCHECK(buffer);
-- for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
-- NLMSG_OK(header, length);
-- header = NLMSG_NEXT(header, length)) {
-- switch (header->nlmsg_type) {
-- case NLMSG_DONE:
-- return;
-- case NLMSG_ERROR: {
-- const struct nlmsgerr* msg =
-- reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header));
-- LOG(ERROR) << "Unexpected netlink error " << msg->error << ".";
-- } return;
-- case RTM_NEWADDR: {
-- IPAddress address;
-- bool really_deprecated;
-- struct ifaddrmsg* msg =
-- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
-- if (IsInterfaceIgnored(msg->ifa_index))
-- break;
-- if (GetAddress(header, &address, &really_deprecated)) {
-- AddressTrackerAutoLock lock(*this, address_map_lock_);
-- // Routers may frequently (every few seconds) output the IPv6 ULA
-- // prefix which can cause the linux kernel to frequently output two
-- // back-to-back messages, one without the deprecated flag and one with
-- // the deprecated flag but both with preferred lifetimes of 0. Avoid
-- // interpretting this as an actual change by canonicalizing the two
-- // messages by setting the deprecated flag based on the preferred
-- // lifetime also. http://crbug.com/268042
-- if (really_deprecated)
-- msg->ifa_flags |= IFA_F_DEPRECATED;
-- // Only indicate change if the address is new or ifaddrmsg info has
-- // changed.
-- auto it = address_map_.find(address);
-- if (it == address_map_.end()) {
-- address_map_.insert(it, std::make_pair(address, *msg));
-- *address_changed = true;
-- } else if (memcmp(&it->second, msg, sizeof(*msg))) {
-- it->second = *msg;
-- *address_changed = true;
-- }
-- }
-- } break;
-- case RTM_DELADDR: {
-- IPAddress address;
-- const struct ifaddrmsg* msg =
-- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
-- if (IsInterfaceIgnored(msg->ifa_index))
-- break;
-- if (GetAddress(header, &address, NULL)) {
-- AddressTrackerAutoLock lock(*this, address_map_lock_);
-- if (address_map_.erase(address))
-- *address_changed = true;
-- }
-- } break;
-- case RTM_NEWLINK: {
-- const struct ifinfomsg* msg =
-- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
-- if (IsInterfaceIgnored(msg->ifi_index))
-- break;
-- if (IgnoreWirelessChange(header, msg)) {
-- VLOG(2) << "Ignoring RTM_NEWLINK message";
-- break;
-- }
-- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) &&
-- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) {
-- AddressTrackerAutoLock lock(*this, online_links_lock_);
-- if (online_links_.insert(msg->ifi_index).second) {
-- *link_changed = true;
-- if (IsTunnelInterface(msg->ifi_index))
-- *tunnel_changed = true;
-- }
-- } else {
-- AddressTrackerAutoLock lock(*this, online_links_lock_);
-- if (online_links_.erase(msg->ifi_index)) {
-- *link_changed = true;
-- if (IsTunnelInterface(msg->ifi_index))
-- *tunnel_changed = true;
-- }
-- }
-- } break;
-- case RTM_DELLINK: {
-- const struct ifinfomsg* msg =
-- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
-- if (IsInterfaceIgnored(msg->ifi_index))
-- break;
-- AddressTrackerAutoLock lock(*this, online_links_lock_);
-- if (online_links_.erase(msg->ifi_index)) {
-- *link_changed = true;
-- if (IsTunnelInterface(msg->ifi_index))
-- *tunnel_changed = true;
-- }
-- } break;
-- default:
-- break;
-- }
-- }
++#if !defined(OS_FREEBSD)
+ DCHECK(buffer);
+ for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
+ NLMSG_OK(header, length);
+@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
+ break;
+ }
+ }
++#else // !OS_FREEBSD
+ NOTIMPLEMENTED();
++ AbortAndForceOnline();
++#endif // !OS_FREEBSD
}
- void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
-@@ -452,31 +257,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
+ void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
+@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
}
void AddressTrackerLinux::UpdateCurrentConnectionType() {
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
index 9080a42d1d0e..f3cca9e28862 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,6 +1,6 @@
---- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC
+--- net/base/network_change_notifier.cc.orig 2019-06-04 18:55:26 UTC
+++ net/base/network_change_notifier.cc
-@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
+@@ -215,7 +215,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
#elif defined(OS_FUCHSIA)
return new NetworkChangeNotifierFuchsia(0 /* required_features */);
#else
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
index dbd600f5b870..21bd683f8187 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig 2019-04-30 22:22:54 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-06-04 18:55:27 UTC
+++ net/dns/dns_config_service_posix_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
@@ -9,7 +9,7 @@
#include <memory>
#include "base/cancelable_callback.h"
-@@ -47,7 +45,7 @@ const char* const kNameserversIPv4[] = {
+@@ -50,7 +48,7 @@ const char* const kNameserversIPv4[] = {
"1.0.0.1",
};
@@ -18,7 +18,7 @@
const char* const kNameserversIPv6[] = {
NULL,
"2001:DB8:0::42",
-@@ -83,7 +81,7 @@ void InitializeResState(res_state res) {
+@@ -86,7 +84,7 @@ void InitializeResState(res_state res) {
++res->nscount;
}
@@ -27,7 +27,7 @@
// Install IPv6 addresses, replacing the corresponding IPv4 addresses.
unsigned nscount6 = 0;
for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
-@@ -104,7 +102,7 @@ void InitializeResState(res_state res) {
+@@ -107,7 +105,7 @@ void InitializeResState(res_state res) {
}
void CloseResState(res_state res) {
@@ -36,7 +36,7 @@
for (int i = 0; i < res->nscount; ++i) {
if (res->_u._ext.nsaddrs[i] != NULL)
free(res->_u._ext.nsaddrs[i]);
-@@ -129,7 +127,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
+@@ -132,7 +130,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
}
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
index 77c373b14850..4c5413ef8781 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-04-30 22:22:54 UTC
+--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-06-04 18:55:27 UTC
+++ net/proxy_resolution/proxy_resolution_service.cc
@@ -48,7 +48,7 @@
#elif defined(OS_MACOSX)
@@ -18,7 +18,7 @@
constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
semantics {
-@@ -1578,7 +1578,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
+@@ -1588,7 +1588,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return std::make_unique<UnsetProxyConfigService>();
diff --git a/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
index cdcc39a31db5..99b6f3a418ca 100644
--- a/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
+++ b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
@@ -1,5 +1,5 @@
---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC
-+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc
+--- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-06-04 18:55:27 UTC
++++ net/quic/platform/impl/quic_ip_address_impl.cc
@@ -13,6 +13,7 @@
#include <ws2bth.h>
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index ed4568bceab4..58ca2cbcaf12 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_posix.cc.orig 2019-04-30 22:22:55 UTC
+--- net/socket/udp_socket_posix.cc.orig 2019-06-04 18:55:27 UTC
+++ net/socket/udp_socket_posix.cc
@@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
const base::TimeDelta kActivityMonitorMsThreshold =
@@ -57,34 +57,28 @@
rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));
return rv == 0 ? OK : MapSystemError(errno);
-@@ -945,19 +948,23 @@ int UDPSocketPosix::SetMulticastOptions() {
- return OK;
- #endif
-
+@@ -938,7 +941,7 @@ int UDPSocketPosix::SetMulticastOptions() {
+ if (multicast_interface_ != 0) {
+ switch (addr_family_) {
+ case AF_INET: {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
- if (error != OK)
- return error;
--#else // defined(OS_MACOSX)
-+#else // defined(OS_MACOSX) || defined(OS_BSD)
- ip_mreqn mreq = {};
- mreq.imr_ifindex = multicast_interface_;
+@@ -950,7 +953,11 @@ int UDPSocketPosix::SetMulticastOptions() {
mreq.imr_address.s_addr = htonl(INADDR_ANY);
--#endif // !defined(OS_MACOSX)
-+#endif // !defined(OS_MACOSX) || defined(OS_BSD)
+ #endif // !defined(OS_MACOSX)
int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
+#if defined(OS_BSD)
-+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr));
++ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr));
+#else
reinterpret_cast<const char*>(&mreq), sizeof(mreq));
+#endif
if (rv)
return MapSystemError(errno);
break;
-@@ -1019,7 +1026,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
+@@ -1012,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
@@ -93,7 +87,7 @@
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
-@@ -1067,9 +1074,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
+@@ -1060,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
case IPAddress::kIPv4AddressSize: {
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.h b/www/chromium/files/patch-net_socket_udp__socket__posix.h
new file mode 100644
index 000000000000..373c468ca84d
--- /dev/null
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.h
@@ -0,0 +1,11 @@
+--- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC
++++ net/socket/udp_socket_posix.h
+@@ -33,7 +33,7 @@
+
+ #if defined(__ANDROID__) && defined(__aarch64__)
+ #define HAVE_SENDMMSG 1
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define HAVE_SENDMMSG 1
+ #else
+ #define HAVE_SENDMMSG 0
diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
new file mode 100644
index 000000000000..9f9ad02d0d9c
--- /dev/null
+++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
@@ -0,0 +1,11 @@
+--- net/socket/unix_domain_client_socket_posix.cc.orig 2019-06-07 19:59:03 UTC
++++ net/socket/unix_domain_client_socket_posix.cc
+@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st
+ return true;
+ }
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ // Convert the path given into abstract socket name. It must start with
+ // the '\0' character, so we are adding it. |addr_len| must specify the
+ // length of the structure exactly, as potentially the socket name may
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index 235acd673f4a..afe3f5437937 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig 2019-04-30 22:22:55 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2019-06-04 18:55:27 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -497,7 +497,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -533,7 +533,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
@@ -9,7 +9,7 @@
// TODO(willchan): Switch to using this code when
// ProxyResolutionService::CreateSystemProxyConfigService()'s signature
// doesn't suck.
-@@ -506,7 +506,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -542,7 +542,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
ProxyResolutionService::CreateSystemProxyConfigService(
base::ThreadTaskRunnerHandle::Get().get());
}
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index a82007fde96b..9da0e9259e1b 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,4 +1,4 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2019-04-30 22:22:55 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig 2019-06-04 18:55:27 UTC
+++ pdf/pdfium/pdfium_engine.cc
@@ -134,7 +134,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
@@ -54,7 +54,7 @@
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -2974,7 +2974,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -2978,7 +2978,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
DCHECK(image_data);
last_progressive_start_time_ = base::Time::Now();
@@ -63,7 +63,7 @@
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -3449,7 +3449,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3453,7 +3453,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
diff --git a/www/chromium/files/patch-services_device_device__service.h b/www/chromium/files/patch-services_device_device__service.h
deleted file mode 100644
index e7feec4f1ed2..000000000000
--- a/www/chromium/files/patch-services_device_device__service.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/device/device_service.h.orig 2019-04-30 22:22:56 UTC
-+++ services/device/device_service.h
-@@ -200,7 +200,7 @@ class DeviceService : public service_manager::Service
- #endif
-
- #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
-- defined(OS_MACOSX)
-+ defined(OS_MACOSX) || defined(OS_BSD)
- // Requests for the SerialPortManager interface must be bound to
- // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will
- // be destroyed on that sequence.
diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
index 76554ebfb66b..26c527fdff32 100644
--- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,11 +1,11 @@
---- services/device/geolocation/location_arbitrator.cc.orig 2019-04-30 22:22:56 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig 2019-06-04 18:55:28 UTC
+++ services/device/geolocation/location_arbitrator.cc
-@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+
std::unique_ptr<LocationProvider>
LocationArbitrator::NewSystemLocationProvider() {
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_FUCHSIA)
return nullptr;
#else
- return device::NewSystemLocationProvider();
diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn
index 9f794ce68041..01a7f29e58fa 100644
--- a/www/chromium/files/patch-services_device_hid_BUILD.gn
+++ b/www/chromium/files/patch-services_device_hid_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC
+--- services/device/hid/BUILD.gn.orig 2019-06-04 18:55:28 UTC
+++ services/device/hid/BUILD.gn
@@ -51,6 +51,19 @@ source_set("hid") {
deps += [ "//device/udev_linux" ]
@@ -18,5 +18,5 @@
+ }
+
if (is_chromeos) {
- deps += [ "//chromeos/dbus" ]
+ deps += [ "//chromeos/dbus/permission_broker" ]
}
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 6621adec914f..518017fc4d67 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2019-04-30 22:22:56 UTC
+--- services/network/BUILD.gn.orig 2019-06-04 18:55:28 UTC
+++ services/network/BUILD.gn
-@@ -249,7 +249,6 @@ jumbo_component("network_service") {
+@@ -247,7 +247,6 @@ jumbo_component("network_service") {
if (is_linux) {
deps += [
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
index c51d40b29b2d..435d35e5dabf 100644
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ b/www/chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig 2019-04-30 22:22:56 UTC
+--- services/network/network_context.cc.orig 2019-06-04 18:55:28 UTC
+++ services/network/network_context.cc
-@@ -133,7 +133,7 @@
+@@ -132,7 +132,7 @@
#endif // defined(USE_NSS_CERTS)
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -18,7 +18,7 @@
net::ShutdownGlobalCertNetFetcher();
#endif
}
-@@ -1747,7 +1747,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
+@@ -1764,7 +1764,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
net::CookieCryptoDelegate* crypto_delegate = nullptr;
if (params_->enable_encrypted_cookies) {
@@ -27,7 +27,7 @@
DCHECK(network_service_->os_crypt_config_set())
<< "NetworkService::SetCryptConfig must be called before creating a "
"NetworkContext with encrypted cookies.";
-@@ -2069,7 +2069,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
+@@ -2090,7 +2090,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get());
#endif
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 890fe4240983..5363ecc28428 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig 2019-04-30 22:22:56 UTC
+--- services/network/network_service.cc.orig 2019-06-04 18:55:28 UTC
+++ services/network/network_service.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
#include "third_party/boringssl/src/include/openssl/cpu.h"
#endif
@@ -9,7 +9,7 @@
#include "components/os_crypt/key_storage_config_linux.h"
#endif
-@@ -620,7 +620,7 @@ void NetworkService::OnCertDBChanged() {
+@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() {
net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
}
diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h
index fd2e9dffb985..452d04bb3c6c 100644
--- a/www/chromium/files/patch-services_network_network__service.h
+++ b/www/chromium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig 2019-04-30 22:22:56 UTC
+--- services/network/network_service.h.orig 2019-06-04 18:55:28 UTC
+++ services/network/network_service.h
-@@ -187,7 +187,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
#endif // !BUILDFLAG(IS_CT_SUPPORTED)
void UpdateCRLSet(base::span<const uint8_t> crl_set) override;
void OnCertDBChanged() override;
diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-services_service__manager_embedder_main.cc
index 9ed9e5553ae9..a234385b060d 100644
--- a/www/chromium/files/patch-services_service__manager_embedder_main.cc
+++ b/www/chromium/files/patch-services_service__manager_embedder_main.cc
@@ -1,6 +1,6 @@
---- services/service_manager/embedder/main.cc.orig 2019-04-30 22:22:56 UTC
+--- services/service_manager/embedder/main.cc.orig 2019-06-04 18:55:28 UTC
+++ services/service_manager/embedder/main.cc
-@@ -275,7 +275,7 @@ int Main(const MainParams& params) {
+@@ -264,7 +264,7 @@ int Main(const MainParams& params) {
#endif
base::EnableTerminationOnOutOfMemory();
diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc
index 61cc883b5421..3a2ff8db55e7 100644
--- a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC
+--- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC
+++ services/service_manager/zygote/zygote_linux.cc
@@ -1,6 +1,7 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -8,7 +8,7 @@
#include "services/service_manager/zygote/zygote_linux.h"
-@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
+@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
}
} // namespace service_manager
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 589712280d71..5d77ccaf4b44 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig 2019-04-30 22:25:51 UTC
+--- third_party/angle/BUILD.gn.orig 2019-06-04 18:57:56 UTC
+++ third_party/angle/BUILD.gn
-@@ -327,6 +327,7 @@ angle_static_library("angle_gpu_info_util") {
+@@ -319,6 +319,7 @@ angle_static_library("angle_gpu_info_util") {
"X11",
"Xi",
"Xext",
@@ -8,7 +8,7 @@
]
}
}
-@@ -938,10 +939,6 @@ foreach(is_shared_library,
+@@ -916,10 +917,6 @@ foreach(is_shared_library,
libs = []
if (is_linux) {
sources += util_linux_sources
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
index d05250810ced..f98dda8efa5f 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC
+--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-06-04 18:55:29 UTC
+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
-@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext {
+@@ -120,7 +120,7 @@ class InternalPopupMenu::ItemIterationContext {
is_in_group_(false),
buffer_(buffer) {
DCHECK(buffer_);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 3425511a45e5..7b8bafbb8004 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-03-11 22:01:03 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-06-04 18:55:29 UTC
+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos
@@ -9,3 +9,12 @@
if (event.button == WebPointerProperties::Button::kMiddle)
return true;
#endif
+@@ -347,7 +347,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin(
+ // Disable snapback on desktop Linux to better integrate with the desktop
+ // behavior. Typically, Linux apps do not implement scrollbar snapback (this is
+ // true for at least GTK and QT apps).
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ return false;
+ #endif
+
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 3d62c085808a..c90a2e990cf4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-06-04 18:55:30 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -129,6 +129,7 @@ executable("character_data_generator") {
+@@ -137,6 +137,7 @@ executable("character_data_generator") {
"//build/win:default_exe_manifest",
"//third_party/icu",
]
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index bf9aea7b1d12..a9a908549f4d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,8 +1,8 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-06-04 18:55:30 UTC
+++ third_party/blink/renderer/platform/fonts/font_description.cc
@@ -38,7 +38,7 @@
- #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
+ #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
index 1ea3aeb653ef..4766c40ab521 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
@@ -1,15 +1,15 @@
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-06-04 18:55:30 UTC
+++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
-@@ -10,7 +10,7 @@
+@@ -8,7 +8,7 @@
#if defined(OS_ANDROID)
- #include "third_party/blink/public/platform/modules/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
+ #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
#include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h"
#elif defined(OS_WIN)
- #include "third_party/blink/public/mojom/dwrite_font_proxy/dwrite_font_proxy.mojom-blink.h"
-@@ -26,7 +26,7 @@ std::unique_ptr<FontUniqueNameLookup>
+ #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h"
+@@ -23,7 +23,7 @@ std::unique_ptr<FontUniqueNameLookup>
FontUniqueNameLookup::GetPlatformUniqueNameLookup() {
#if defined(OS_ANDROID)
return std::make_unique<FontUniqueNameLookupAndroid>();
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
deleted file mode 100644
index 8b4b98e988c9..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC
-+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc
-@@ -15,6 +15,11 @@
- extern "C" void* __libc_stack_end; // NOLINT
- #endif
-
-+#if defined(OS_FREEBSD)
-+#include <sys/signal.h>
-+#include <pthread_np.h>
-+#endif
-+
- namespace blink {
-
- static const char* g_avoid_optimization = nullptr;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
deleted file mode 100644
index e3dc7c2eb546..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-04-30 22:23:03 UTC
-+++ third_party/blink/renderer/platform/wtf/BUILD.gn
-@@ -268,8 +268,12 @@ jumbo_component("wtf") {
- if (is_android) {
- libs = [ "log" ]
- }
-- if (is_linux) {
-+ if (is_linux && !is_bsd) {
- libs = [ "dl" ]
-+ }
-+
-+ if (is_bsd) {
-+ libs = [ "execinfo" ]
- }
-
- if (is_mac) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
deleted file mode 100644
index 71b0442cb527..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC
-+++ third_party/blink/renderer/platform/wtf/assertions.cc
-@@ -48,7 +48,7 @@
- #include <windows.h>
- #endif
-
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
index 0cee47e68086..27b83fe51ce9 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-06-04 18:55:30 UTC
+++ third_party/blink/renderer/platform/wtf/container_annotations.h
@@ -10,7 +10,7 @@
@@ -9,3 +9,19 @@
#define ANNOTATE_CONTIGUOUS_CONTAINER
#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
if (buffer) { \
+@@ -35,13 +35,13 @@
+ ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
+ // Annotations require buffers to begin on an 8-byte boundary.
+
+-#else // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64
++#else // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64
+
+ #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)
+ #define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize)
+ #define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize)
+ #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity)
+
+-#endif // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64
++#endif // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64
+
+ #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_CONTAINER_ANNOTATIONS_H_
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
index a4f0a8b59577..24a812ce5223 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-06-04 18:55:30 UTC
+++ third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -18,6 +18,11 @@
+@@ -17,6 +17,11 @@
extern "C" void* __libc_stack_end; // NOLINT
#endif
diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
index 30a8a9b4dbb7..5d8251542cbf 100644
--- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
+++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,4 +1,4 @@
---- third_party/leveldatabase/env_chromium.cc.orig 2019-04-30 22:23:32 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig 2019-06-04 18:55:45 UTC
+++ third_party/leveldatabase/env_chromium.cc
@@ -40,7 +40,11 @@
#include "third_party/leveldatabase/leveldb_chrome.h"
@@ -10,5 +10,5 @@
#include "third_party/re2/src/re2/re2.h"
+#endif
- using base::FilePath;
- using base::trace_event::MemoryAllocatorDump;
+ #if defined(OS_WIN)
+ #undef DeleteFile
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
index 291cd06be445..29e2991ce2c1 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
@@ -1,6 +1,6 @@
---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-03-11 22:08:02 UTC
+--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-06-04 18:58:01 UTC
+++ third_party/pdfium/core/fxcrt/fx_system.h
-@@ -41,7 +41,7 @@
+@@ -36,7 +36,7 @@
#elif defined(_WIN64)
#define _FX_OS_ _FX_OS_WIN64_
#define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
index f689d845e408..292afa1968d0 100644
--- a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-03-11 22:08:02 UTC
+--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-06-04 18:58:01 UTC
+++ third_party/pdfium/fxjs/cjs_publicmethods.cpp
-@@ -85,6 +85,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
+@@ -86,6 +86,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
L"h:MM:ss tt"};
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc b/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
index cd1d34f21771..11fd9fb5076a 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc
+++ b/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC
-+++ base/allocator/partition_allocator/page_allocator.cc
-@@ -115,7 +115,7 @@ void* AllocPages(void* address,
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc.orig 2019-06-04 18:58:01 UTC
++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
+@@ -117,7 +117,7 @@ void* AllocPages(void* address,
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)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
// On 64 bit Linux, we may need to adjust the address space limit for
// guarded allocations.
if (length >= kMinimumGuardedMemorySize) {
diff --git a/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
new file mode 100644
index 000000000000..49434303f99e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -0,0 +1,38 @@
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:58:01 UTC
++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
+@@ -13,7 +13,7 @@
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/resource.h>
+
+ #include <algorithm>
+@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
+ }
+ }
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && 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 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
+ // 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_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
+
+ void* SystemAllocPagesInternal(void* hint,
+ size_t length,
+@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
+ void FreePagesInternal(void* address, size_t length) {
+ CHECK(!munmap(address, length));
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
+ // Restore the address space limit.
+ if (length >= kMinimumGuardedMemorySize) {
+ CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));
diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
index d7643b27e4c2..89745ae6447c 100644
--- a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-03-11 22:08:03 UTC
+--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-06-04 18:58:01 UTC
+++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp
-@@ -14,8 +14,9 @@ constexpr char kFolderSeparator = '/';
+@@ -16,8 +16,9 @@ constexpr char kFolderSeparator = '/';
constexpr const char* g_FontFolders[] = {
#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
@@ -11,4 +11,4 @@
+ "/usr/local/share/fonts",
#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
"~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts",
- #elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
+ #elif defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
index 4da5e43e42ac..ddb94e384164 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,6 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-04-30 22:25:55 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-06-04 18:58:01 UTC
+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -1653,7 +1653,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI
+@@ -1953,7 +1953,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin
void TracingServiceImpl::UpdateMemoryGuardrail() {
#if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \
@@ -10,7 +10,7 @@
uint64_t total_buffer_bytes = 0;
// Sum up all the shared memory buffers.
-@@ -1705,7 +1706,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
+@@ -2005,7 +2006,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
index 0d1c0f100471..fbc2c2455aca 100644
--- a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
+++ b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
@@ -1,6 +1,6 @@
---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-03-11 22:08:28 UTC
+--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-06-04 18:58:12 UTC
+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp
-@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
+@@ -128,8 +128,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
: fGetVarDesignCoordinates(nullptr)
, fGetVarAxisFlags(nullptr)
, fLibrary(nullptr)
@@ -9,7 +9,7 @@
{
if (FT_New_Library(&gFTMemory, &fLibrary)) {
return;
-@@ -183,12 +181,7 @@ class FreeTypeLibrary : SkNoncopyable { (public)
+@@ -189,12 +187,7 @@ class FreeTypeLibrary : SkNoncopyable { (public)
}
#endif
@@ -23,7 +23,7 @@
}
~FreeTypeLibrary() {
if (fLibrary) {
-@@ -197,8 +190,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
+@@ -203,8 +196,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
}
FT_Library library() { return fLibrary; }
@@ -32,7 +32,7 @@
// FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
// Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -215,8 +206,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
+@@ -221,8 +212,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
private:
FT_Library fLibrary;
@@ -41,7 +41,7 @@
// FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
// The following platforms provide FreeType of at least 2.4.0.
-@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR
+@@ -718,17 +707,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR
rec->fTextSize = SkIntToScalar(1 << 14);
}
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
index b291ee12c7f9..d84e619c1bef 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
@@ -1,6 +1,6 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-03-11 22:08:03 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-06-04 18:58:01 UTC
+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp
-@@ -686,7 +686,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
+@@ -688,7 +688,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
return status != 0;
}
return false;
@@ -9,7 +9,7 @@
return false; // Non X11 linux is headless only
#elif defined(__APPLE__)
return sw::OSX::IsValidWindow(window);
-@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const
+@@ -866,7 +866,7 @@ sw::Format Display::getDisplayFormat() const
{
return sw::FORMAT_X8R8G8B8;
}
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
index d46d40597ad6..7dfe3a19505f 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
@@ -1,6 +1,6 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-03-11 22:08:03 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-06-04 18:58:01 UTC
+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp
-@@ -352,7 +352,7 @@ bool WindowSurface::checkForResize()
+@@ -360,7 +360,7 @@ bool WindowSurface::checkForResize()
int windowWidth = windowAttributes.width;
int windowHeight = windowAttributes.height;
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index bd76dbd0d3a8..2b88645680d0 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-04-30 22:25:59 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-06-04 18:58:06 UTC
+++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -299,7 +299,7 @@ rtc_source_set("audio_device_impl") {
+@@ -265,7 +265,7 @@ rtc_source_set("audio_device_impl") {
if (rtc_use_dummy_audio_file_devices) {
defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
} else {
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
index 068d460974e3..a727ec5a63eb 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
+++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-03-11 22:08:10 UTC
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-06-04 18:58:07 UTC
+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -12,6 +12,7 @@
@@ -7,4 +7,4 @@
+#include <cstdlib>
#include <utility>
- #include "modules/include/module_common_types_public.h"
+ #include "absl/algorithm/container.h"
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
index 7301268cff8d..3fbc434f09db 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-04-30 22:26:00 UTC
+--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-06-04 18:58:09 UTC
+++ third_party/webrtc/rtc_base/BUILD.gn
-@@ -969,8 +969,6 @@ rtc_static_library("rtc_base") {
+@@ -947,8 +947,6 @@ rtc_static_library("rtc_base") {
if (rtc_use_x11) {
libs += [
@@ -9,7 +9,7 @@
"Xext",
"X11",
"Xcomposite",
-@@ -978,7 +976,7 @@ rtc_static_library("rtc_base") {
+@@ -956,7 +954,7 @@ rtc_static_library("rtc_base") {
]
}
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
index df1d8c9420cb..0f3e3413f1ae 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
@@ -1,11 +1,11 @@
---- third_party/webrtc/rtc_base/byte_order.h.orig 2019-03-11 22:08:15 UTC
+--- third_party/webrtc/rtc_base/byte_order.h.orig 2019-06-04 18:58:09 UTC
+++ third_party/webrtc/rtc_base/byte_order.h
-@@ -79,7 +79,7 @@
- #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
+@@ -89,7 +89,7 @@
#endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
+
#elif defined(WEBRTC_POSIX)
-#include <endian.h>
+#include <sys/endian.h>
- #endif
-
- namespace rtc {
+ #else
+ #error "Missing byte order functions for this arch."
+ #endif // defined(WEBRTC_MAC)
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index 59c6a746c174..6baac4f97991 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/network.cc.orig 2019-04-30 22:26:00 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig 2019-06-04 18:58:09 UTC
+++ third_party/webrtc/rtc_base/network.cc
@@ -14,7 +14,7 @@
// linux/if.h can't be included at the same time as the posix sys/if.h, and
@@ -9,7 +9,7 @@
#include <linux/if.h>
#include <linux/route.h>
#elif !defined(__native_client__)
-@@ -765,7 +765,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
+@@ -764,7 +764,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
}
#endif // WEBRTC_WIN
@@ -18,7 +18,7 @@
bool IsDefaultRoute(const std::string& network_name) {
FILE* f = fopen("/proc/net/route", "r");
if (!f) {
-@@ -808,7 +808,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
+@@ -807,7 +807,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
return true;
}
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 862741091780..8f543b1439cc 100644
--- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-03-11 22:08:22 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-06-04 18:58:11 UTC
+++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -59,8 +59,6 @@ rtc_static_library("system_wrappers") {
+@@ -57,8 +57,6 @@ rtc_static_library("system_wrappers") {
if (!build_with_chromium) {
deps += [ ":cpu_features_linux" ]
}
diff --git a/www/chromium/files/patch-third__party_zlib_arm__features.c b/www/chromium/files/patch-third__party_zlib_arm__features.c
index 877678952a54..ba1f3a98ba96 100644
--- a/www/chromium/files/patch-third__party_zlib_arm__features.c
+++ b/www/chromium/files/patch-third__party_zlib_arm__features.c
@@ -1,87 +1,46 @@
---- third_party/zlib/arm_features.c.orig 2019-04-30 22:23:35 UTC
+--- third_party/zlib/arm_features.c.orig 2019-06-04 18:55:48 UTC
+++ third_party/zlib/arm_features.c
-@@ -11,20 +11,11 @@
- int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
- int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
-
--#if !defined(_MSC_VER)
--
+@@ -16,6 +16,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
#include <pthread.h>
- #include <stdint.h>
+ #endif
+
++#if defined(__FreeBSD__)
+#include <machine/armreg.h>
+#include <sys/types.h>
-
--#if defined(ARMV8_OS_ANDROID)
--#include <cpu-features.h>
--#elif defined(ARMV8_OS_LINUX)
--#include <asm/hwcap.h>
--#include <sys/auxv.h>
--#else
--#error arm_features.c ARM feature detection in not defined for your platform
--#endif
--
- static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
++#else
+ #if defined(ARMV8_OS_ANDROID)
+ #include <cpu-features.h>
+ #elif defined(ARMV8_OS_LINUX)
+@@ -30,6 +34,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+ #else
+ #error arm_features.c ARM feature detection in not defined for your platform
+ #endif
++#endif
static void _arm_check_features(void);
-@@ -40,54 +31,14 @@ void ZLIB_INTERNAL arm_check_features(void)
- */
- static void _arm_check_features(void)
- {
--#if defined(ARMV8_OS_ANDROID) && defined(__aarch64__)
-- uint64_t features = android_getCpuFeatures();
-- arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM64_FEATURE_CRC32);
-- arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM64_FEATURE_PMULL);
--#elif defined(ARMV8_OS_ANDROID) /* aarch32 */
-- uint64_t features = android_getCpuFeatures();
-- arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
-- arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
--#elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
-- unsigned long features = getauxval(AT_HWCAP);
-- arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
-- arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
--#elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
-- /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
-- unsigned long features = getauxval(AT_HWCAP2);
-- arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
-- arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
--#endif
-- /* TODO(crbug.com/810125): add ARMV8_OS_ZIRCON support for fucshia */
--}
-+#if defined(__aarch64__)
-+ uint64_t id_aa64isar0;
--#else /* _MSC_VER */
--
--#include <windows.h>
--
--static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
--
--static BOOL CALLBACK _arm_check_features(PINIT_ONCE once,
-- PVOID param,
-- PVOID *context);
--
--void ZLIB_INTERNAL arm_check_features(void)
--{
-- InitOnceExecuteOnce(&cpu_check_inited_once, _arm_check_features,
-- NULL, NULL);
--}
--
--static BOOL CALLBACK _arm_check_features(PINIT_ONCE once,
-- PVOID param,
-- PVOID *context)
--{
-- if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE))
-+ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
+@@ -68,14 +73,24 @@ static void _arm_check_features(void)
+ arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
+ arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
+ #elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
++#if defined(__FreeBSD__)
++ uint64_t id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
+ if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
-+ arm_cpu_enable_pmull = 1;
++ arm_cpu_enable_pmull = 1;
+ if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
- arm_cpu_enable_crc32 = 1;
--
-- if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE))
-- arm_cpu_enable_pmull = 1;
--
-- return TRUE;
++ arm_cpu_enable_crc32 = 1;
++#else
+ unsigned long features = getauxval(AT_HWCAP);
+ arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
+ arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
+#endif
- }
-
--#endif /* _MSC_VER */
+ #elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
++#if !defined(__FreeBSD__)
+ /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
+ unsigned long features = getauxval(AT_HWCAP2);
+ arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+ arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
++#endif
+ #elif defined(ARMV8_OS_FUCHSIA)
+ uint32_t features;
+ zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util.h b/www/chromium/files/patch-tools_gn_base_files_file__util.h
new file mode 100644
index 000000000000..142ec10db26a
--- /dev/null
+++ b/www/chromium/files/patch-tools_gn_base_files_file__util.h
@@ -0,0 +1,11 @@
+--- tools/gn/base/files/file_util.h.orig 2019-06-04 19:02:25 UTC
++++ tools/gn/base/files/file_util.h
+@@ -361,7 +361,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath&
+ // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
+ int GetMaximumPathComponentLength(const base::FilePath& path);
+
+-#if defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ // Broad categories of file systems as returned by statfs() on Linux.
+ enum FileSystemType {
+ FILE_SYSTEM_UNKNOWN, // statfs failed.
diff --git a/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc b/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc
new file mode 100644
index 000000000000..32498b74dcef
--- /dev/null
+++ b/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc
@@ -0,0 +1,11 @@
+--- tools/gn/base/files/file_util_posix.cc.orig 2019-06-04 19:02:25 UTC
++++ tools/gn/base/files/file_util_posix.cc
+@@ -254,7 +254,7 @@ bool ReplaceFile(const FilePath& from_path,
+ #endif // !defined(OS_NACL_NONSFI)
+
+ bool CreateLocalNonBlockingPipe(int fds[2]) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0;
+ #else
+ int raw_fds[2];
diff --git a/www/chromium/files/patch-tools_gn_base_files_scoped__file.cc b/www/chromium/files/patch-tools_gn_base_files_scoped__file.cc
new file mode 100644
index 000000000000..8364317cad57
--- /dev/null
+++ b/www/chromium/files/patch-tools_gn_base_files_scoped__file.cc
@@ -0,0 +1,11 @@
+--- tools/gn/base/files/scoped_file.cc.orig 2019-06-04 19:02:25 UTC
++++ tools/gn/base/files/scoped_file.cc
+@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) {
+ // a single open directory would bypass the entire security model.
+ int ret = IGNORE_EINTR(close(fd));
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+ defined(OS_ANDROID)
+ // NB: Some file descriptors can return errors from close() e.g. network
+ // filesystems such as NFS and Linux input devices. On Linux, macOS, and
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index 20e375ba12b2..d052840249e9 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,15 +1,15 @@
---- tools/gn/build/gen.py.orig 2019-04-30 22:29:37 UTC
+--- tools/gn/build/gen.py.orig 2019-06-04 19:02:25 UTC
+++ tools/gn/build/gen.py
-@@ -46,7 +46,7 @@ class Platform(object):
+@@ -44,7 +44,7 @@ class Platform(object):
@staticmethod
def known_platforms():
-- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd']
-+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd']
+- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia']
++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd']
def platform(self):
return self._platform
-@@ -69,6 +69,9 @@ class Platform(object):
+@@ -67,6 +67,9 @@ class Platform(object):
def is_aix(self):
return self._platform == 'aix'
@@ -17,9 +17,9 @@
+ return self._platform == 'freebsd'
+
def is_posix(self):
- return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']
+ return self._platform in ['linux', 'freebsd', 'darwin', 'aix']
-@@ -335,6 +338,11 @@ def WriteGNNinja(path, platform, host, options):
+@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options):
elif platform.is_aix():
cflags_cc.append('-maix64')
ldflags.append('-maix64')
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
index 1d07a4a406d6..a2799a571432 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2019-03-11 22:01:18 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig 2019-06-04 18:55:48 UTC
+++ tools/json_schema_compiler/feature_compiler.py
-@@ -205,6 +205,7 @@ FEATURE_GRAMMAR = (
+@@ -212,6 +212,7 @@ FEATURE_GRAMMAR = (
'enum_map': {
'chromeos': 'Feature::CHROMEOS_PLATFORM',
'linux': 'Feature::LINUX_PLATFORM',
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py
index f8cbd5df67e7..a64e68274edd 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_model.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/model.py.orig 2019-03-11 22:01:18 UTC
+--- tools/json_schema_compiler/model.py.orig 2019-06-04 18:55:48 UTC
+++ tools/json_schema_compiler/model.py
-@@ -602,7 +602,7 @@ class Platforms(object):
+@@ -605,7 +605,7 @@ class Platforms(object):
"""
CHROMEOS = _PlatformInfo("chromeos")
CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index e2bf7a5b6725..8af6f102e2b3 100644
--- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-03-11 22:01:18 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-06-04 18:55:49 UTC
+++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -40,7 +40,7 @@ group("telemetry_chrome_test") {
+@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ]
}
diff --git a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 57a89929eca5..8f3c47ebd01b 100644
--- a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
+++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,5 +1,5 @@
---- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC
-+++ ui/base/ime/input_method_initializer.cc
+--- ui/base/ime/init/input_method_initializer.cc.orig 2019-06-04 18:55:49 UTC
++++ ui/base/ime/init/input_method_initializer.cc
@@ -8,7 +8,7 @@
#if defined(OS_CHROMEOS)
@@ -32,7 +32,7 @@
#if defined(OS_CHROMEOS)
IMEBridge::Shutdown();
-#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const LinuxInputMethodContextFactory* factory =
LinuxInputMethodContextFactory::instance();
CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index ff9c3893665f..a7eb2140d7a9 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig 2019-04-30 22:23:41 UTC
+--- ui/base/ui_base_features.cc.orig 2019-06-04 18:55:49 UTC
+++ ui/base/ui_base_features.cc
-@@ -118,7 +118,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
+@@ -108,7 +108,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
"EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
// Enables stylus appearing as touch when in contact with digitizer.
const base::Feature kDirectManipulationStylus = {
"DirectManipulationStylus",
-@@ -128,7 +128,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -118,7 +118,7 @@ const base::Feature kDirectManipulationStylus = {
base::FEATURE_DISABLED_BY_DEFAULT
#endif
};
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h
index 208884e30587..45097a12751c 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.h.orig 2019-04-30 22:23:41 UTC
+--- ui/base/ui_base_features.h.orig 2019-06-04 18:55:49 UTC
+++ ui/base/ui_base_features.h
-@@ -63,10 +63,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+@@ -59,10 +59,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 3bc3fb7c041b..72991ef3942e 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig 2019-04-30 22:23:42 UTC
+--- ui/gfx/BUILD.gn.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/BUILD.gn
-@@ -544,7 +544,7 @@ jumbo_source_set("memory_buffer_sources") {
+@@ -546,7 +546,7 @@ jumbo_source_set("memory_buffer_sources") {
deps += [ "//build/config/linux/libdrm" ]
}
diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
index 9a275a8e8fa3..9957241fa529 100644
--- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
+++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
@@ -1,7 +1,7 @@
---- ui/gfx/font_fallback_linux.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/font_fallback_linux.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/font_fallback_linux.cc
-@@ -15,6 +15,10 @@
- #include "base/memory/ptr_util.h"
+@@ -16,6 +16,10 @@
+ #include "base/trace_event/trace_event.h"
#include "ui/gfx/font.h"
+#if defined(OS_BSD)
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index 8090f7bcd79c..59df797b1892 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,11 +1,11 @@
---- ui/gfx/gpu_memory_buffer.h.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/gpu_memory_buffer.h
@@ -16,7 +16,7 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/gfx_export.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(USE_OZONE) || defined(OS_LINUX)
++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD)
#include "ui/gfx/native_pixmap_handle.h"
#elif defined(OS_MACOSX) && !defined(OS_IOS)
#include "ui/gfx/mac/io_surface.h"
@@ -13,8 +13,8 @@
base::UnsafeSharedMemoryRegion region;
uint32_t offset;
int32_t stride;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // TODO(crbug.com/863011): convert this to a scoped handle.
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
NativePixmapHandle native_pixmap_handle;
#elif defined(OS_MACOSX) && !defined(OS_IOS)
+ ScopedRefCountedIOSurfaceMachPort mach_port;
diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
index 1d215a19459a..df5d51999fc1 100644
--- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
+++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
@@ -1,4 +1,4 @@
---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/ipc/gfx_param_traits_macros.h
@@ -18,7 +18,7 @@
#include "ui/gfx/selection_bound.h"
@@ -13,17 +13,24 @@
IPC_STRUCT_TRAITS_MEMBER(region)
IPC_STRUCT_TRAITS_MEMBER(offset)
IPC_STRUCT_TRAITS_MEMBER(stride)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
#elif defined(OS_MACOSX)
IPC_STRUCT_TRAITS_MEMBER(mach_port)
-@@ -66,7 +66,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
+@@ -66,13 +66,13 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
IPC_STRUCT_TRAITS_MEMBER(id)
IPC_STRUCT_TRAITS_END()
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
IPC_STRUCT_TRAITS_MEMBER(stride)
IPC_STRUCT_TRAITS_MEMBER(offset)
+ IPC_STRUCT_TRAITS_MEMBER(size)
+ IPC_STRUCT_TRAITS_MEMBER(modifier)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ IPC_STRUCT_TRAITS_MEMBER(fd)
+ #elif defined(OS_FUCHSIA)
+ IPC_STRUCT_TRAITS_MEMBER(vmo)
diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
index 66b1f30c3c79..a93da4df5688 100644
--- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
@@ -1,38 +1,66 @@
---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/mojo/buffer_types_struct_traits.cc
-@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
+@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
}
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
+ mojo::ScopedHandle StructTraits<
+ gfx::mojom::NativePixmapPlaneDataView,
+ gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- std::vector<mojo::ScopedHandle>
- StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
- fds(const gfx::NativePixmapHandle& pixmap_handle) {
-@@ -55,7 +55,7 @@ bool StructTraits<
- }
- return data.ReadPlanes(&out->planes);
+ return mojo::WrapPlatformFile(plane.fd.release());
+ #elif defined(OS_FUCHSIA)
+ return mojo::WrapPlatformHandle(mojo::PlatformHandle(std::move(plane.vmo)));
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
}
+
+ bool StructTraits<
+@@ -46,7 +46,7 @@ bool StructTraits<
+
+ mojo::PlatformHandle handle =
+ mojo::UnwrapPlatformHandle(data.TakeBufferHandle());
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (!handle.is_fd())
+ return false;
+ out->fd = handle.TakeFD();
+@@ -54,7 +54,7 @@ bool StructTraits<
+ if (!handle.is_valid_handle())
+ return false;
+ out->vmo = zx::vmo(handle.TakeHandle());
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
+ return true;
+ }
+@@ -65,7 +65,7 @@ bool StructTraits<
+ gfx::NativePixmapHandle* out) {
+ return data.ReadPlanes(&out->planes);
+ }
+-#endif // defined(OS_LINUX) || defined(USE_OZONE)
++#endif // defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
+
gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
gfx::mojom::GpuMemoryBufferHandleDataView,
-@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
+@@ -78,7 +78,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
std::move(handle.region));
case gfx::NATIVE_PIXMAP:
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
- handle.native_pixmap_handle);
+ std::move(handle.native_pixmap_handle));
#else
-@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
+@@ -154,7 +154,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
out->type = gfx::SHARED_MEMORY_BUFFER;
out->region = std::move(platform_handle->get_shared_memory_handle());
return true;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
NATIVE_PIXMAP_HANDLE:
out->type = gfx::NATIVE_PIXMAP;
diff --git a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
index 08db910bf200..bccdb4cfab6b 100644
--- a/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
+++ b/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
@@ -1,20 +1,20 @@
---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/mojo/buffer_types_struct_traits.h
-@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
+@@ -186,7 +186,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
}
};
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
template <>
struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
gfx::NativePixmapPlane> {
-@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
+@@ -218,7 +218,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
static bool Read(gfx::mojom::NativePixmapHandleDataView data,
gfx::NativePixmapHandle* out);
};
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(USE_OZONE)
++#endif // defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
template <>
struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
index 45d1fe4faa92..6784281d8213 100644
--- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
+++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,14 +1,15 @@
---- ui/gfx/native_pixmap_handle.cc.orig 2019-04-30 22:23:42 UTC
+--- ui/gfx/native_pixmap_handle.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/native_pixmap_handle.cc
-@@ -4,14 +4,14 @@
+@@ -8,7 +8,7 @@
- #include "ui/gfx/native_pixmap_handle.h"
+ #include "build/build_config.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <drm_fourcc.h>
#include "base/posix/eintr_wrapper.h"
#endif
+@@ -20,7 +20,7 @@
namespace gfx {
@@ -17,20 +18,30 @@
static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapPlane::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
-@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix
-
- NativePixmapHandle::~NativePixmapHandle() {}
-
+@@ -32,7 +32,7 @@ NativePixmapPlane::NativePixmapPlane()
+ NativePixmapPlane::NativePixmapPlane(int stride,
+ int offset,
+ uint64_t size,
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ base::ScopedFD fd,
+ #elif defined(OS_FUCHSIA)
+ zx::vmo vmo,
+@@ -42,7 +42,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
+ offset(offset),
+ size(size),
+ modifier(modifier)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+ ,
+ fd(std::move(fd))
+ #elif defined(OS_FUCHSIA)
+@@ -70,7 +70,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
NativePixmapHandle clone;
- std::vector<base::ScopedFD> scoped_fds;
-@@ -53,6 +53,6 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
- clone.planes = handle.planes;
- return clone;
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- } // namespace gfx
+ for (auto& plane : handle.planes) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ DCHECK(plane.fd.is_valid());
+ base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
+ if (!fd_dup.is_valid()) {
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
index ac73c77b8cf9..ba90f869d574 100644
--- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
+++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.h.orig 2019-03-11 22:01:19 UTC
+--- ui/gfx/native_pixmap_handle.h.orig 2019-06-04 18:55:50 UTC
+++ ui/gfx/native_pixmap_handle.h
@@ -13,7 +13,7 @@
#include "build/build_config.h"
@@ -6,23 +6,24 @@
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/file_descriptor_posix.h"
+ #include "base/files/scoped_file.h"
#endif
-@@ -54,14 +54,14 @@ struct GFX_EXPORT NativePixmapHandle {
-
- ~NativePixmapHandle();
-
+@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane {
+ NativePixmapPlane(int stride,
+ int offset,
+ uint64_t size,
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- // File descriptors for the underlying memory objects (usually dmabufs).
- std::vector<base::FileDescriptor> fds;
- #endif
- std::vector<NativePixmapPlane> planes;
- };
+ base::ScopedFD fd,
+ #elif defined(OS_FUCHSIA)
+ zx::vmo vmo,
+@@ -58,7 +58,7 @@ struct GFX_EXPORT NativePixmapPlane {
+ // Chromium code. Also one per plane per entry.
+ uint64_t modifier;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- // Returns an instance of |handle| which can be sent over IPC. This duplicates
- // the file-handles, so that the IPC code take ownership of them, without
- // invalidating |handle|.
+ // File descriptor for the underlying memory object (usually dmabuf).
+ base::ScopedFD fd;
+ #elif defined(OS_FUCHSIA)
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index 09f32013bee4..1f6823d1e8eb 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig 2019-05-14 20:51:39.000000000 +0200
-+++ ui/gl/BUILD.gn 2019-05-28 10:25:43.492274000 +0200
-@@ -213,7 +213,7 @@
+--- ui/gl/BUILD.gn.orig 2019-06-04 18:55:50 UTC
++++ ui/gl/BUILD.gn
+@@ -215,7 +215,7 @@ jumbo_component("gl") {
]
}
@@ -9,7 +9,7 @@
# Windows has USE_EGL but doesn't support base::FileDescriptor.
# libsync isn't supported or needed on MacOSX.
# Fuchsia is excluded due to a libsync dependency and because it's
-@@ -272,7 +272,10 @@
+@@ -274,7 +274,10 @@ jumbo_component("gl") {
"//build/config/linux:xext",
]
diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py
index e3ae9d9a6e2d..149d86ea4f43 100644
--- a/www/chromium/files/patch-ui_gl_generate__bindings.py
+++ b/www/chromium/files/patch-ui_gl_generate__bindings.py
@@ -1,6 +1,6 @@
---- ui/gl/generate_bindings.py.orig 2019-04-30 22:23:42 UTC
+--- ui/gl/generate_bindings.py.orig 2019-06-04 18:55:50 UTC
+++ ui/gl/generate_bindings.py
-@@ -2666,6 +2666,9 @@ GLX_FUNCTIONS = [
+@@ -2683,6 +2683,9 @@ GLX_FUNCTIONS = [
'arguments':
'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
'int32_t* denominator' },
diff --git a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
index c408493d457b..2c1e9db777e0 100644
--- a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
+++ b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
@@ -1,5 +1,5 @@
---- ui/gl/gl_surface_glx.cc.orig 2019-05-28 10:26:51.705074000 +0200
-+++ ui/gl/gl_surface_glx.cc 2019-05-28 10:44:19.461809000 +0200
+--- ui/gl/gl_surface_glx.cc.orig 2019-06-04 18:55:50 UTC
++++ ui/gl/gl_surface_glx.cc
@@ -21,6 +21,7 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
@@ -8,7 +8,7 @@
#include "ui/events/platform/platform_event_source.h"
#include "ui/gfx/x/x11.h"
#include "ui/gfx/x/x11_connection.h"
-@@ -431,7 +432,9 @@
+@@ -431,7 +432,9 @@ bool GLSurfaceGLX::InitializeOneOff() {
}
const XVisualInfo& visual_info =
@@ -19,7 +19,7 @@
g_visual = visual_info.visual;
g_depth = visual_info.depth;
g_colormap =
-@@ -581,18 +584,30 @@
+@@ -581,18 +584,30 @@ bool NativeViewGLSurfaceGLX::Initialize(GLSurfaceForma
}
size_ = gfx::Size(attributes.width, attributes.height);
diff --git a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
index a6db114882bc..8f993bfbfbc6 100644
--- a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
+++ b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
@@ -1,6 +1,6 @@
---- ui/message_center/public/cpp/message_center_constants.h.orig 2019-03-11 22:01:19 UTC
+--- ui/message_center/public/cpp/message_center_constants.h.orig 2019-06-04 18:55:50 UTC
+++ ui/message_center/public/cpp/message_center_constants.h
-@@ -101,7 +101,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
+@@ -105,7 +105,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
const int kButtonIconTopPadding = 11; // In DIPs.
const int kButtonIconToTitlePadding = 16; // In DIPs.
diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
index 94960ecb60cb..e850dc111d74 100644
--- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
+++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
@@ -1,11 +1,11 @@
---- ui/message_center/views/message_popup_view.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/message_center/views/message_popup_view.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/message_center/views/message_popup_view.cc
@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() {
void MessagePopupView::Show() {
views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
params.keep_on_top = true;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
- #else
- params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Make the widget explicitly activatable as TYPE_POPUP is not activatable by
+ // default but we need focus for the inline reply textarea.
+ params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
index 3e885edefc59..8dd70fbd3ca6 100644
--- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
+++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
@@ -1,6 +1,6 @@
---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-04-30 22:23:43 UTC
+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/bubble/bubble_dialog_delegate_view.cc
-@@ -114,7 +114,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
+@@ -135,7 +135,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index 0e6218b3eb9c..eb6ecd0609e7 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/label.cc.orig 2019-04-30 22:23:43 UTC
+--- ui/views/controls/label.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/controls/label.cc
-@@ -545,7 +545,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
+@@ -544,7 +544,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
GetFocusManager()->SetFocusedView(this);
}
@@ -9,7 +9,7 @@
if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
GetFocusManager()->SetFocusedView(this);
#endif
-@@ -730,7 +730,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() {
}
void Label::UpdateSelectionClipboard() {
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index 78676286af49..26815cc6ed89 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig 2019-04-30 22:23:43 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/controls/textfield/textfield.cc
-@@ -64,7 +64,7 @@
+@@ -63,7 +63,7 @@
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -167,14 +167,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
+@@ -166,14 +166,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
case ui::VKEY_BACK:
if (!control)
return ui::TextEditCommand::DELETE_BACKWARD;
@@ -26,7 +26,7 @@
// Only erase by line break on Linux and ChromeOS.
if (shift && control)
return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -233,7 +233,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -232,7 +232,7 @@ bool IsControlKeyModifier(int flags) {
// Control-modified key combination, but we cannot extend it to other platforms
// as Control has different meanings and behaviors.
// https://crrev.com/2580483002/#msg46
@@ -35,7 +35,7 @@
return flags & ui::EF_CONTROL_DOWN;
#else
return false;
-@@ -687,7 +687,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
+@@ -667,7 +667,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
#endif
}
@@ -44,7 +44,7 @@
if (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE);
#endif
-@@ -731,7 +731,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -713,7 +713,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
if (!textfield)
return handled;
@@ -53,7 +53,7 @@
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
ui::GetTextEditKeyBindingsDelegate();
std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -899,7 +899,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -882,7 +882,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
}
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -62,7 +62,7 @@
// Skip any accelerator handling that conflicts with custom keybindings.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
ui::GetTextEditKeyBindingsDelegate();
-@@ -2089,7 +2089,7 @@ bool Textfield::PasteSelectionClipboard() {
+@@ -2081,7 +2081,7 @@ bool Textfield::PasteSelectionClipboard() {
}
void Textfield::UpdateSelectionClipboard() {
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index ec9c9de96153..482362f13ba0 100644
--- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/corewm/tooltip_aura.cc
-@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;
+@@ -35,7 +35,7 @@ constexpr int kCursorOffsetY = 15;
// TODO(varkha): Update if native widget can be transparent on Linux.
bool CanUseTranslucentTooltipWidget() {
diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc
index 8f0e0596f493..b17fad9ff775 100644
--- a/www/chromium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/examples/widget_example.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/examples/widget_example.cc
-@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -78,7 +78,7 @@ void WidgetExample::CreateExampleView(View* container)
BuildButton(container, "Popup widget", POPUP);
BuildButton(container, "Dialog widget", DIALOG);
BuildButton(container, "Modal Dialog", MODAL_DIALOG);
diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc
index f921809afa5b..31f73ce28eb2 100644
--- a/www/chromium/files/patch-ui_views_selection__controller.cc
+++ b/www/chromium/files/patch-ui_views_selection__controller.cc
@@ -1,6 +1,6 @@
---- ui/views/selection_controller.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/selection_controller.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/selection_controller.cc
-@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont
+@@ -21,7 +21,7 @@ SelectionController::SelectionController(SelectionCont
delegate_(delegate),
handles_selection_clipboard_(false) {
// On Linux, update the selection clipboard on a text selection.
diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h
index d0fd56aee4ef..673dc5f85167 100644
--- a/www/chromium/files/patch-ui_views_views__delegate.h
+++ b/www/chromium/files/patch-ui_views_views__delegate.h
@@ -1,6 +1,6 @@
---- ui/views/views_delegate.h.orig 2019-03-11 22:01:19 UTC
+--- ui/views/views_delegate.h.orig 2019-06-04 18:55:50 UTC
+++ ui/views/views_delegate.h
-@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate {
// Returns true if the window passed in is in the Windows 8 metro
// environment.
virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index b22820c8089a..ba1229bb969e 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-04-30 22:23:43 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -90,7 +90,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
+@@ -102,7 +102,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
const Widget::InitParams& params) {
native_widget_delegate_->OnNativeWidgetCreated();
@@ -9,7 +9,7 @@
// Setup a non_client_window_event_filter, which handles resize/move, double
// click and other events.
DCHECK(!non_client_window_event_filter_);
-@@ -541,7 +541,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
+@@ -552,7 +552,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
}
void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() {
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc
index 32017f16b502..f12471a6e4a1 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc
@@ -1,7 +1,7 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-05-28 10:19:21.517467000 +0200
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc 2019-05-28 10:22:46.373548000 +0200
-@@ -1440,24 +1440,15 @@
- if (swa.override_redirect)
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-06-04 18:55:50 UTC
++++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+@@ -1423,24 +1423,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
+ if (override_redirect_)
attribute_mask |= CWOverrideRedirect;
- bool enable_transparent_visuals;
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
index a5b874437720..6ff1ea0d53d0 100644
--- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,6 +1,6 @@
---- ui/views/window/custom_frame_view.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/window/custom_frame_view.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/window/custom_frame_view.cc
-@@ -305,7 +305,7 @@ int CustomFrameView::NonClientTopBorderHeight() const
+@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderHeight() const
int CustomFrameView::CaptionButtonY() const {
// Maximized buttons start at window top so that even if their images aren't
// drawn flush with the screen edge, they still obey Fitts' Law.
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index d3c99fcca7c6..e766577599e6 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/window/dialog_delegate.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/window/dialog_delegate.cc
-@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
+@@ -61,7 +61,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
params.bounds = bounds;
DialogDelegate* dialog = delegate->AsDialogDelegate();
@@ -8,4 +8,4 @@
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// The new style doesn't support unparented dialogs on Linux desktop.
if (dialog)
- dialog->supports_custom_frame_ &= parent != NULL;
+ dialog->supports_custom_frame_ &= parent != nullptr;
diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc
index b4784f5e246b..518931f6a83a 100644
--- a/www/chromium/files/patch-ui_views_window_frame__background.cc
+++ b/www/chromium/files/patch-ui_views_window_frame__background.cc
@@ -1,6 +1,6 @@
---- ui/views/window/frame_background.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/window/frame_background.cc.orig 2019-06-04 18:55:50 UTC
+++ ui/views/window/frame_background.cc
-@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
+@@ -106,7 +106,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
const View* view) const {
// Fill the top with the frame color first so we have a constant background
// for areas not covered by the theme image.
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 6bb4e7c7e081..4aeb39971d63 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig 2019-04-30 22:26:01 UTC
+--- v8/BUILD.gn.orig 2019-06-04 18:58:07 UTC
+++ v8/BUILD.gn
-@@ -3302,7 +3302,7 @@ v8_component("v8_libbase") {
+@@ -3474,7 +3474,7 @@ v8_component("v8_libbase") {
}
}
@@ -9,7 +9,7 @@
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-linux.cc",
-@@ -3322,6 +3322,12 @@ v8_component("v8_libbase") {
+@@ -3494,6 +3494,12 @@ v8_component("v8_libbase") {
"dl",
"rt",
]
@@ -22,7 +22,7 @@
} else if (is_android) {
if (current_toolchain == host_toolchain) {
libs = [
-@@ -3527,6 +3533,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
+@@ -3721,6 +3727,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
"src/snapshot/embedded-file-writer.h",
"src/snapshot/mksnapshot.cc",
]
diff --git a/www/chromium/files/patch-v8_src_api.cc b/www/chromium/files/patch-v8_src_api.cc
index 305809f86a7f..742d62ae9cb0 100644
--- a/www/chromium/files/patch-v8_src_api.cc
+++ b/www/chromium/files/patch-v8_src_api.cc
@@ -1,4 +1,4 @@
---- v8/src/api.cc.orig 2019-04-30 22:26:01 UTC
+--- v8/src/api.cc.orig 2019-06-04 18:58:07 UTC
+++ v8/src/api.cc
@@ -109,7 +109,7 @@
#include "src/wasm/wasm-result.h"
@@ -9,7 +9,7 @@
#include <signal.h>
#include "include/v8-wasm-trap-handler-posix.h"
#include "src/trap-handler/handler-inside-posix.h"
-@@ -5765,7 +5765,7 @@ bool v8::V8::Initialize() {
+@@ -5762,7 +5762,7 @@ bool v8::V8::Initialize() {
return true;
}
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
index 15da28e22f96..51d27e4e68ff 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig 2019-04-30 22:26:01 UTC
+--- v8/src/base/platform/platform-posix.cc.orig 2019-06-04 18:58:07 UTC
+++ v8/src/base/platform/platform-posix.cc
@@ -376,7 +376,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
@@ -9,7 +9,7 @@
return true;
#else
// TODO(bbudge) Return true for all POSIX platforms.
-@@ -501,6 +501,12 @@ int OS::GetCurrentThreadId() {
+@@ -507,6 +507,12 @@ int OS::GetCurrentThreadId() {
return static_cast<int>(syscall(__NR_gettid));
#elif V8_OS_ANDROID
return static_cast<int>(gettid());
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 5196b58e25c6..3fcaebb1a169 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -192,6 +192,7 @@ bin/chrome
%%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js
%%DATADIR%%/resources/inspector/audits2_worker.js
%%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js
+%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js
%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
%%DATADIR%%/resources/inspector/changes/changes_module.js